diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..86e5833 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/debian/*.debhelper +/debian/*.log +/debian/*.substvars +/debian/debhelper-build-stamp +/debian/files + +/debian/obconf-qt/ diff --git a/CHANGELOG b/CHANGELOG index 6cffbb3..6566e44 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 ============================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 49ff915..fd39375 100644 --- 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}\"") diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index d532a2b..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -/*.debhelper -/*.log -/*.substvars -/debhelper-build-stamp -/files - -/obconf-qt/ -/obconf-qt5/ diff --git a/debian/changelog b/debian/changelog index 0ef3f56..58ed0e4 100644 --- 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 Tue, 26 Feb 2019 00:38:38 +0100 + obconf-qt (0.14.0-1) unstable; urgency=medium * Cherry-picked upstream release 0.14.0. diff --git a/src/translations/obconf-qt_fr.ts b/src/translations/obconf-qt_fr.ts index a5b724a..81cedfe 100644 --- a/src/translations/obconf-qt_fr.ts +++ b/src/translations/obconf-qt_fr.ts @@ -19,7 +19,7 @@ Window Manager Preferences - Préférence du gestionnaire de fenêtres + Préférences du gestionnaire de fenêtres @@ -34,7 +34,7 @@ Font - Fonte + Police @@ -65,7 +65,7 @@ Dock - Dock + Dock(s) @@ -85,7 +85,7 @@ A&nimate iconify and restore - A&nimer iconifier et restaurer + A&nimer, icônifier et restaurer @@ -108,7 +108,7 @@ S: Shade (Roll up) D: Omnipresent (On all desktops) 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) &Active window title: - Titre de fenêtre &active : + Titre de fenêtre &active : &Inactive window title: - Titre de fenêtre &inactive : + Titre de fenêtre &inactive : Menu &header: - En-&tête de menu : + &En-tête de menu : &Menu Item: - &Menu Item: + &Élément du menu : Active &On-screen display: - A&ffichage actif et à l'écran : + &Affichage actif et à l'écran : Inactive O&n-screen display: - Affichage i&nactif et à l'écran : + Affichage &inactif et à l'écran : @@ -398,12 +398,12 @@ D : Omniprésent (Sur tous les bureaux) &Amount of time to show the notification for: - &Durée d'affichage de la notification pour: + &Durée d'affichage de la notification pour : &Number of desktops: - &Nombre de bureaux : + &Nombre de bureaux : @@ -739,19 +739,22 @@ Options: --install requires an argument - --install demande un argument + --install demande un argument + --archive requires an argument - --archive demande un argument + --archive demande un argument + --config-file requires an argument - --config-file demande un argument + --config-file demande un argument + diff --git a/src/translations/obconf-qt_gl.ts b/src/translations/obconf-qt_gl.ts index 19fccc6..30cc988 100644 --- a/src/translations/obconf-qt_gl.ts +++ b/src/translations/obconf-qt_gl.ts @@ -6,12 +6,12 @@ Bold - Negra + Grosa Italic - Cursiva + Itálica diff --git a/src/translations/obconf-qt_it.ts b/src/translations/obconf-qt_it.ts index 3a73c9c..c2c3897 100644 --- a/src/translations/obconf-qt_it.ts +++ b/src/translations/obconf-qt_it.ts @@ -138,13 +138,13 @@ D: Su tutti desktop Active &On-screen display: What should that be? - + Display &On-screen attivi: Inactive O&n-screen display: see above - + Display O&n-screen inattivi: diff --git a/src/translations/obconf-qt_pt.ts b/src/translations/obconf-qt_pt.ts index e9043fb..763f2a7 100644 --- a/src/translations/obconf-qt_pt.ts +++ b/src/translations/obconf-qt_pt.ts @@ -80,7 +80,7 @@ Moving and Resizing Windows - Movimentar e redimensionar janelas + Mover e dimensionar janelas @@ -163,7 +163,7 @@ The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows. - O monitor principal é aquele em que o Openbox apresenta os diálogos, tais como o diálogo para percorrer janelas. + O monitor principal é aquele em que o Openbox mostra os diálogos, tais como o diálogo para percorrer janelas. @@ -401,7 +401,7 @@ D: Omnipresente (todas as áreas de trabalho) About - Sobre + Acerca @@ -601,7 +601,7 @@ D: Omnipresente (todas as áreas de trabalho) About ObConf-Qt - Sobre o ObConf-Qt + Acerca de ObConf-Qt @@ -616,9 +616,9 @@ The program is based on ObConf developed by the following developers. * Dana Jansens <danakj@orodu.net> * Tim Riley <tr@slackzone.org> * Javeed Shaikh <syscrash2k@gmail.com> - Um gestor de preferências do Openbox + Um gestor para as preferências Openbox -Copyright (c) 2014-2016 +Copyright (c) 2014-2019 Autores: * Hong Jen Yee (PCMan) <pcman.tw@gmail.com> @@ -669,7 +669,7 @@ Foram reportados os seguintes erros: "%1" does not appear to be a valid Openbox theme directory - "%1" não parece ser um diretório válido para temas Openbox + Parece que "%1" não é um diretório válido para temas Openbox @@ -769,7 +769,7 @@ under certain conditions. See the file COPYING for details. 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 diff --git a/src/translations/obconf-qt_ru.ts b/src/translations/obconf-qt_ru.ts index a4a959b..454e4f1 100644 --- a/src/translations/obconf-qt_ru.ts +++ b/src/translations/obconf-qt_ru.ts @@ -664,17 +664,17 @@ The following errors were reported: Unable to create directory "%1": %2 - Не удалось создать папку "%1": %2 + Не удалось создать каталог "%1": %2 "%1" does not appear to be a valid Openbox theme directory - "%1" не является правильной папкой тем Openbox + "%1" не является корректным каталогом тем Openbox Unable to move to directory "%1": %2 - Невозможно переместить в папку "%1": %2 + Невозможно переместить в каталог "%1": %2 @@ -731,7 +731,7 @@ Options: --help Показать эту справку и выйти --version Показать версию и выйти --install АРХИВ.obt Установить тему из указанного архива и выбрать её - --archive ТЕМА Создать архив с темой из указанной папки с темой + --archive ТЕМА Создать архива темы из указанного каталога темы --config-file ФАЙЛ Выбрать путь к используемому файлу настроек @@ -772,7 +772,7 @@ Options: Error while parsing the Openbox configuration file. Your configuration file is not valid XML. Message: %1 - Ошибка при разборе файла конфигурации Openbox. Ваш конфигурационный файл неправильный XML. + Ошибка при разборе файла настроек Openbox. Данный файл настроек не является корректным XML-документом. Сообщение: %1 diff --git a/src/translations/obconf-qt_tr.desktop b/src/translations/obconf-qt_tr.desktop new file mode 100644 index 0000000..f149eba --- /dev/null +++ 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 diff --git a/src/translations/obconf-qt_tr.ts b/src/translations/obconf-qt_tr.ts index 9853e18..9f61d17 100644 --- a/src/translations/obconf-qt_tr.ts +++ b/src/translations/obconf-qt_tr.ts @@ -80,12 +80,12 @@ &Windows retain a border when undecorated - &Pencereler süslemesiz bir sınıra sahip + &Pencereler dekor edilmediginde bir kenarda tutulur A&nimate iconify and restore - S&imgelendirme ve geri yükleme canlandır + S&imgelendirme ve geri yüklemeyi canlandır @@ -127,7 +127,7 @@ D: Hazır (Tüm masaüstlerinde) Menu &header: - Menü &başığı: + Menü &başlığı: @@ -137,27 +137,27 @@ D: Hazır (Tüm masaüstlerinde) Active &On-screen display: - Etkin &Görünen ekranda: + &Görünen ekranda etkinleştir: Inactive O&n-screen display: - Pasif G&örünen ekranda: + G&örünen ekranda pasifleştir: Focus &new windows when they appear - Yeni &pencereleri göründükleri zaman odakla + Göründükleri zaman yeni &pencerelere odaklan &Place new windows under the mouse pointer - &Fare işaretçisinin altına yeni pencereler yerleştirin + Yeni pencereleri &fare işaretçisinin altına yerleştir &Center new windows when they are placed - &Yerleştirildiğinde yeni pencereleri ortala + &Yeni pencereleri yerleştirildiğinde ortala @@ -192,7 +192,7 @@ D: Hazır (Tüm masaüstlerinde) The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows. - Birincil monitör, Openbox'un pencere diyalogları koyacağı yer. + Openbox'ın pencere diyaloglarını yerleştireceği birincil ekran, pencere döndürme için kullanılan gibi.