From 13e7da6e5d266c272f95566533d32763ed87f839 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 27 Dec 2015 01:16:34 +0100 Subject: [PATCH] Cherry-picking upstream version 0.9.0+20151227. --- CMakeLists.txt | 2 +- COPYING | 86 +------ README | 2 - README.md | 5 + debian/changelog | 6 + debian/docs | 2 +- debian/rules | 6 +- obconf-qt.kdev4 | 4 - src/translations/obconf-qt_de.ts | 2 +- src/translations/obconf-qt_hu.ts | 329 +++++++++++++++++++------- src/translations/obconf-qt_ja.desktop | 3 + src/translations/obconf-qt_ja.ts | 75 +++--- 12 files changed, 312 insertions(+), 210 deletions(-) delete mode 100644 README create mode 100644 README.md delete mode 100644 obconf-qt.kdev4 create mode 100644 src/translations/obconf-qt_ja.desktop diff --git a/CMakeLists.txt b/CMakeLists.txt index e13c7f5..ea0da35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,7 @@ install( # make package_source include (InstallRequiredSystemLibraries) set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README") +set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set (CPACK_PACKAGE_VENDOR "") set (CPACK_PACKAGE_VERSION_MAJOR "0") set (CPACK_PACKAGE_VERSION_MINOR "1") diff --git a/COPYING b/COPYING index d60c31a..d8cf7d4 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,64 +277,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. + END OF TERMS AND CONDITIONS diff --git a/README b/README deleted file mode 100644 index 90e3cb5..0000000 --- a/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a Qt port of ObConf, configurator of OpenBox window manager. - diff --git a/README.md b/README.md new file mode 100644 index 0000000..d5a0a7a --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# obconf-qt + +A Qt port of [ObConf](http://openbox.org/wiki/ObConf:About), a configuration +editor for the [OpenBox](http://openbox.org) window manager. + diff --git a/debian/changelog b/debian/changelog index ff548be..b3bd40e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +obconf-qt (0.9.0+20151227-1) unstable; urgency=medium + + * Cherry-picked upstream version 0.9.0+20151227. + + -- Alf Gaida Sun, 27 Dec 2015 01:16:24 +0100 + obconf-qt (0.9.0+20150822-1) unstable; urgency=medium [ ChangZhuo Chen (陳昌倬) ] diff --git a/debian/docs b/debian/docs index 6f12db5..0b6e0f3 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ AUTHORS -README +README.md diff --git a/debian/rules b/debian/rules index 8b9489f..54972db 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh ${@} --buildsystem cmake --parallel - -override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/obconf-qt + dh ${@} --buildsystem cmake \ + --parallel diff --git a/obconf-qt.kdev4 b/obconf-qt.kdev4 deleted file mode 100644 index 895c624..0000000 --- a/obconf-qt.kdev4 +++ /dev/null @@ -1,4 +0,0 @@ -[Project] -Name=obconf-qt -Manager=KDevCMakeManager -VersionControl= diff --git a/src/translations/obconf-qt_de.ts b/src/translations/obconf-qt_de.ts index b312812..f604842 100644 --- a/src/translations/obconf-qt_de.ts +++ b/src/translations/obconf-qt_de.ts @@ -451,7 +451,7 @@ D: auf allen Arbeitsflächen The dock is a special container for "dockapps", or dock applications. It is not visible on screen until a dockapp is run. Dockapps can be used to show things like a clock, or to provide you with a system tray. - Das "dock" ist ein graphisches Objekt zum Vorhalten sogenannter dock-Anwendungen ("dockapps"), die z. B. eine Uhr oder Benachrichtigungen anzeigen können. + Das "dock" ist ein graphisches Objekt zum Vorhalten sogenannter dock-Anwendungen ("dockapps"), die z. B. eine Uhr oder Benachrichtigungen anzeigen können. Das dock wird erst nach dem Starten von dockapps sichtbar. diff --git a/src/translations/obconf-qt_hu.ts b/src/translations/obconf-qt_hu.ts index 3173568..df127e5 100644 --- a/src/translations/obconf-qt_hu.ts +++ b/src/translations/obconf-qt_hu.ts @@ -17,88 +17,88 @@ MainDialog - + Window Manager Preferences Ablakkezelő tulajdonságok - + Theme Téma - + Appearance Megjelenés - + Font Betű - - + + Windows Ablakok - + Move & Resize Mozgatás és átméretezés - + Mouse Egér - + Desktops Asztalok - + Margins Margók - + Dock Dokk - + &Install a new theme... ÚJ téma telep&ítés... - + Create a theme &archive (.obt)... Téma &archívum készítés (.obt)... - + &Windows retain a border when undecorated &Díszítetlen ablakok bekeretezése - + A&nimate iconify and restore Ikonosítás és a visszaállítás &animált - + Window Titles Ablakcímek - + Button order: Gombsorrend: - + N: Window icon L: Window label (Title) I: Iconify (Minimize) @@ -115,341 +115,471 @@ S: Elrejt (Felgördít) D: Állandósít (Minden asztalon van) - + &Active window title: &Aktív ablakcím: - + &Inactive window title: &Inaktív ablakcím: - + Menu &header: Menüfejléc: - + &Menu Item: Menüelem: - + Active &On-screen display: Aktív ké&pernyő: - + Inactive O&n-screen display: I&naktív képernyő: - + Focus &new windows when they appear Ú&j ablakra fókuszál - + &Place new windows under the mouse pointer Új ablak helye az egérmutatónál - + &Center new windows when they are placed Új ablak &központosítása - + Prefer to place new windows &on: Új ablak&ok elsődleges helye: - + All monitors Összes kijelző - + The active monitor Aktív kijelző - + The monitor with the mouse Egeres kijelző - + Primary monitor Elsődleges kijelző - + Primary Monitor Elsődleges kijelző - + The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows. Az elsődleges kijelző az, ahol a kijelzőváltó párbeszédablakok is megjelennek. - + Primary &monitor: El&sődleges kijelző: - + Fixed Monitor Fix kijelző - + Active Monitor Aktív kijelző - + Monitor With Mouse Pointer Egeres kijelző - + &Fixed monitor: &Fix kijelző: - + Moving and Resizing Windows Ablakmozgatás és átméretezés - + Update the window contents while &resizing Ablaktartalom átméretezés alatt frissül - + Drag &threshold distance: Húzási távolság: - + Amount of resistance against other &windows: Tá&volság más ablakoktól: - + Amount of resistance against screen &edges: Távolság a képernyőszél&ekhez: - + &Amount of time to wait before switching: Munkaterületváltási vár&akozás: - + &Switch desktops when moving a window past the screen edge Asztalváltás az ablak képről való kicsúsztatásakor - + Information Dialog Információs párbeszédablak - - + + Centered Közepütt - + From left edge Balszéltől - + From right edge Jobbszéltől - + Fixed &y position: Rögzített y hely: - + From top edge Felső széltől - + From bottom edge Alsó széltől - + Information dialog's &position: Információs &párbeszédablak helye: - + Fixed &x position: Rögzített x hely: - + Show &information dialog: Információs ablak megjelenése: - + When resizing terminal windows Terminálablak átméretezésekor - + Always Mindig - + Never Soha - + Centered on the window Ablak közepén - + Above the window Ablak felett - + Fixed position on screen A kijelző rögzített helyén - + Focusing Windows Ablakfókusz - + Focus windows when the mouse pointer moves over them Egérmutatóval fókuszál - + &Delay before focusing and raising windows: Ablakfókusz és kiemelés &késletetése - + Move focus under the mouse when &switching desktops Asztalváltáskor fókusz az egérmutónál - + Move focus &under the mouse when the mouse is not moving Fókusz az egérhez, ha az mozdulatlan - + &Raise windows when the mouse pointer moves over them Ablakkiemelés, ha az egérkurzor odamegy - + Titlebar Címsor - + Double click on the &titlebar: Dupla kattintás a címsorra: - + Maximizes the window Ablak maximalizálás - + Shades the window Ablak eltűntetés - + Double click ti&me: Duplakattintási &idő: - + &Show a notification when switching desktops Asztalváltáskor értesítés - + &Amount of time to show the notification for: Értesítés megjelenési idő: - + &Number of desktops: Asztalok szá&ma: - + &Desktop names: Asztal&nevek: - + Desktop Margins Asztalmargók - + Desktop margins are reserved areas on the edge of your screen. New windows will not be placed within a margin, and maximized windows will not cover them. Asztali margók foglalt területek a kijelző szélén,az új ablakok ezen belülre kerülnek, a maximalizált ablakok nem lépnek túl rajtuk. - + Left: Bal: - - - - + + + + px - + Top: Fenn: - + Right: Jobb: - + Bottom: Lenn: - + + The dock is a special container for "dockapps", or dock applications. It is not visible on screen until a dockapp is run. Dockapps can be used to show things like a clock, or to provide you with a system tray. + + + + + Position + + + + + &Position: + + + + + Top Left + + + + + Top + + + + + Top Right + + + + + Left + + + + + Right + + + + + Bottom Left + + + + + Bottom + + + + + Bottom Right + + + + + Floating + + + + + &Floating position: + + + + + x + + + + + Allow &windows to be placed within the dock's area + + + + + &Orientation: + + + + + Vertical + + + + + Horizontal + + + + + Stacking + + + + + Keep dock &above other windows + + + + + A&llow dock to be both above and below windows + + + + + Keep dock &below other windows + + + + + Hiding + + + + + &Delay before hiding: + + + + + Delay before &showing: + + + + + &Hide off screen + + + + About A programról @@ -463,8 +593,9 @@ D: Állandósít (Minden asztalon van) Válassz Openbox témát - - + + + (Unnamed desktop) (Névtelen asztal) @@ -482,6 +613,20 @@ D: Állandósít (Minden asztalon van) A preferences manager for Openbox +Copyright (c) 2014-2015 + +Authors: +* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> + +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> + + + + A preferences manager for Openbox + Copyright (c) 2003-2013 Authors: @@ -489,7 +634,7 @@ Authors: * Dana Jansens <danakj@orodu.net> * Tim Riley <tr@slackzone.org> * Javeed Shaikh <syscrash2k@gmail.com> - Openbox beállító + Openbox beállító Copyright (c) 2003-2013 diff --git a/src/translations/obconf-qt_ja.desktop b/src/translations/obconf-qt_ja.desktop new file mode 100644 index 0000000..6926167 --- /dev/null +++ b/src/translations/obconf-qt_ja.desktop @@ -0,0 +1,3 @@ +Name[ja]=Openbox設定マネージャー (Qtバージョン) +GenericName[ja]=Obconf-qt +Comment[ja]=Openboxを設定します。 diff --git a/src/translations/obconf-qt_ja.ts b/src/translations/obconf-qt_ja.ts index 05c3179..24502be 100644 --- a/src/translations/obconf-qt_ja.ts +++ b/src/translations/obconf-qt_ja.ts @@ -163,7 +163,7 @@ The primary monitor is where Openbox will place dialogs, such as the one used for cycling windows. - 主モニターとは Openbox がウィンドウの循環などのダイアログを配置するモニターです。 + 主モニターとは 例えばウィンドウの循環をさせる際のダイアログなどをOpenbox が配置するモニターです。 @@ -244,7 +244,7 @@ Shades the window - ウィンドウをシェード化する + ウィンドウに影をつける @@ -271,132 +271,132 @@ D: 全てのデスクトップに表示する The dock is a special container for "dockapps", or dock applications. It is not visible on screen until a dockapp is run. Dockapps can be used to show things like a clock, or to provide you with a system tray. - + ドックは"dockapps"のためのコンテナです。dockappを実行しない限り表示されません。Dockappsは時計やシステムトレイで使用するようなアプリケーションを提供します。 Position - + 位置 &Position: - + 位置(&P): Top Left - + 左上 Top - + 上 Top Right - + 右上 Left - + 左 Right - + 右 Bottom Left - + 左下 Bottom - + 下 Bottom Right - + 右下 Floating - + フローティング（固定しない） &Floating position: - + フローティングの位置(&F): x - + x Allow &windows to be placed within the dock's area - + ウィンドウをドックエリアに配置することを可能にする(&w) &Orientation: - + 方向(&O): Vertical - + 縦 Horizontal - + 横 Stacking - + 重ねあわせ Keep dock &above other windows - + ドックを常に他のウィンドウの前面に配置する(&a) A&llow dock to be both above and below windows - + ドックを他のウィンドウの前面にも背面にも配置することを可能にする(&l) Keep dock &below other windows - + ドックを常に他のウィンドウの背面に配置する(&b) Hiding - + ハイディング &Delay before hiding: - + 隠れるまでの時間(&D): Delay before &showing: - + 出現するまでの時間(&s): &Hide off screen - + スクリーンから隠す(&H) @@ -616,7 +616,18 @@ 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> - + Openbox の設定マネージャ + +Copyright (c) 2003-2015 + +作者: +* Hong Jen Yee (PCMan) <pcman.tw@gmail.com> + +このプログラムは下記の開発者によって開発されたObConfを基に開発されています。 +* Dana Jansens <danakj@orodu.net> +* Tim Riley <tr@slackzone.org> +* Javeed Shaikh <syscrash2k@gmail.com> + A preferences manager for Openbox @@ -655,7 +666,7 @@ Copyright (c) 2003-2013 "%1" was successfully created - "%1" の作成し成功しました + "%1" は無事に作成されました @@ -663,7 +674,7 @@ Copyright (c) 2003-2013 The following errors were reported: %2 テーマアーカイブ "%1" が作成できません。 -エラー報告は以下の通りです: +エラーメッセージは以下の通りです: %2 @@ -695,7 +706,7 @@ The following errors were reported: %3 ファイル "%1” が展開できません。 "%2" が書き込み可能であり、ファイルが正しい Openbox テーマアーカイブであることを確認してください。 -エラー報告は以下の通りです: +エラーメッセージは以下の通りです: %3