Cherry-picked upstream release 0.14.1.

6 years ago · bde099b13b
parent 0208cf4b60
commit bde099b13b
12 changed files with 67 additions and 51 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,7 @@
+/debian/*.debhelper
+/debian/*.log
+/debian/*.substvars
+/debian/debhelper-build-stamp
+/debian/files
+
+/debian/obconf-qt/
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+obconf-qt-0.14.1 / 2019-02-25
+=============================
+
+  * Bumped version to 0.14.1
+  * Only translations was changed.

 obconf-qt-0.14.0 / 2019-01-25
 =============================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -18,7 +18,7 @@ set(QT_MINIMUM_VERSION "5.7.1")

 set(OBCONFQT_MAJOR_VERSION 0)
 set(OBCONFQT_MINOR_VERSION 14)
-set(OBCONFQT_PATCH_VERSION 0)
+set(OBCONFQT_PATCH_VERSION 1)
 set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION})
 add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"")

--- a/debian/.gitignore
+++ b/debian/.gitignore
@ -1,8 +0,0 @@
-/*.debhelper
-/*.log
-/*.substvars
-/debhelper-build-stamp
-/files
-
-/obconf-qt/
-/obconf-qt5/
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+obconf-qt (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picked upstream release 0.14.1.
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 00:38:38 +0100
+
 obconf-qt (0.14.0-1) unstable; urgency=medium

  * Cherry-picked upstream release 0.14.0.
--- a/src/translations/obconf-qt_fr.ts
+++ b/src/translations/obconf-qt_fr.ts
@ -19,7 +19,7 @@
    <message>
        <location filename="../obconf.ui" line="14"/>
        <source>Window Manager Preferences</source>
-        <translation>Préférence du gestionnaire de fenêtres</translation>
+        <translation>Préférences du gestionnaire de fenêtres</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="38"/>
@ -34,7 +34,7 @@
    <message>
        <location filename="../obconf.ui" line="48"/>
        <source>Font</source>
-        <translation>Fonte</translation>
+        <translation>Police</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="53"/>
@ -65,7 +65,7 @@
    <message>
        <location filename="../obconf.ui" line="78"/>
        <source>Dock</source>
-        <translation>Dock</translation>
+        <translation>Dock(s)</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="96"/>
@ -85,7 +85,7 @@
    <message>
        <location filename="../obconf.ui" line="127"/>
        <source>A&amp;nimate iconify and restore</source>
-        <translation>A&amp;nimer iconifier et restaurer</translation>
+        <translation>A&amp;nimer, icônifier et restaurer</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="137"/>
@ -108,7 +108,7 @@ S: Shade (Roll up)
 D: Omnipresent (On all desktops)</source>
        <translation>N : Icône de fenêtre
 L : Étiquette de fenêtre (Titre)
-I : Iconifier (Minimiser)
+I : Icônifier (Minimiser)
 M : Maximiser
 C : Fermer
 S : Ombrer (Enrouler)
@ -117,32 +117,32 @@ D : Omniprésent (Sur tous les bureaux)</translation>
    <message>
        <location filename="../obconf.ui" line="231"/>
        <source>&amp;Active window title: </source>
-        <translation>Titre de fenêtre &amp;active :</translation>
+        <translation>Titre de fenêtre &amp;active : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="241"/>
        <source>&amp;Inactive window title: </source>
-        <translation>Titre de fenêtre &amp;inactive :</translation>
+        <translation>Titre de fenêtre &amp;inactive : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="251"/>
        <source>Menu &amp;header: </source>
-        <translation>En-&amp;tête de menu :</translation>
+        <translation>&amp;En-tête de menu : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="261"/>
        <source>&amp;Menu Item: </source>
-        <translation>&amp;Menu Item:  </translation>
+        <translation>&amp;Élément du menu : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="271"/>
        <source>Active &amp;On-screen display: </source>
-        <translation>A&amp;ffichage actif et à l&apos;écran :</translation>
+        <translation>&amp;Affichage actif et à l&apos;écran : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="281"/>
        <source>Inactive O&amp;n-screen display: </source>
-        <translation>Affichage i&amp;nactif et à l&apos;écran :</translation>
+        <translation>Affichage &amp;inactif et à l&apos;écran : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="295"/>
@ -398,12 +398,12 @@ D : Omniprésent (Sur tous les bureaux)</translation>
    <message>
        <location filename="../obconf.ui" line="845"/>
        <source>&amp;Amount of time to show the notification for:</source>
-        <translation>&amp;Durée d&apos;affichage de la notification pour:</translation>
+        <translation>&amp;Durée d&apos;affichage de la notification pour :</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="868"/>
        <source>&amp;Number of desktops: </source>
-        <translation>&amp;Nombre de bureaux :</translation>
+        <translation>&amp;Nombre de bureaux : </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="891"/>
@ -739,19 +739,22 @@ Options:
        <location filename="../obconf-qt.cpp" line="97"/>
        <source>--install requires an argument
 </source>
-        <translation>--install demande un argument</translation>
+        <translation>--install demande un argument
+</translation>
    </message>
    <message>
        <location filename="../obconf-qt.cpp" line="103"/>
        <source>--archive requires an argument
 </source>
-        <translation>--archive demande un argument</translation>
+        <translation>--archive demande un argument
+</translation>
    </message>
    <message>
        <location filename="../obconf-qt.cpp" line="109"/>
        <source>--config-file requires an argument
 </source>
-        <translation>--config-file demande un argument</translation>
+        <translation>--config-file demande un argument
+</translation>
    </message>
    <message>
        <location filename="../obconf-qt.cpp" line="223"/>
--- a/src/translations/obconf-qt_gl.ts
+++ b/src/translations/obconf-qt_gl.ts
@ -6,12 +6,12 @@
    <message>
        <location filename="../fontbutton.cpp" line="46"/>
        <source>Bold</source>
-        <translation>Negra</translation>
+        <translation>Grosa</translation>
    </message>
    <message>
        <location filename="../fontbutton.cpp" line="50"/>
        <source>Italic</source>
-        <translation>Cursiva</translation>
+        <translation>Itálica</translation>
    </message>
 </context>
 <context>
--- a/src/translations/obconf-qt_it.ts
+++ b/src/translations/obconf-qt_it.ts
@ -138,13 +138,13 @@ D: Su tutti desktop</translation>
        <location filename="../obconf.ui" line="271"/>
        <source>Active &amp;On-screen display: </source>
        <translatorcomment>What should that be?</translatorcomment>
-        <translation type="unfinished"></translation>
+        <translation>Display &amp;On-screen attivi: </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="281"/>
        <source>Inactive O&amp;n-screen display: </source>
        <translatorcomment>see above</translatorcomment>
-        <translation type="unfinished"></translation>
+        <translation>Display O&amp;n-screen inattivi: </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="295"/>
--- a/src/translations/obconf-qt_pt.ts
+++ b/src/translations/obconf-qt_pt.ts
@ -80,7 +80,7 @@
    <message>
        <location filename="../obconf.ui" line="439"/>
        <source>Moving and Resizing Windows</source>
-        <translation>Movimentar e redimensionar janelas</translation>
+        <translation>Mover e dimensionar janelas</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="542"/>
@ -163,7 +163,7 @@
    <message>
        <location filename="../obconf.ui" line="360"/>
        <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
-        <translation>O monitor principal é aquele em que o Openbox apresenta os diálogos, tais como o diálogo para percorrer janelas.</translation>
+        <translation>O monitor principal é aquele em que o Openbox mostra os diálogos, tais como o diálogo para percorrer janelas.</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="381"/>
@ -401,7 +401,7 @@ D: Omnipresente (todas as áreas de trabalho)</translation>
    <message>
        <location filename="../obconf.ui" line="1306"/>
        <source>About</source>
-        <translation>Sobre</translation>
+        <translation>Acerca</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="96"/>
@ -601,7 +601,7 @@ D: Omnipresente (todas as áreas de trabalho)</translation>
    <message>
        <location filename="../maindialog.cpp" line="76"/>
        <source>About ObConf-Qt</source>
-        <translation>Sobre o ObConf-Qt</translation>
+        <translation>Acerca de ObConf-Qt</translation>
    </message>
    <message>
        <location filename="../maindialog.cpp" line="77"/>
@ -616,9 +616,9 @@ The program is based on ObConf developed by the following developers.
 * Dana Jansens &lt;danakj@orodu.net&gt;
 * Tim Riley &lt;tr@slackzone.org&gt;
 * Javeed Shaikh &lt;syscrash2k@gmail.com&gt;</source>
-        <translation>Um gestor de preferências do Openbox
+        <translation>Um gestor para as preferências Openbox

-Copyright (c) 2014-2016
+Copyright (c) 2014-2019

 Autores:
 * Hong Jen Yee (PCMan) &lt;pcman.tw@gmail.com&gt;
@ -669,7 +669,7 @@ Foram reportados os seguintes erros:
    <message>
        <location filename="../archive.cpp" line="138"/>
        <source>&quot;%1&quot; does not appear to be a valid Openbox theme directory</source>
-        <translation>&quot;%1&quot; não parece ser um diretório válido para temas Openbox</translation>
+        <translation>Parece que &quot;%1&quot; não é um diretório válido para temas Openbox</translation>
    </message>
    <message>
        <location filename="../archive.cpp" line="148"/>
@ -769,7 +769,7 @@ under certain conditions. See the file COPYING for details.
        <translation>Copyright (c) 2003-2008   Dana Jansens
 Copyright (c) 2003            Tim Riley
 Copyright (c) 2007            Javeed Shaikh
-Copyright (c) 2013            Hong Jen Yee (PCMan)
+Copyright (c) 2013-2019            Hong Jen Yee (PCMan)

 Este programa NÃO POSSUI QUALQUER GARANTIA.
 É um programa livre e a sua redistribuição é permitida mediante
--- a/src/translations/obconf-qt_ru.ts
+++ b/src/translations/obconf-qt_ru.ts
@ -664,17 +664,17 @@ The following errors were reported:
    <message>
        <location filename="../archive.cpp" line="115"/>
        <source>Unable to create directory &quot;%1&quot;: %2</source>
-        <translation>Не удалось создать папку &quot;%1&quot;: %2</translation>
+        <translation>Не удалось создать каталог &quot;%1&quot;: %2</translation>
    </message>
    <message>
        <location filename="../archive.cpp" line="138"/>
        <source>&quot;%1&quot; does not appear to be a valid Openbox theme directory</source>
-        <translation>&quot;%1&quot; не является правильной папкой тем Openbox</translation>
+        <translation>&quot;%1&quot; не является корректным каталогом тем Openbox</translation>
    </message>
    <message>
        <location filename="../archive.cpp" line="148"/>
        <source>Unable to move to directory &quot;%1&quot;: %2</source>
-        <translation>Невозможно переместить в папку &quot;%1&quot;: %2</translation>
+        <translation>Невозможно переместить в каталог &quot;%1&quot;: %2</translation>
    </message>
    <message>
        <location filename="../archive.cpp" line="185"/>
@ -731,7 +731,7 @@ Options:
  --help                Показать эту справку и выйти
  --version             Показать версию и выйти
  --install АРХИВ.obt   Установить тему из указанного архива и выбрать её
-  --archive ТЕМА        Создать архив с темой из указанной папки с темой
+  --archive ТЕМА        Создать архива темы из указанного каталога темы
  --config-file ФАЙЛ    Выбрать путь к используемому файлу настроек
 </translation>
    </message>
@ -772,7 +772,7 @@ Options:
        <source>Error while parsing the Openbox configuration file.  Your configuration file is not valid XML.

 Message: %1</source>
-        <translation>Ошибка при разборе файла конфигурации Openbox. Ваш конфигурационный файл неправильный XML.
+        <translation>Ошибка при разборе файла настроек Openbox. Данный файл настроек не является корректным XML-документом.

 Сообщение: %1</translation>
    </message>
--- a/src/translations/obconf-qt_tr.desktop
+++ b/src/translations/obconf-qt_tr.desktop
@ -0,0 +1,3 @@
+Name[tr]=Openbox Ayarları
+GenericName[tr]=Pencere Yöneticisi Ayarları
+Comment[tr]=Openbox pencere yöneticisini yapılandırma
--- a/src/translations/obconf-qt_tr.ts
+++ b/src/translations/obconf-qt_tr.ts
@ -80,12 +80,12 @@
    <message>
        <location filename="../obconf.ui" line="120"/>
        <source>&amp;Windows retain a border when undecorated</source>
-        <translation>&amp;Pencereler süslemesiz bir sınıra sahip</translation>
+        <translation>&amp;Pencereler dekor edilmediginde bir kenarda tutulur</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="127"/>
        <source>A&amp;nimate iconify and restore</source>
-        <translation>S&amp;imgelendirme ve geri yükleme canlandır</translation>
+        <translation>S&amp;imgelendirme ve geri yüklemeyi canlandır</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="137"/>
@ -127,7 +127,7 @@ D: Hazır (Tüm masaüstlerinde)</translation>
    <message>
        <location filename="../obconf.ui" line="251"/>
        <source>Menu &amp;header: </source>
-        <translation>Menü &amp;başığı: </translation>
+        <translation>Menü &amp;başlığı: </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="261"/>
@ -137,27 +137,27 @@ D: Hazır (Tüm masaüstlerinde)</translation>
    <message>
        <location filename="../obconf.ui" line="271"/>
        <source>Active &amp;On-screen display: </source>
-        <translation>Etkin &amp;Görünen ekranda: </translation>
+        <translation>&amp;Görünen ekranda etkinleştir: </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="281"/>
        <source>Inactive O&amp;n-screen display: </source>
-        <translation>Pasif G&amp;örünen ekranda: </translation>
+        <translation>G&amp;örünen ekranda pasifleştir: </translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="295"/>
        <source>Focus &amp;new windows when they appear</source>
-        <translation>Yeni &amp;pencereleri göründükleri zaman odakla</translation>
+        <translation>Göründükleri zaman yeni &amp;pencerelere odaklan</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="302"/>
        <source>&amp;Place new windows under the mouse pointer</source>
-        <translation>&amp;Fare işaretçisinin altına yeni pencereler yerleştirin</translation>
+        <translation>Yeni pencereleri &amp;fare işaretçisinin altına yerleştir</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="309"/>
        <source>&amp;Center new windows when they are placed</source>
-        <translation>&amp;Yerleştirildiğinde yeni pencereleri ortala</translation>
+        <translation>&amp;Yeni pencereleri yerleştirildiğinde ortala</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="318"/>
@ -192,7 +192,7 @@ D: Hazır (Tüm masaüstlerinde)</translation>
    <message>
        <location filename="../obconf.ui" line="360"/>
        <source>The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows.</source>
-        <translation>Birincil monitör, Openbox&apos;un pencere diyalogları koyacağı yer.</translation>
+        <translation>Openbox&apos;ın pencere diyaloglarını yerleştireceği birincil ekran, pencere döndürme için kullanılan gibi.</translation>
    </message>
    <message>
        <location filename="../obconf.ui" line="370"/>