diff -Nru xfce4-whiskermenu-plugin-1.1.1/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/CMakeLists.txt 2013-07-18 22:48:01.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -15,9 +15,13 @@ add_subdirectory(po) add_subdirectory(icons) +# popup script configure_file(${PROJECT_SOURCE_DIR}/xfce4-popup-whiskermenu.in ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu ESCAPE_QUOTES @ONLY) -install(PROGRAMS ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(PROGRAMS ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu + DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(FILES ${PROJECT_SOURCE_DIR}/xfce4-popup-whiskermenu.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) # uninstall target configure_file( diff -Nru xfce4-whiskermenu-plugin-1.1.1/ChangeLog xfce4-whiskermenu-plugin-1.2.0/ChangeLog --- xfce4-whiskermenu-plugin-1.1.1/ChangeLog 2013-08-08 16:01:25.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/ChangeLog 2013-10-29 18:41:07.000000000 +0000 @@ -1,76 +1,376 @@ -commit a1c4fb4399f32801397a18d1dbfcd62dcfc4c7e1 +commit 7f81f417f49c501f4397fb06409051a8a7ecd9a1 Author: Graeme Gott -Date: 2013-08-08 +Date: 2013-10-29 Bump version number. -commit 10e1a4261f997a5bab0407cb817ead7c431c0c5a +commit 46f72cee1f7b3ede1e2fa5878523fe7c34e0ae43 +Author: Graeme Gott +Date: 2013-10-29 + + Update French translation. + +commit 0e51731ce225c94547d4d4422d69983071869d66 +Author: Graeme Gott +Date: 2013-10-29 + + Add partial Estonian and Ukrainian translations. + +commit dc14f46d7a10cc99989b757fe008dd4bc3cb8362 +Author: Graeme Gott +Date: 2013-10-29 + + Disable command buttons for invalid user specified commands. + +commit 1f0a77c1a1d6d303f3451309ea334825e6b12414 +Author: Graeme Gott +Date: 2013-10-28 + + Update Brazilian Portuguese translation. + +commit c71005d67dc9ab2cec7f4d173b75bfec55d9346d +Author: Graeme Gott +Date: 2013-10-27 + + Update Danish translation. + +commit a9f7afbdbbb170b52a2d6bf0656301f8ee15cb10 +Author: Graeme Gott +Date: 2013-10-26 + + Update Malay translation. + +commit f5b3f85a43b986ffb85ce36eb4232fc3f1df6446 +Author: Graeme Gott +Date: 2013-10-26 + + Add Finnish translation. + +commit 0b2e8561cbc730c022f6a6e35e1ba0166fa861a9 +Author: Graeme Gott +Date: 2013-10-24 + + Update Russian translation. + +commit 87cefa62ee98d573a1225296c2cfbcfa9e0ed7c0 +Author: Graeme Gott +Date: 2013-10-21 + + Fix favorites and recent deleted when menu failed to load. + +commit 22fe3031282410aeee39d1398e753482a4ff15ee +Author: Graeme Gott +Date: 2013-10-22 + + Update Norwegian Bokmål translation. + +commit 7144529ae139c8314fec0acb4fdc1e32cf45f0b4 +Author: Graeme Gott +Date: 2013-10-21 + + Update Spanish translation. + +commit de68df7a3c14b74f59ac2e38981fceba497afffe +Author: Graeme Gott +Date: 2013-10-20 + + Update Bulgarian and Polish translations. + +commit a9a4dcb72285d94a9b9994aed903f2a02b40a3e3 +Author: Graeme Gott +Date: 2013-10-20 + + Add Serbian (Latin) translation. + +commit 6c885b0fe322bd7c88ecd2376ebdb0353ea22617 +Author: Graeme Gott +Date: 2013-10-19 + + Update Catalan, Dutch, German, Japanese, Russian, Uzbek translations. + +commit 3fa101f5f6d4cb7c28a227b915d70163fdf43514 +Author: Graeme Gott +Date: 2013-10-15 + + Only create subcategories when loading hierarchy. + +commit 27a09eb1118ca3e8d0e3e4d6b771b5e0308363e0 +Author: Graeme Gott +Date: 2013-10-15 + + Remove unnecessary flushing of garcon cache. + +commit 78c69fed938b948cc984af4fa2db2a5e57301621 +Author: Graeme Gott +Date: 2013-10-15 + + Fix memory leak when reloading applications. + +commit 177a131d8e7955f6d56ce0c9b74fb0e741bd0a10 +Author: Graeme Gott +Date: 2013-10-15 + + Update Hebrew translation. + +commit f762dca5e8fd044c1a3c9d55fa568554288a6d8e +Author: Graeme Gott +Date: 2013-10-13 + + Add Croatian translation. + +commit 990e67108bafc88b5349a40006e5b56c1a0218e1 +Author: Graeme Gott +Date: 2013-10-13 + + Update Italian translation. + +commit dc793268a53e270dbd3638aa4de084adbe45c67e +Author: Graeme Gott +Date: 2013-10-10 + + Update Romanian and Spanish translations. + +commit cefdaeb323ce289de6733e71dfb911333b88e9b2 +Author: Graeme Gott +Date: 2013-10-10 + + Update Hebrew, Portuguese, Slovak, Uzbek translations. + +commit 624c3b087de41a5f3b28174ededeaddc859ca9d2 +Author: Graeme Gott +Date: 2013-10-10 + + Add man page for popup script. + +commit 6189b126d68577035727c31b8f6df6cc43aca398 +Author: Graeme Gott +Date: 2013-10-09 + + Update strings. + +commit 7c2b461b3b92895ed878ea12323667ee9d107a74 +Author: Graeme Gott +Date: 2013-10-09 + + Make sure tab labels are translated. + +commit 42d5da33950ced5eeccdc5016f237d3d3231e407 +Author: Graeme Gott +Date: 2013-10-09 + + Update popup to show correct version information. + +commit 48300ac080bd34848026ce57d5c3130cae4f11da +Author: Graeme Gott +Date: 2013-10-09 + + Add option to position command buttons next to search entry. + +commit 3b9e61cf4ddfb77f0b31167629fbede4c66739fa +Author: Graeme Gott +Date: 2013-10-09 + + Add option to position search entry next to panel button. Closes #27. + +commit 0c0fd174f25e8c5eb98b38207339bffd90cffa36 +Author: Graeme Gott +Date: 2013-10-09 + + Add option to display recently used by default. Closes #30. + +commit 2e574172afd8407cd938127b3ad2fde325f62b62 +Author: Graeme Gott +Date: 2013-10-08 + + Remember custom commands. + +commit 0f21215a649543292d24130cc103edf18194ec1b +Author: Graeme Gott +Date: 2013-10-08 + + Add options to set custom commands. Closes #25. + +commit c41c9f55686a521f7c0c9b834b2e8070e8392ce4 +Author: Graeme Gott +Date: 2013-09-22 + + Update Catalan and Spanish translations. + +commit 10cc4aa6e76a0c3405c442bf6e413d49373181f0 +Author: Graeme Gott +Date: 2013-09-22 + + Use tabs for configuration dialog layout. + +commit 0a01dcb26e746c638c0ff90fc8ff1c543284ab6d +Author: Graeme Gott +Date: 2013-09-20 + + Add option to not include favorites in recently used. + +commit 3d1f843bfab4f2a1452f56da8dbf13f81eb95c2b +Author: Graeme Gott +Date: 2013-08-24 + + Update Greek translation. + +commit 2e262a3764e2e91174e3f29c4eb20440cb7db7f9 +Author: Graeme Gott +Date: 2013-08-21 + + Add Czech translation. + +commit 33901483d7c7b71687df0578944fb41856539870 +Author: Graeme Gott +Date: 2013-08-20 + + Only use tree models when necessary. + +commit 7ede4fc47100ceca63cd40da365555825c2db0cd +Author: Graeme Gott +Date: 2013-08-20 + + Fix crash with multi-level subcategories. + +commit 6d7f9bae47bda118763b6a622e4de836a4482233 +Author: Graeme Gott +Date: 2013-08-14 + + Add Uzbek translation. + +commit 2f19d3258c0ce2eb4dfaca4cc8b1f26784886e70 +Author: Graeme Gott +Date: 2013-08-14 + + Update Japanese translation. + +commit b14aa5dff3b4509959bebeac189f1e35fdec683c +Author: Graeme Gott +Date: 2013-08-13 + + Allow pango markup in launcher title. Closes #28. + +commit e03bea00a00d262dcffc31e1311760b27a136ed7 +Author: Graeme Gott +Date: 2013-08-08 + + Update news file. + +commit 1a79fa717c1a26d6bb5704df9352ec5f38395407 Author: Graeme Gott Date: 2013-08-08 Update Arabic translation. -commit 78c923df8214e37f25141a07bce959f1e2c06741 +commit 944761b0c7fa98083683b752184f2e4f1a8e68bf Author: Graeme Gott Date: 2013-08-08 Build as module. -commit 572f6c16285a315644ebbdba4ac040f197d30815 +commit c1b3ec6717780ddd9087810840cd27f08c641857 Author: Graeme Gott Date: 2013-08-07 Update Catalan and Spanish translations. -commit a5dd63aeba632b290588fb93d39aea394a421630 +commit 0ace36cf1c01ec5f7d33df7803fdeced547117fd +Author: Graeme Gott +Date: 2013-08-01 + + Collapse tree when switching categories. + +commit 413eb752a7098aecbfe2f9dbcf0f48cfa4a624c7 +Author: Graeme Gott +Date: 2013-08-01 + + Add option to load menu hierarchy. + +commit ffa1d1d906fd8dc8603eaa186fd47ab75a6360d7 +Author: Graeme Gott +Date: 2013-07-29 + + Add support for separators. + +commit f905c1e8c7a51533aab5988cab42b6977c1a814b +Author: Graeme Gott +Date: 2013-07-29 + + Use STL to sort items and categories. + +commit 711907edbab6679962d45b985797c20327cec40b +Author: Graeme Gott +Date: 2013-08-01 + + Derive category and launcher from shared class. + +commit 00d5b608fd2c3a0926d57fc6e330b0a554b9e538 +Author: Graeme Gott +Date: 2013-07-29 + + Derive search page from page. + +commit 5f911c32b00fcf44073b38c75d43194e78098ee4 +Author: Graeme Gott +Date: 2013-07-20 + + Derive applications page from page. + +commit 1eae68076e4530b167e00a004f27d2236db92222 +Author: Graeme Gott +Date: 2013-07-20 + + Add models to categories. + +commit f74b9cfdad130a668cae4591e5859815700b7bbc Author: Graeme Gott Date: 2013-08-02 Update Catalan translation. -commit 3de76d3686a66332155bfb982e693a638b6ece11 +commit 6bcc6f5b3fcad3ef7c72994ea415b78b26840bc7 Author: Graeme Gott Date: 2013-08-01 Update Indonesian and Russian translations. -commit 488cd58b5f91b7334b51d79415bc51b473a18521 +commit 69dfc84af0fd58d5216ff3a39235c6fc4e839c1f Author: Graeme Gott Date: 2013-07-30 Update Spanish translation. -commit 6e4312962ea56cd6844ae4b4a74e1f8b9659c33a +commit 0c5ab25c774e78610617028317522c2cc05426cc Author: Graeme Gott Date: 2013-07-29 Update Malay translation. -commit ddcca4dab78eb1231a85ba369a86cdc44e209d13 +commit dc77561a6b5c9e601d3fa83a8c92e23708453536 Author: Graeme Gott Date: 2013-07-28 Update Spanish translation. -commit f0babd3b1d4962c454b7637805465ee6f3865574 +commit 915a35b9e0bb5a6852e0d8cc94a7960a0d8b49ae Author: Graeme Gott Date: 2013-07-26 - Add name to main widget to allow styling. + Add name to main widget to allow styling. Closes #14. -commit 367b0981533c0c8a01d91965a4dcc83384cbd27b +commit 71ae563f8c6344695e4dbca0d5a58123c52d9fb7 Author: Graeme Gott Date: 2013-07-26 Update French translation. -commit 822fcc22daab7a3eeecec3771df996a09d26f014 +commit 915b5ae7b09a61c1ffd0c2eee811b4ea87f54578 Author: Graeme Gott Date: 2013-07-25 Add Japanese translation. -commit 90d8898bb8ba2281c2e359c8afb04456455f7bda +commit fcac7b029edb267c0e93e41f6cafa34afc1dbb2a Author: Graeme Gott Date: 2013-07-25 diff -Nru xfce4-whiskermenu-plugin-1.1.1/NEWS xfce4-whiskermenu-plugin-1.2.0/NEWS --- xfce4-whiskermenu-plugin-1.1.1/NEWS 2013-08-08 14:43:15.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/NEWS 2013-10-29 18:31:06.000000000 +0000 @@ -1,3 +1,18 @@ +1.2.0 +===== +- Fix popup script to show correct version information. +- Fix memory leak when reloading applications. +- Fix favorites and recent deleted when menu failed to load. +- Add option to load menu hierarchy. +- Add option to not include favorites in recently used. +- Add options to set custom commands. +- Add option to show recently used by default. +- Add option to position search entry next to panel button. +- Add option to position command buttons next to search entry. +- Add manual page for popup script. +- Use tabs for configuration dialog layout. +- Translation updates: Brazilian Portuguese, Bulgarian, Catalan, Croatian, Danish, Dutch, Finnish, French, German, Greek, Hebrew, Italian, Japanese, Malay, Norwegian Bokmål, Polish, Portuguese, Romanian, Russian, Serbian (Latin), Slovak, Spanish, Uzbek. + 1.1.1 ===== - Add name to main widget to allow styling. diff -Nru xfce4-whiskermenu-plugin-1.1.1/debian/changelog xfce4-whiskermenu-plugin-1.2.0/debian/changelog --- xfce4-whiskermenu-plugin-1.1.1/debian/changelog 2013-09-08 16:52:16.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/debian/changelog 2013-10-30 21:04:36.000000000 +0000 @@ -1,8 +1,29 @@ -xfce4-whiskermenu-plugin (1.1.1-0ppa1~quantal1~andre1) quantal; urgency=low +xfce4-whiskermenu-plugin (1.2.0-0ppa1~quantal1~andre1) quantal; urgency=low * Backport from Ubuntu / Debian without changes - -- Andre Klitzing Sun, 08 Sep 2013 18:52:16 +0200 + -- Andre Klitzing Wed, 30 Oct 2013 22:04:36 +0100 + +xfce4-whiskermenu-plugin (1.2.0-0ppa1~quantal1) quantal; urgency=low + + * New upstream release + - Fix popup script to show correct version information. + - Fix memory leak when reloading applications. + - Fix favorites and recent deleted when menu failed to load. + - Add option to load menu hierarchy. + - Add option to not include favorites in recently used. + - Add options to set custom commands. + - Add option to show recently used by default. + - Add option to position search entry next to panel button. + - Add option to position command buttons next to search entry. + - Add manual page for popup script. + - Use tabs for configuration dialog layout. + - Translation updates: Brazilian Portuguese, Bulgarian, Catalan, + Croatian, Danish, Dutch, Finnish, French, German, Greek, Hebrew, + Italian, Japanese, Malay, Norwegian Bokmål, Polish, Portuguese, + Romanian, Russian, Serbian (Latin), Slovak, Spanish, Uzbek. + + -- Graeme Gott Tue, 29 Oct 2013 18:52:54 +0000 xfce4-whiskermenu-plugin (1.1.1-0ppa1~quantal1) quantal; urgency=low diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/CMakeLists.txt 2013-07-29 09:30:38.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -3,13 +3,17 @@ add_subdirectory(ar) add_subdirectory(bg) add_subdirectory(ca) +add_subdirectory(cs) add_subdirectory(da) add_subdirectory(de) add_subdirectory(el) -add_subdirectory(es) add_subdirectory(en_GB) +add_subdirectory(es) +add_subdirectory(et) +add_subdirectory(fi) add_subdirectory(fr) add_subdirectory(he) +add_subdirectory(hr) add_subdirectory(hu) add_subdirectory(id) add_subdirectory(it) @@ -24,6 +28,9 @@ add_subdirectory(ro) add_subdirectory(ru) add_subdirectory(sk) +add_subdirectory(sr@latin) add_subdirectory(sv) add_subdirectory(tr) +add_subdirectory(uk) +add_subdirectory(uz) add_subdirectory(vi) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ar/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ar/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ar/xfce4-whiskermenu-plugin.po 2013-08-08 15:38:25.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ar/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,9 +6,9 @@ # Karim Oulad Chalha , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-08-07 15:21+0000\n" "Last-Translator: Karim Oulad Chalha \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ar/)\n" @@ -18,79 +18,121 @@ "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "كل" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "قائمة Whisker" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "مظهر" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "زر الشريط" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "سلوك" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "إختر أيقونة" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "عرض التطبيقات حسب _الإسم" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "عرض _وصف التطبيقات" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "ح_جم أيقونة العنصر:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "_حجم أيقونة الصنف:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "زر الشريط" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "عر_ض:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "أيقونة" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "عنوان" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "أيقونة و عنوان" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "عن_وان:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_أيقونة:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "سلوك" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "تبديل الأصناف ح_سب الترفيف" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "إختر أيقونة" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "كل الإعدادات" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "قفل الشاشة" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "تسجيل الخروج" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "رتب أبجديا أ-ي" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "رتب أبجديا ي-أ" @@ -122,68 +164,68 @@ msgid "Very Large" msgstr "كبير جدا" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "فشل تنفيذ الأمر \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "كل الإعدادات" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "قفل الشاشة" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "تسجيل الخروج" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "مفضلات" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "مستعملة حديثا" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "فشل فتح مدير الإعدادات." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "فشل إغلاق الشاشة." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "فشل تسجيل الخروج." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "أضف إلى المفضلات" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "حذف من المفضلات" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "أضف إلى سطح المكتب" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "أضف إلى الشريط" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "عاجز عن إضافة المطلقة إلى سطح المكتب." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "عاجز عن إضافة المطلقة إلى الشريط." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "قائمة التطبيقات" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/bg/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/bg/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/bg/xfce4-whiskermenu-plugin.po 2013-08-08 15:49:07.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/bg/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # cybercop , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-13 09:53+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-20 15:43+0000\n" "Last-Translator: cybercop \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/bg/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Всички" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Меню" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" msgstr "Външен вид" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Бутон в панела" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "Поведение" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "Команди" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Избор на икона" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Показване на програмите по имена" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Показване на програмите по описание" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Полето за търсене да се намира след бутона в панела" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Командите да се намират след полето за търсене" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Размер на иконите на елементите:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Размер на иконите на категориите:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Бутон в панела" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Покажи:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Икона" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Заглавие" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Икона и заглавие" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "Заглавие:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "Икона:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Поведение" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Смяна на категориите при посочване" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Избор на икона" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Йерархия на зареждане на менюто" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Покажи любимите в последно използваните" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Покажи последно използваните по подразбиране" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "Настройки:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Заключване на екрана:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Изход:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Сортиране по азбучен ред от А-Я" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Сортиране по азбучен ред от Я-А" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Много голяма" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Неуспешно изпълнение на команда \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Всички настройки" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Заключване на екрана" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Изход" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Любими" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Последно използвани" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Неуспешно отваряне на мениджъра на настройките." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Неуспешно заключване на екрана." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Неуспешно излизане." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Добавяне към Любими" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Премахване от Любими" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Добавяне към Работният плот" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Добавяне в панела" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Неуспешно добавяне на стартер върху работният плот." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Неуспешно добавяне на стартер в панела." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Меню на програмите" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ca/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ca/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ca/xfce4-whiskermenu-plugin.po 2013-08-08 15:50:01.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ca/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -7,11 +7,11 @@ # oriolfa , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-08-06 13:43+0000\n" -"Last-Translator: Adolfo Jayme Barrientos \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-18 19:35+0000\n" +"Last-Translator: oriolfa \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,79 +19,115 @@ "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Totes" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menú Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aparença" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Botó del _Panel" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Comportament" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Aparença" +msgid "_Commands" +msgstr "_Ordres" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Trieu una icona" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Ordena les aplicacions per _nom" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Mostra la _descripció de les aplicacions" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Posició de entrada de _cerca prop del botó del panel" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Posició ordres prop de l'_entrada de cerca" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Mida d’icona de l’ele_ment:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Mida d’icona de la categ_oria:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Botó del panell" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Mo_stra:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icona" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Títol" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icona i títol" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Títol:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icona:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportament" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Canvia de categoria en a_puntar amb el ratolí" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Trieu una icona" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Carregar la je_rarquia del menú" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Inclou _favorits als usats recentment" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Mostra els _usats recentment per defecte" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Preferències:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Blocar _Pantalla" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Surt" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Ordena alfabèticament A–Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Ordena alfabèticament Z–A" @@ -123,68 +159,68 @@ msgid "Very Large" msgstr "Molt gran" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "S’ha produït un error en executar l’ordre «%s»." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Tota la configuració" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Bloca la pantalla" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Finalitza la sessió" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" -msgstr "Favorites" +msgstr "Favorits" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Recents" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "S’ha produït un error en obrir el gestor de configuració." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "S’ha produït un error en blocar la pantalla." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "S’ha produït un error en tancar la sessió." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Afegeix a Favorites" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Suprimeix de Favorites" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Afegeix a l’escriptori" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Afegeix al panell" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." -msgstr "No s'ha pogut afegir l'accés directe a l'escriptori." +msgstr "No s’ha pogut afegir el llançador a l’escriptori." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." -msgstr "No s'ha pogut afegir l'accés directa al panell." +msgstr "No s’ha pogut afegir el llançador al panell." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menú d’aplicacions" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/cs/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/cs/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/cs/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/cs/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(cs ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/cs/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/cs/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/cs/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/cs/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,234 @@ +# Czech translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# Riftyful , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-08-21 15:50+0000\n" +"Last-Translator: Riftyful \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/cs/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "Vše" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Whisker Menu" + +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" +msgstr "Vzhled" + +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Tlačítko Panelu" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Chování" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Vyberte Ikonu" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Ukázat aplikace podle _Jména" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "Ukázat _popisy aplikací" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "_Velikost ikon položek:" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "Velikost ikon kateg_orií:" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "_Zobrazení:" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Ikona" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "Název" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "Ikona a název" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "Náz_ev:" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Ikona:" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "Přepínat _kategorie najetím kurzoru" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Všechna Nastavení" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Uzamknout Obrazovku" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Odhlásit se" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "Seřadit Abecedně A-Z" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "Seřadit Abecedně Z-A" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Velmi Malé" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Menší" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Malé" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Normální" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Velké" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Větší" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Velmi Velké" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "Nepodařilo se vykonat příkaz \"%s\"." + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Všechna Nastavení" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Uzamknout Obrazovku" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Odhlásit se" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Oblíbené" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Nedávno použité" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "Nepodařilo se otevřít správce nastavení." + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "Nepodařilo se uzamknout obrazovku." + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Nepodařilo se odhlásit." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Přidat k Oblíbeným" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Odebrat z Oblíbených" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Přidat na Plochu" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Přidat na Panel" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "Nelze přidat spouštěč na plochu." + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "Nelze přidat spouštěč na panel." + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Menu Aplikací" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Vyčistit Nedávno Použité" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/da/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/da/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/da/xfce4-whiskermenu-plugin.po 2013-08-08 15:51:41.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/da/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # Jens E. Jensen , 2013 +# Morten Juhl-Johansen Zölde-Fejér , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-19 09:41+0000\n" -"Last-Translator: Jens E. Jensen \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-27 16:23+0000\n" +"Last-Translator: Morten Juhl-Johansen Zölde-Fejér \n" "Language-Team: Danish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,79 +19,115 @@ "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Alt" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menu" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Udseende" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Panelknap" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Opførsel" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Udseende" +msgid "_Commands" +msgstr "_Kommandoer" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Vælg et ikon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Vis applikationer efter _navn" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Vis applikationers _beskrivelser" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Placer _søgning ved siden af panelknap" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Placer kommandoer ved siden af søgning" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Valg_mulighed ikonstørrelse" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kateg_ori ikonstørrelse" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panelknap" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "_skærm" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titel" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon og titel" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titel:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Opførsel" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Skift kategori ved at flytte musemarkør" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Vælg et ikon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Indlæs menuers hie_rarki" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Medtag _favoritter blandt senest anvendte" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Vis _senest anvendte som standard" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Indstillinger" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Lås _skærm:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Log _ud:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sorter alfabetisk A-Å" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sort alfabetisk Å-A" @@ -122,68 +159,68 @@ msgid "Very Large" msgstr "Meget stor" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Kunne ikke udføre kommandoen \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Alle indstillinger" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Lås skærm" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Log ud" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoritter" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Senest anvendt" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Kunne ikke åbne indstillings-håndtering" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." -msgstr "Kunne ikke låse skærmen" +msgstr "Kunne ikke låse skærmen." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Kunne ikke logge ud" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Tilføj til favoritter" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Fjern fra favoritter" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Tilføj til skrivebord" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Tilføj til panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Kunne ikke tilføje opstartsikon til skrivebordet." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Kunne ikke tilføje opstartsikon til panelet" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Applikationsmenu" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/de/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/de/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/de/xfce4-whiskermenu-plugin.po 2013-08-08 15:51:35.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/de/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # manjarolinux , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-14 23:05+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-18 18:29+0000\n" "Last-Translator: manjarolinux \n" "Language-Team: German (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/de/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Alle" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menü" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aussehen" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Panel-Knopf" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Verhalten" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Erscheinungsbild" +msgid "_Commands" +msgstr "_Befehle" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Wähle ein Symbol" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Zeige Programme bei _Namen" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Zeige Programm _Beschreibungen" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Positioniere _Sucheintrag neben Panel-Knopf" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Positioniere Kommandos neben Such_eintrag" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Sy_mbolgröße:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kateg_oriegröße:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panel Knopf" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Di_splay:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Symbol" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titel" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Symbol und Titel" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titel:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Symbol:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Verhalten" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Wechsel Kategorien mit sc_hweben" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Wähle ein Symbol" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Lademenü-Hie_rarchie" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Beziehe _Favorieten in zuletzt benutzt mit ein" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Zeige zuletzt ben_utzt standardmäßig an" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "Ein_stellungen:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Sperre Bild_schirm:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Abmelden:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sortiere alphabetisch A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sortiere alphabetisch Z-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Sehr groß" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Konnte Kommando \"%s\" nicht ausführen." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Alle Einstellungen" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Bildschirm sperren" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Abmelden" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoriten" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Zuletzt genutzt" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Konnte Einstellungs-Manager nicht starten." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Konnte Bildschirm nicht sperren." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Konnte nicht abmelden." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Zu Favoriten hinzufügen" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Von Favoriten entfernen" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Zum Desktop hinzufügen" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Zum Panel hinzufügen" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Konnte Launcher nicht zum Desktop hinzufügen." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Konnte Launcher nicht zum Panel hinzufügen." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Programm Menü" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/el/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/el/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/el/xfce4-whiskermenu-plugin.po 2013-08-08 15:52:15.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/el/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # angel_solomos , 2013 +# Γιάννης Ανθυμίδης , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-14 11:47+0000\n" -"Last-Translator: angel_solomos \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-08-23 19:51+0000\n" +"Last-Translator: Γιάννης Ανθυμίδης \n" "Language-Team: Greek (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,85 +19,127 @@ "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Όλα" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Μενού Whisker" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Εμφάνιση" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Κουμπί ταμπλό" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Συμπεριφορά" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Επιλογή Εικονιδίου" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" -msgstr "Προβολή εφαρμογών κατά όνομα" +msgstr "Προβολή εφαρμογών κατά ό_νομα" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" -msgstr "Εμφάνιση περιγραφής εφαρμογών" +msgstr "Εμφάνιση περιγραφής _εφαρμογών" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" -msgstr "Μέγεθος εικονιδίων αντικειμένων:" +msgstr "Μέγεθος εικονιδίων _αντικειμένων:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" -msgstr "Μέγεθος εικονιδίων κατηγοριών:" - -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Κουμπί ταμπλό" +msgstr "Μέγεθος εικονιδίων _κατηγοριών:" -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" -msgstr "Εμφάνιση:" +msgstr "Εμ_φάνιση:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Εικονίδιο" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Τίτλος" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Εικονίδιο και τίτλος" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" -msgstr "Τίτλος:" +msgstr "_Τίτλος:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" -msgstr "Εικονίδιο:" +msgstr "_Εικονίδιο:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Συμπεριφορά" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" -msgstr "Αλλαγή κατηγοριών στο πέρασμα του ποντικιού" +msgstr "Αλλαγή κατηγοριών στο _πέρασμα του ποντικιού" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Επιλογή εικονιδίου" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Όλες οι Επιλογές" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Κλείδωμα Οθόνης" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Αποσύνδεση" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" -msgstr "Αλφαβητική ταξινόμηση Α-Ζ" +msgstr "Αλφαβητική Ταξινόμηση Α-Ω" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" -msgstr "Αλφαβητική ταξινόμηση Ζ-Α" +msgstr "Αλφαβητική Ταξινόμηση Ω-Α" #: src/icon_size.cpp:50 msgid "Very Small" -msgstr "Πολύ μικρά" +msgstr "Πολύ Μικρά" #: src/icon_size.cpp:51 msgid "Smaller" @@ -120,73 +163,73 @@ #: src/icon_size.cpp:56 msgid "Very Large" -msgstr "Πολύ μεγάλα" +msgstr "Πολύ Μεγάλα" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." -msgstr "Αποτυχία εκτέλεσης εντολής \"%s\"." +msgstr "Αποτυχία εκτέλεσης εντολής «%s»." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" -msgstr "Όλες οι επιλογές" +msgstr "Όλες οι Επιλογές" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" -msgstr "Κλείδωμα οθόνης" +msgstr "Κλείδωμα Οθόνης" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Αποσύνδεση" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Αγαπημένα" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" -msgstr "Χρησημοποιήθηκαν πρόσφατα" +msgstr "Χρησιμοποιήθηκαν Πρόσφατα" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." -msgstr "Αποτυχία εκκίνησης του διαχειριστή ρυθμίσεων" +msgstr "Αποτυχία εκκίνησης του διαχειριστή ρυθμίσεων." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Αποτυχία κλειδώματος οθόνης." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Αποτυχία αποσύνδεσης." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Προσθήκη στα Αγαπημένα" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Αφαίρεση από τα Αγαπημένα" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" -msgstr "Προσθήκη στην επιφάνει εργασίας" +msgstr "Προσθήκη στην Επιφάνειά Εργασίας" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" -msgstr "Προσθήκη στο ταμπλό" +msgstr "Προσθήκη στο Ταμπλό" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Απέτυχε η προσθήκη εκκινητή στην επιφάνεια εργασίας." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Απέτυχε η προσθήκη εκκινητή στο ταμπλό." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" -msgstr "Μενού εφαρμογών" +msgstr "Μενού Εφαρμογών" #: src/recent_page.cpp:71 msgid "Clear Recently Used" -msgstr "Καθαρισμός πρόσφατα χρησιμοποιημένων" +msgstr "Εκκαθάριση Πρόσφατα Χρησιμοποιημένων" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/en_GB/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/en_GB/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/en_GB/xfce4-whiskermenu-plugin.po 2013-08-08 15:52:38.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/en_GB/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-13 00:11+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-09 22:00+0000\n" "Last-Translator: Graeme Gott \n" "Language-Team: \n" "Language: \n" @@ -17,79 +17,115 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "All" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menu" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Appearance" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Panel Button" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Behaviour" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Appearance" +msgid "_Commands" +msgstr "_Commands" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Select An Icon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Show applications by _name" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Show application _descriptions" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Position _search entry next to panel button" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Position commands next to search _entry" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Ite_m icon size:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Categ_ory icon size:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panel Button" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Di_splay:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Title" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icon and title" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Title:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Behaviour" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Switch categories by _hovering" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Select An Icon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Load menu hie_rarchy" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Include _favourites in recently used" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Display recently _used by default" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Settings:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Lock _Screen:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Log _Out:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sort Alphabetically A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sort Alphabetically Z-A" @@ -121,68 +157,68 @@ msgid "Very Large" msgstr "Very Large" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Failed to execute command \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "All Settings" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Lock Screen" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Log Out" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favourites" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Recently Used" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Failed to open settings manager." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Failed to lock screen." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Failed to log out." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Add to Favourites" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Remove From Favourites" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Add to Desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Add to Panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Unable to add launcher to desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Unable to add launcher to panel." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Applications Menu" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/es/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/es/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/es/xfce4-whiskermenu-plugin.po 2013-08-08 15:53:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/es/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -9,11 +9,11 @@ # Pablo Lezaeta , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-08-06 13:30+0000\n" -"Last-Translator: Adolfo Jayme Barrientos \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-21 02:25+0000\n" +"Last-Translator: Pablo Lezaeta \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,79 +21,115 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Todas" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menú Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Apariencia" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Botones del _panel" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Comportamiento" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Apariencia" +msgid "_Commands" +msgstr "_Órdenes" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Seleccione un icono" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Ordenar las aplicaciones por _nombre" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" -msgstr "Mostrar _descripción de las aplicaciones" +msgstr "Mostrar las _descripciones de las aplicaciones" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Posicionar la entrada de _búsqueda al lado del botón del panel" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Posicionar comandos al lado de la _entrada de búsqueda" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Tamaño de icono de los ele_mentos:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Tamaño de icono de las categ_orías:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Botón del panel" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" -msgstr "Mue_stra:" +msgstr "Mo_strar:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icono" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Título" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icono y título" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Título:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icono:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportamiento" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Cambiar de categoría al a_puntarla con el ratón" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Seleccione un icono" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Cargar h_erarquía del menú" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Incluir _favoritos en la entrada de usadas recientemente" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Mostrar _usadas recientemente por defecto" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Configuraciones:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Bloquear _pantalla:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Salir de la sesión:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Ordenar alfabéticamente de A a Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Ordenar alfabéticamente de Z a A" @@ -125,68 +161,68 @@ msgid "Very Large" msgstr "Gigante" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "No se pudo ejecutar la orden «%s»." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Todas las configuraciones" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Bloquear la pantalla" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Cerrar la sesión" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoritas" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Usadas recientemente" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Falló la ejecución del gestor de configuración." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "No se pudo bloquear la pantalla." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "No se pudo cerrar la sesión." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Añadir a Favoritas" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Eliminar de Favoritas" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Añadir al escritorio" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Añadir al panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "No se pudo añadir el lanzador al escritorio." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "No se pudo añadir el lanzador al panel." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menú de aplicaciones" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/et/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/et/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/et/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/et/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(et ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/et/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/et/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/et/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/et/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,228 @@ +# Estonian translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# Asto Banko , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-21 11:25+0000\n" +"Last-Translator: Asto Banko \n" +"Language-Team: Estonian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/et/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: et\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Whisker Menüü" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Vali ikoon" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Näita programme, järgi _nime" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Ikoon" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Ikoon:" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Lae menüü hie_rarhia" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Lisa_lemmikud hiljuti kasutatutesse" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Sätted:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Logi_välja:" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Väga väike" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Väiksem" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Väike" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Normaalne" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Suur" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Suurem" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Väga suur" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "" + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Kõik sätted" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Logi välja" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Lemmikud" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Hiljuti kasutatud" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "" + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "" + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Välja logimine ebaõnnestus." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Lisa lemmikutesse" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Eemalda lemmikutest" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Lisa töölauale" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Lisa paneelile" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "" + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "" + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Rakenduste menüü" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Puhasta hiljuti kasutatud" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/fi/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/fi/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/fi/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/fi/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(fi ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/fi/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/fi/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/fi/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/fi/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,228 @@ +# Finnish translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# SamiPerkele , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-25 22:27+0000\n" +"Last-Translator: SamiPerkele \n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/fi/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fi\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "Kaikki" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Whisker-valikko" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Ulkoasu" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Paneelinäppäin" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Toimintatapa" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "_Komennot" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Valitse kuvake" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Näytä ohjelmat _nimen mukaan" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "Näytä ohjelmien _kuvaukset" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Sijoita _hakukenttä paneelipainikkeen viereen." + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Sijoita komennot _hakukentän viereen" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "Koh_teen kuvakkeen koko" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "Kateg_orian kuvakkeen koko:" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "Nä_yttö:" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Kuvake" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "Otsikko" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "Kuvake ja otsikko" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "_Otsikko:" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Kuvake:" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "Vaihda ryhmiä _klikkaamatta" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Lataa valikkohie_rarkia" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Sisällytä _suosikit viimeksi käytettyihin" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Näytä vakiona viimeksi käytetyt" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Asetukset:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Lukitse _näyttö:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Kirjaudu _ulos:" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "Järjestä aakkosten mukaan A-Ö" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "Järjestä aakkosten mukaan Ö-A" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Erittäin pieni" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Pienempi" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Pieni" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Normaali" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Suuri" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Suurempi" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Erittäin suuri" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "Komennon \"%s\" suorittaminen epäonnistui." + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Kaikki asetukset" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Lukitse näyttö" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Kirjaudu ulos" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Suosikit" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Viimeksi käytetyt" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "Asetustenhallinnan avaaminen epäonnistui." + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "Näytön lukitseminen epäonnistui." + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Ulos kirjautuminen epäonnistui." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Lisää suosikkeihin" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Poista suosikeista" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Lisää työpöydälle" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Lisää paneeliin" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "Työpöydälle ei voitu luoda käynnistintä." + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "Paneeliin ei voitu luoda käynnistintä." + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Ohjelmavalikko" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Pyyhi viimeksi käytetyt" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/fr/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/fr/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/fr/xfce4-whiskermenu-plugin.po 2013-08-08 15:53:38.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/fr/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the xfce4-whiskermenu-plugin package. # # Translators: +# Pingax , 2013 # Draky , 2013 # Ennoia , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-26 09:53+0000\n" -"Last-Translator: Ennoia \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-27 09:22+0000\n" +"Last-Translator: Pingax \n" "Language-Team: French (France) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/fr_FR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,79 +20,120 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Tout" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Apparence" + +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Bouton du panneau" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Comportement" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Apparence" +msgid "_Commands" +msgstr "_Commandes" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Sélectionnez une icône" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Trier les applications par _nom" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Montrer les _descriptions des applications" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Taille des icônes des élé_ments :" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Taille des icônes des caté_gories :" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Bouton du panneau" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Affichage" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icône" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Texte" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icône et texte" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titre :" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icône :" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportement" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "C_hanger de catégories en survolant" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Sélectionnez une icône" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Tous les paramètres" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Écran de verrouillage" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Déconnexion" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Classement alphabétique croissant" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Classement alphabétique décroissant" @@ -123,68 +165,68 @@ msgid "Very Large" msgstr "Très grand" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Échec lors de l'exécution de la commande \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Tous les paramètres" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Écran de verrouillage" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Déconnexion" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoris" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Récemment utilisés" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Échec lors du lancement du gestionnaire de paramètres" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Échec lors du verrouillage de l'écran." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Échec lors de la déconnexion." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Ajouter aux favoris" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Retirer des favoris" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Ajouter au bureau" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Ajouter au tableau de bord" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Impossible d'ajouter le lanceur sur le bureau." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Impossible d'ajouter le lanceur dans le tableau de bord." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu des applications" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/he/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/he/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/he/xfce4-whiskermenu-plugin.po 2013-08-08 15:54:03.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/he/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # GenghisKhan , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-15 12:12+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-15 05:15+0000\n" "Last-Translator: GenghisKhan \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/he/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "כולם" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "תפריט זיף" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "הו_פעה" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_לחצן לוח" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "הת_נהגות" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "הופעה" +msgid "_Commands" +msgstr "_פקודות" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "בחר צלמית" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "הצג יישומים לפי _שם" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "הצג _תיאורי יישום" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "מקם רישום _חיפוש ליד לחצן לוח" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "מקם פקודות ליד _רישום חיפוש" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "גודל צלמית _פריט:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "גודל צלמית _קטגוריה:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "לחצן לוח" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "ת_צוגה:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "צלמית" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "כותרת" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "צלמית וגם כותרת" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_כותרת:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_צלמית:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "התנהגות" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "החלף קטגוריות על ידי _ריחוף" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "בחר צלמית" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "טען מ_דרג תפריט" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "הכלל _מועדפים בתוך בשימוש לאחרונה" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "הצג בפתיחה את ב_שימוש לאחרונה" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_הגדרות:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "נעל _מסך:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "הת_נתק:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "מיין לפי אלף-בית א-ת" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "מיין לפי אלף-בית ת-א" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "גדול מאוד" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "נכשל להוציא לפועל פקודה \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "כל ההגדרות" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "נעל מרקע" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "התנתק" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "מועדפים" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "בשימוש לאחרונה" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "נכשל לפתוח מנהל הגדרות." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "נכשל לנעול מרקע." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "נכשל להתנתק." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "הוסף אל תוך מועדפים" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "הסר מתוך מועדפים" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "הוסף אל תוך שולחן עבודה" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "הוסף אל תוך לוח" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "אין אפשרות להוסיף משגר אל תוך שולחן עבודה." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "אין אפשרות להוסיף משגר אל תוך לוח." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "תפריט יישומים" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/hr/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/hr/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/hr/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/hr/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(hr ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/hr/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/hr/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/hr/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/hr/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,228 @@ +# Croatian translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# ilija.culap14 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-13 09:52+0000\n" +"Last-Translator: ilija.culap14 \n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/hr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: hr\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "Sve" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Whisker Izbornik" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "Izg_led" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Dugm_e na ploči" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "Pon_ašanje" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "Nared_be" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Izaberi ikonu" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Prikaži aplikacije po _imenu" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "Prikazi _opis aplikacije" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Postavi _pretraživanje kraj dugmeta na ploči" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Postavi komande kraj pret_raživanja" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "Veličina ik_one stavke:" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "Veličin_a ikone kategorije:" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "Zas_lon:" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Ikona" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "Naslov" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "Ikona i naslov" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "_Naslov:" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Ikona" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "Promjeni kategoriju prij_elazom miša" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Učitaj redosljed izbornika" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Uključi _Omiljeno u Najčešće korišteno" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Prikaži Najčešće korišteno prema zadanom" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "Postavke:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Zaključaj _zaslon:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Od_java" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "Posloži prema abecedi (A-Ž)" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "Posloži prema abecedi (Ž-A)" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Jako malo" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Manje" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Malo" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Normalno" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Veliko" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Veće" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Jako veliko" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "Greška pri izvođenju naredbe \"%s\"." + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Sve Postavke" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Zaključaj zaslon" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Odjava" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Omiljeno" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Najčešće korišteno" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "Greška pri otvaranju upravitelja postavki." + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "Greška pri zaključavanju zaslona." + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Greška pri pokušaju odjave." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Dodaj u Omiljeno" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Obriši iz grupe Omiljeno" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Dodaj na Radnu površinu" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Dodaj na ploču" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "Nije moguće dodati pokretač na Radnu površinu." + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "Nije moguće dodati pokretač na Ploču" + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Izbornik aplikacija" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Očisti kategoriju Najčešće korišteno" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/hu/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/hu/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/hu/xfce4-whiskermenu-plugin.po 2013-08-08 15:54:27.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/hu/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,9 +6,9 @@ # xazax , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-24 09:59+0000\n" "Last-Translator: xazax \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/hu/)\n" @@ -18,79 +18,121 @@ "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Összes" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menü" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Kinézet" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Panel Gomb" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Működés" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Ikon kiválasztása" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "_Név szerinti megjelenítés" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr " _Leírás szerinti megjelenítés" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "I_kon méret:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "_Kategória ikon méret:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panel Gomb" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "M_egjelenítés:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Cím" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon és cím" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Cím:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Működés" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Kategóriák váltása _fókusszal." -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Ikon kiválasztása" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Minden beállítás" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Képernyő zárolása" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Kijelentkezés" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Rendezés ABC rendben növekvően" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Rendezés ABC rendben csökkenően" @@ -122,68 +164,68 @@ msgid "Very Large" msgstr "Nagyon Nagy" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Nem sikerült végrehajtani a \"%s\" parancsot." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Minden beállítás" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Képernyő zárolása" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Kijelentkezés" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Kedvencek" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Előzmények" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "A beállítások megnyitása sikertelen." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "A képernyő zárolása sikertelen." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "A kijelentkezés sikertelen" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Hozzáadás a kedvencekhez" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Eltávolítás a kedvencekből" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Ikon hozzáadása az Asztalhoz" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Ikon hozzáadása a tálcához" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Nem lehet az ikont kirakni az asztalra." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Nem lehet az ikont kirakni a tálcára." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Alkalmazások Menü" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/id/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/id/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/id/xfce4-whiskermenu-plugin.po 2013-08-08 15:54:49.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/id/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,9 +6,9 @@ # Mohamad Hasan Al Banna, 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-31 21:33+0000\n" "Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/id/)\n" @@ -18,79 +18,121 @@ "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Semua" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Penampilan" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Tombol Panel" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Kebiasaan" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Pilih Ikon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Tampilkan aplikasi berdasarkan _nama" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Tampilkan _deskripsi aplikasi" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "ukuran ikon ite_m:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "ukuran ikon Kateg_ory:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Tombol Panel" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Ta_mpilan:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Judul" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon dan judul" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Judul:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Kebiasaan" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Ganti kategori dengan _melayang" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Pilih Ikon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Semua Pengaturan" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Kunci Layar" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Keluar" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Urutan Alfabet A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Urutan Alfabet Z-A" @@ -122,68 +164,68 @@ msgid "Very Large" msgstr "Sangat Besar" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Gagak mengeksekusi perintah \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Semua Pengaturan" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Kunci Layar" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Keluar" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favorit" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Terakhir diGunakan" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Gagal membuka menejer pengaturan." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Gagal mengunci layar." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Gagal keluar." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Tambahkan ke Favorit" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Hapus Dari Favorit" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Tambahkan ke Desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Tambahkan ke Panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Gagal menambahkan peluncur ke desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Gagal menambahkan peluncur ke panel." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu Aplikasi" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/it/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/it/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/it/xfce4-whiskermenu-plugin.po 2013-08-08 15:55:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/it/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # Bernardo Miguel Savone , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plguin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-13 00:49+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-12 12:24+0000\n" "Last-Translator: Bernardo Miguel Savone \n" "Language-Team: Italian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/it/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Tutto" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aspetto" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Pulsante del pannello" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Comportamento" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Aspetto" +msgid "_Commands" +msgstr "_Comandi" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Selezionare un'icona" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Mostra le applicazioni per _nome" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "mostra una _descrizione delle applicazioni" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Posizionare il campo _Cerca accanto al pulsante del pannello" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Posizionare comandi accanto al _campo cerca" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Dimensione icona Ite_m:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Dimensione icona Categ_oria:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Pulsante del pannello" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Di_splay:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icona" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titolo" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icona e titolo" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titolo:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icona:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportamento" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Cambia categorie al _passaggio del mouse" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Selezionare un'icona" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Carica st_ruttura del menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Includere _preferiti in usati di recente" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Visualizzare _usati di di recente come predeterminato" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Impostazioni:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Blocco schermo:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Log _Out:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Ordina alfabeticamente A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Ordina alfabeticamente Z-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Molto grande" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Impossibile eseguire il comando \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Tutte le impostazioni" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Blocca schermo" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Esci" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Preferiti" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Usati di recente" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Impossibile aprire il Gestore delle impostazioni." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Impossibile bloccare lo schermo." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Disconnessione non riuscita." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Aggiungi ai Preferiti" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Rimuovi dai Preferiti" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Aggiungi al Desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Aggiungi al Pannello" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Impossibile aggiungere lanciatore al desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Impossibile aggiungere lanciatore al pannello." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu Applicazioni" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ja/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ja/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ja/xfce4-whiskermenu-plugin.po 2013-08-08 15:55:43.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ja/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # Masato HASHIMOTO , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-25 15:14+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-18 06:16+0000\n" "Last-Translator: Masato HASHIMOTO \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ja/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "すべて" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menu" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "外観(_A)" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "パネルボタン(_P)" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "振る舞い(_B)" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "外観" +msgid "_Commands" +msgstr "コマンド(_C)" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "アイコンの選択" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "アプリケーションを名前で表示する(_N)" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "アプリケーションの説明を表示する(_D)" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "検索フィールドをパネルボタンの後に置く(_S)" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "コマンドを検索フィールドの後に置く(_E)" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "アイテムのアイコンサイズ(_M):" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "カテゴリのアイコンサイズ(_O):" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "パネルボタン" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "表示(_S):" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "アイコン" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "タイトル" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "アイコンとタイトル" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "タイトル(_T):" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "アイコン(_I):" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "振る舞い" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "ホバーでカテゴリを切り替える(_H)" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "アイコンの選択" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "メニュー階層を読み込む(_R)" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "最近使ったものにお気に入りを含める(_F)" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "デフォルトで最近使ったものを表示する(_U)" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "設定(_S):" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "スクリーンをロック(_S):" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "ログアウト(_O):" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "アルファベット順 (A-Z) で並び替え" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "アルファベットの逆順 (Z-A) で並び替え" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "とても大きい" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "コマンド \"%s\" の実行に失敗しました。" -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" -msgstr "すべての設定" +msgstr "設定マネージャー" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "スクリーンをロック" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "ログアウト" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "お気に入り" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "最近使ったもの" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "設定マネージャーを開くことに失敗しました。" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "スクリーンのロックに失敗しました。" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "ログアウトに失敗しました。" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "お気に入りに追加" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "お気に入りから削除" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "デスクトップに追加" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "パネルに追加" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "デスクトップにランチャーを追加できません。" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "パネルにランチャーを追加できません。" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "アプリケーションメニュー" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/kk/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/kk/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/kk/xfce4-whiskermenu-plugin.po 2013-08-08 15:56:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/kk/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-18 22:46+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" @@ -18,79 +18,121 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.4\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Барлығы" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker мәзірі" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Сыртқы түрі" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Панель батырмасы" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Мінез-құлығы" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Таңбашаны таңдаңыз" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Қолданбаларды а_ты бойынша көрсету" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Қолданбалар с_ипаттамаларын көрсету" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Эле_мент таңбашасы өлшемі:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Сан_ат таңбашасы өлшемі:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Панель батырмасы" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Көр_сету:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Таңбаша" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Атауы" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Таңбаша және атауы" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "А_тауы:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Таңбаша:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Мінез-құлығы" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Санаттарды үстіне а_пару арқылы ауыстырыңыз" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Таңбашаны таңдаңыз" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Барлық баптаулар" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Экранды бұғаттау" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Шығу" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Әліппемен сұрыптау A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Әліппемен сұрыптау Z-A" @@ -122,68 +164,68 @@ msgid "Very Large" msgstr "Өте үлкен" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "\"%s\" командасын орындау сәтсіз аяқталды." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Барлық баптаулар" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Экранды бұғаттау" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Шығу" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Таңдамалы" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Соңғы қолданылған" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Баптаулар басқарушысын ашу сәтсіз аяқталды." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Экранды бұғаттау сәтсіз аяқталды." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Жүйеден шығу сәтсіз аяқталды." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Таңдамалыларға қосу" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Таңдамалылардан өшіру" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Жұмыс үстеліне қосу" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Панельге қосу" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Жөнелткішті жұмыс үстеліне қосу мүмкін емес." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Жөнелткішті панельге қосу мүмкін емес." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Қолданбалар мәзірі" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ms/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ms/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ms/xfce4-whiskermenu-plugin.po 2013-08-08 15:56:38.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ms/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # abuyop , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-29 00:39+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-26 05:10+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ms/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: ms\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Semua" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "Pen_apilan" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Butang _Panel" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Kelakuan" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Penampilan" +msgid "_Commands" +msgstr "P_erintah" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Pilih Satu Ikon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Tunjuk aplikasi mengikut _nama" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Tunjuk _keterangan aplikasi" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Kedudukan masukan _gelintar bersebelahan butang panel" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Kedudukan perintah bersebelahan _masukan gelintar" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Saiz ikon ite_m:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Saiz ikon kateg_ori:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Butang Panel" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Papa_ran:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Tajuk" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon dan tajuk" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Tajuk:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Kelakuan" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Tukar kategori mengikut pe_ngapungan" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Pilih Satu Ikon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Muat hie_raki menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Sertakan ke_gemaran dalam diguna baru-baru ini" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Papar dig_una baru-baru ini secara lalai" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Tetapan:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Kunci _Skrin:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Daftar Keluar:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Isih A-Z Secara Berabjad" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Isih Z-A Secara Berabjad" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Sangat Besar" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Gagal lakukan perintah \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Semua Tetapan" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Kunci Skrin" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Daftar Keluar" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Kegemaran" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Diguna Baru-baru Ini" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Gagal membuka pengurus tetapan." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Gagal mengunci skrin." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Gagal mendaftar keluar." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Tambah ke Kegemaran" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Buang Dari Kegemaran" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Tambah ke Desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Tambah ke Panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Tidak boleh tambah pelancar ke desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Tidak boleh tambah pelancar ke panel." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu Aplikasi" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/nb/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/nb/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/nb/xfce4-whiskermenu-plugin.po 2013-08-08 15:57:02.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/nb/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # viking60 , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-16 21:27+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-21 15:08+0000\n" "Last-Translator: viking60 \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/nb/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Alle" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker-meny" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Utseende" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Paneltast" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Oppførsel" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Utseende" +msgid "_Commands" +msgstr "_Kommandoer" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Velg et ikon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Vis etter applikasjonsnavn" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Vis applikasjonsbeskrivelser" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Plasser _søket ved siden av paneltasten" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Plasser kommandoer ved siden av søket" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "lkonstørrelse:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kateg_ori ikonstørrelse:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Paneltast" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Vi_sning:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Tittel" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon og tittel" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Tittel" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Oppførsel" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Endre kategorier ved mus over" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Velg et ikon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Last menystruktur" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Inkluder_favoritter i siste brukte" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Vis siste_brukte som standard" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Innstillinger" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Lås_skjermen" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Logg_ut" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sorter alfabetisk A-Ø" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sorter alfabetisk Ø-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Veldig stor" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Kunne ikke kjøre kommandoen \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Alle innstillinger" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Lås skjermen" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Logg ut" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoritter" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Siste brukte" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Kunne ikke åpne innstillinger" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Kunne ikke låse skjermen" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Kunne ikke logge ut" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Legg til i favoritter" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Fjern fra favoritter" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Legg til på skrivebordet" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Legg til på panel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Kunne ikke legge oppstarter til skrivebordet" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Kunne ikke legge oppstarter til panelet" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Applikasjonsmeny" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/nl/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/nl/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/nl/xfce4-whiskermenu-plugin.po 2013-08-08 15:57:24.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/nl/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # Pjotr123 , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-13 17:04+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-17 22:25+0000\n" "Last-Translator: Pjotr123 \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/nl/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Alle" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whiskermenu" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" msgstr "Uiterlijk" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Werkbalkknop" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "Gedrag" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "Opdrachten" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Kies een pictogram" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Toon toepassingen op _naam" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Toon _beschrijvingen van toepassingen" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Plaats zoekopdracht naast werkbalkknop" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Plaats opdrachten naast zoekopdracht" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Pictogramgrootte van element:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Pictogramgrootte van categorie:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Werkbalkknop" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Tonen:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Pictogram" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titel" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Pictogram en titel" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titel:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Pictogram:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Gedrag" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Verwissel van categorie door muispijl erop te laten rusten" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Kies een pictogram" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Menu-opbouw laden" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Favorieten opnemen in onlangs gebruikt" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Toon standaard onlangs gebruikt" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "Instellingen:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Scherm vergrendelen:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Afmelden:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sorteer alfabetisch van A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sorteer alfabetisch van Z-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Heel groot" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Kon opdracht '%s' niet uitvoeren" -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Alle instellingen" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Scherm vergrendelen" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Afmelden" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favorieten" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Onlangs gebruikt" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Kon instellingenbeheerder niet openen." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Kon scherm niet vergrendelen." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Kon niet afmelden." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Voeg toe aan favorieten" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Verwijder uit favorieten" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Voeg toe aan bureaublad" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Voeg toe aan werkbalk" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Kon starter niet toevoegen aan bureaublad." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Kon starter niet toevoegen aan werkbalk." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Toepassingenmenu" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/pl/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/pl/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/pl/xfce4-whiskermenu-plugin.po 2013-08-08 15:57:49.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/pl/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -5,13 +5,14 @@ # Translators: # december, 2013 # OSWorld , 2013 +# M T , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-16 10:54+0000\n" -"Last-Translator: OSWorld \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-20 16:22+0000\n" +"Last-Translator: M T \n" "Language-Team: Polish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,79 +20,115 @@ "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Wszystkie" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menu" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Wygląd" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Przycisk _panelu" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Zachowanie" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Wygląd" +msgid "_Commands" +msgstr "_Polecenia" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Wybierz ikonę" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Pokaż aplikacje po _nazwie" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Pokaż _opis aplikacji" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Umieść pasek _wyszukiwania się obok paska przycisków" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Umieść _polecenia obok paska wyszukiwania" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Rozmiar ikony przed_miotu:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Rozmiar ikony kateg_orii:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Przycisk panelu" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "_Wyświetlacz:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikona" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Etykieta" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikona i nazwa" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Nazwa" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikona:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Zachowanie" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Zmień kategorię _najeżdżając" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Wybierz ikonę" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Załaduj hie_rarchię menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Dołącz _faworyty do ostatnio używanych" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Pokaż ostatnio _używane domyślnie" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Ustawienia:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Zablokuj _ekran:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Wyloguj:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sortuj alfabetycznie A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sortuj alfabetycznie Z-A" @@ -123,68 +160,68 @@ msgid "Very Large" msgstr "Największa" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Nie można uruchomić polecenia \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Wszystkie ustawienia" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Zablokuj ekran" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Wyloguj" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Ulubione" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Ostatnio używane" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Niepowodzenie uruchomienia menedżera ustawień" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Niepowodzenie zablokowania ekranu" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Niepowodzenie wylogowania" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Dodaj do Ulubionych" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Usuń z Ulubionych" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Dodaj na Pulpit" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Dodaj do Panelu" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Nie można dodać aktywatora na pulpicie" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Nie można dodać aktywatora do panelu" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu aplikacji" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/pt/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/pt/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/pt/xfce4-whiskermenu-plugin.po 2013-08-08 15:58:12.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/pt/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -7,10 +7,10 @@ # Sérgio Marques , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-22 09:19+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-10 00:00+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pt/)\n" "MIME-Version: 1.0\n" @@ -19,79 +19,115 @@ "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Todas" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aparência" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Botão do _painel" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "C_omportamento" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Aparência" +msgid "_Commands" +msgstr "_Comandos" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Escolha um icone" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Mostrar aplicações por _nome" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Mostrar _descrição das aplicações" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Po_sicionar pesquisa junto ao botão do painel" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Posicionar comandos junto à _entrada de pesquisa" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Tamanho do ícone do ite_m:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Tamanho do ícone da categ_oria:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Botão do painel" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "E_xibição:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icone" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Título" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icone e título" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Título:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "Í_cone:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportamento" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Trocar categorias ao _passar com o rato" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Escolha um icone" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Carrega_r hierarquida de menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Incluir _favoritos nos itens recentes" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Por definição, mostrar itens recentes _utilizados" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "Definiçõe_s:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Ecrã de _bloqueio:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Sair:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Ordem alfabética A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Ordem alfabética Z-A" @@ -123,68 +159,68 @@ msgid "Very Large" msgstr "Enorme" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Falha ao executar o comando \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Todas as definições" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Bloquear ecrã" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Sair" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoritos" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Usadas recentemente" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Falha ao abrir o gestor de definições." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Falha ao bloquear ecrã." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Falha ao sair." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Adicionar aos favoritos" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Remover dos favoritos" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Adicionar à área de trabalho" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Adicionar ao painel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Não foi possível adicionar lançador à área de trabalho." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Não foi possível adicionar lançador ao painel." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu de aplicações" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/pt_BR/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/pt_BR/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/pt_BR/xfce4-whiskermenu-plugin.po 2013-08-08 15:58:39.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/pt_BR/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -4,13 +4,14 @@ # # Translators: # fabioluciano , 2013 +# brk0_0, 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-18 21:25+0300\n" -"Last-Translator: fabioluciano \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-28 22:44+0000\n" +"Last-Translator: brk0_0\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,79 +19,115 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Tudo" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aparência" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Botão do Painel" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Comportamento" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Aparência" +msgid "_Commands" +msgstr "_Comandos" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Selecione um icone" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Mostrar aplicativos por _nome" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Mostrar descrição do aplicativo" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Posicionar entrada de _busca ao lado do botão do painel" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Posicionar comandos ao lado da _entrada de busca" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Tamanho do icone do íte_m" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Tamanho do icone da categ_oria" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Botão do painel" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Mo_strar:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Icone" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Título" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Icone e título" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Título" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Icone:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportamento" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Trocar categoria ao _passar do mouse" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Selecione um icone" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Carregar hie_rarquia de menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Incluir os _favoritos nos recentemente usados" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Mostrar recentemente _usados por padrão" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Configurações" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Bloquear _Tela" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Sair:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Organizar alfabeticamente A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Organizar alfabeticamente Z-A" @@ -122,68 +159,68 @@ msgid "Very Large" msgstr "Enorme" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Falhou ao executar o comando \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Todas as configurações" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Travar a tela" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Sair" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoritos" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Usados Recentemente" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Falhou ao abrir o gerenciador de configurações" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Falhou ao travar a tela" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Falhou ao sair" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Adicionar aos Favoritos" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Remover dos favoritos" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Adicionar à área de trabalho" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Adicionaro ao painel" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Impossível adicionar o lançador à área de trabalho" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Impossível adicionar o lançador ao painel" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu de aplicativos" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ro/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ro/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ro/xfce4-whiskermenu-plugin.po 2013-08-08 15:59:02.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ro/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # Ayceman , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-14 09:22+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-10 22:04+0000\n" "Last-Translator: Ayceman \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ro/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Toate" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Meniu Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Aspect" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Buton de Panou" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "Compo_rtament" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Aspect" +msgid "_Commands" +msgstr "_Comenzi" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Selectează o iconiță" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Arată aplicațiile după _nume" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Arată _descrierile aplicațiilor" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Poziționează căsuța de căutare _lângă butonul de panou" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Poziționează comen_zi lângă căsuța de căutare" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "_Mărimea iconiței articolului:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Mărimea iconiței categ_oriei:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Butonul panoului" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Afi_șaj:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Iconiță" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titlu" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Iconiță și titlu" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Titlu" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Iconiță:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Comportare" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Schimbă categoriile _planând cursorul" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Selectează o iconiță" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Încarcă ierar_hia meniului" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Include _favoritele în utilizate recent" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Arată implicit recent _utilizatele" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Setări" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Blochează _Ecranul:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Delo_ghează:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sortează alfabetic A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sortează alfabetic Z-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Foarte mare" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "A eșuat executarea comenzii \"%s\"" -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Toate setările" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Blochează ecranul" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Închide sesiunea" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favorite" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Folosite recent" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "A eșuat deschiderea gestionarului de setări." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "A eșuat blocarea ecranului." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "A eșuat închiderea sesiunii." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Adaugă la favorite" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Șterge din favorite" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Adaugă la desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Adaugă la panou" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Nu s-a putut adăuga lansator la desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Nu s-a putut adăuga lansator la panou." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Meniul de aplicații" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/ru/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/ru/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/ru/xfce4-whiskermenu-plugin.po 2013-08-08 15:59:28.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/ru/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the xfce4-whiskermenu-plugin package. # # Translators: +# Артём Демаков , 2013 # Kyrill Detinov , 2013 # asvl , 2013 # shlyapugin , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-31 18:32+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-23 16:47+0000\n" "Last-Translator: Kyrill Detinov \n" "Language-Team: Russian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/ru/)\n" "MIME-Version: 1.0\n" @@ -20,79 +21,115 @@ "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Все" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Меню Whisker" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Вид" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Кнопка панели" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Поведение" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Внешний вид" +msgid "_Commands" +msgstr "Ко_манды" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Выбрать значок" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Показывать _имена приложений" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Показывать _описания приложений" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Строка _поиска около панели" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Кнопки команд _рядом со строкой поиска" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Размер значка _элемента:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Размер значка _категории:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Кнопка на панели" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "_Показывать:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Значок" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Заголовок" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Значок и заголовок" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Заголовок:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "Зна_чок:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Поведение" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Переключать категории по наведению _мыши" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Выбрать значок" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "_Группировать пункты в меню" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Включить _Избранное в Недавние" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "По _умолчанию показывать Недавние" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Настройки:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Блокировка _экрана:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Выход из системы" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Сортировать по алфавиту от А до Я" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Сортировать по алфавиту от Я до А" @@ -124,68 +161,68 @@ msgid "Very Large" msgstr "Очень большой" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Ошибка выполнения команды \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Настройки" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Блокировка экрана" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Выйти" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Избранное" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Недавние" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Не удалось открыть диспетчер настроек." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Не удалось заблокировать экран." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Не удалось выйти." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Добавить в «Избранное»" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Удалить из «Избранного»" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Добавить на «Рабочий стол»" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Добавить на панель" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Нельзя добавить на «Рабочий стол»." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Нельзя добавить на панель." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Меню приложений" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/sk/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/sk/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/sk/xfce4-whiskermenu-plugin.po 2013-08-08 15:59:49.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/sk/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,10 +6,10 @@ # Slavko , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" -"PO-Revision-Date: 2013-07-13 06:37+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-10 15:03+0000\n" "Last-Translator: Slavko \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sk/)\n" "MIME-Version: 1.0\n" @@ -18,79 +18,115 @@ "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Všetky" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whisker Menu" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "Vzhľ_ad" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Tlačidlo _panela" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Správanie" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" -msgstr "Vzhľad" +msgid "_Commands" +msgstr "_Príkazy" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Vyberte ikonu" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Zobraziť aplikácie podľa _mena" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Zobraziť _popis aplikácie" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Umiestniť položku hľadať vedľa tlačidla panela" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Umiestniť príkazy _vedľa položky hľadať" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Veľkosť ikony _položky" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Veľkosť ikony _kategorie" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Tlačidlo panela" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "_Zobraziť:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikona" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Názov" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikona a názov" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Názov:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikona:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Správanie" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Nasledovať kategóriu po_d myšou" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Vyberte ikonu" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Načítať hierarchiu menu" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "V Nedávno použitých zahrnúť _Obľúbené" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Predvolene zobraziť nedávno _použité" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Nastavenia:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "_Zamknúť obrazovku_" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "_Odhlásiť:" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Zoradiť abecedne A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Zoradiť abecedne Z-A" @@ -122,68 +158,68 @@ msgid "Very Large" msgstr "Celkom veľké" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Zlyhalo vykonanie príkazu „%s”." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Všetky nastavenia" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Zamknúť obrazovku" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Odhlásiť" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Obľúbené" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Nedávne" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Zlyhalo otvorenie správcu nastavení." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Zlyhalo zamknutie obrazovky." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Zlyhalo odhlásenie." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Pridať k obľúbeným" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Odstrániť z obľúbených" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Pridať na plochu" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Pridať do panela" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Nemožno pridať spúšťač na plochu" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Nemožno pridať spúšťač do panela" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu aplikácií" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/sr@latin/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/sr@latin/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/sr@latin/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/sr@latin/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(sr@latin ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/sr@latin/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/sr@latin/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/sr@latin/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/sr@latin/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,229 @@ +# Serbian (Latin) translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# kakonema , 2013 +# Vladimir Rujević , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-19 13:35+0000\n" +"Last-Translator: Vladimir Rujević \n" +"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sr@latin/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sr@latin\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "Sve" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Meni Whisker" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Izgled" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "Dugme _Panela" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Ponašanje" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "_Komande" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Izaberi ikonu" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Prikaži aplikacije po _imenu" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "Prikaži _opis aplikacije" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "Postavi _polje za pretragu pored dugmeta na panelu" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "Postavi komande pored polja _za pretragu" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "Stavk_a veličina ikone:" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "Veličina ikonice kategor_ije:" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "Pri_kaži:" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Ikona" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "Naziv" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "Ikona i naziv" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "_Naziv:" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Ikona" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "Zameni kategorije prilikom _zadržavanja" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Učitaj hije_rarhiju menija" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "Obuhvati _omiljene u nedavno korišćeno" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Prikaži nedavno _korišćeno kao opšte" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Podešavanja:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "Zaključaj _ekran:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Odjavi _se:" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "Sortiraj abecedno A-Z" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "Sortiraj abecedno Z-A" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Najmanje" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Manje" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Malo" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Normalno" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Veliko" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Veće" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Najveće" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "Neuspelo izvrašavanje komande \"%s\"" + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Sva podešavanja" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Zaključaj ekran" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Odjavi se" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Omiljeni" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Nedavno korišćeno" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "Neuspelo otvaranje menadžera podešavanja." + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "Neuspelo zaključavanje ekrana." + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Neuspelo odjavljivanje." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Dodaj u omiljene" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Ukloni iz omiljenih" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Dodaj na radnu površinu" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Dodaj na panel" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "Neuspelo dodavanje pokretača na radnu površinu." + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "Neuspjelo dodavanje prečice na panel." + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Meni aplikacije" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Obriši nedvano korišćeno" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/sv/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/sv/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/sv/xfce4-whiskermenu-plugin.po 2013-08-08 16:00:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/sv/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -7,9 +7,9 @@ # tsw , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-24 09:29+0000\n" "Last-Translator: addegsson \n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/sv_SE/)\n" @@ -19,79 +19,121 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Alla" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Whiskermeny" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Utseende" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Panelknapp" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Beteende" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Välj en ikon" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Visa applikationer efter _namn" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Applikations beskrivning" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Objekt ikonstorlek:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kategori ikonstorlek:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panelknapp" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Visa:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Ikon" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Titel" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Ikon och titel" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "Titel:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Ikon:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Beteende" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Byt kategori med muspekaren" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Välj en ikon" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Alla inställningar" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Låskärm" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Logga ut" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sortera Alfabetiskt A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sortera Alfabetiskt Z-A" @@ -123,68 +165,68 @@ msgid "Very Large" msgstr "Väldigt Stor" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Misslyckades att exekvera kommando \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Alla inställningar" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Låskärm" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Logga ut" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Favoriter" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Nyligen använda" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Kan ej öppna inställningshanteraren." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Kan ej låsa skärmen." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Kan ej logga ut." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Lägg till i favoriter" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Ta bort från favoriter" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Lägg till på skrivbordet" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Lägg till i panlen" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Kan ej skapa skrivbordsgenväg." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Kan ej lägga till i panelen." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Programmeny" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/tr/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/tr/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/tr/xfce4-whiskermenu-plugin.po 2013-08-08 16:00:31.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/tr/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -7,9 +7,9 @@ # yfdogan , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-14 22:07+0000\n" "Last-Translator: yfdogan \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/tr/)\n" @@ -19,79 +19,121 @@ "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Hepsi" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Gözde Menü" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Görünüm" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Panel Düğmesi" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Davranış:" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Bir Simge Seçin" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Uygulamaları _isme göre göster" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Uygulama _tanımlarını göster" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Öğe simge boyutu:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kategori simge boyutu:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Panel Düğmesi" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "Görüntü:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Simge" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Başlık" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Başlık ve Simge" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Başlık:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Simge" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Davranış:" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Kategorileri gezintiye göre değiştir" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Bir Simge Seçin" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Bütün Ayarlar" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Ekranı Kilitle" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Çıkış" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Alfabetik diz A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Alfabetik diz Z-A" @@ -123,68 +165,68 @@ msgid "Very Large" msgstr "Çok büyük" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "\"%s\" Komutunu Yürütme Hatası" -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Bütün Ayarlar" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Ekranı Kilitle" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Çıkış" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Gözdeler" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Son Kullanılanlar" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Ayarlar Yöneticisini Açma Hatası" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Ekran Kilitleme Hatası" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Çıkış Hatası" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Gözdelere Ekle" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Gözdelerden Kaldır" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Masaüstüne Ekle" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Panele Ekle" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Çalıştırıcı Masaüstüne Eklenemedi" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Çalıştırıcı Panele Eklenemedi" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Uygulamalar Menüsü" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/uk/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/uk/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/uk/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/uk/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(uk ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/uk/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/uk/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/uk/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/uk/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,228 @@ +# Ukrainian translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# zubr139 , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-20 22:01+0000\n" +"Last-Translator: zubr139 \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/uk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "" + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Всі налаштування" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Блокування екрану" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Вихід" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "" + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "" + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "" + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Додати до стільниці" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Додати на панель" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "" + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "" + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/uz/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/po/uz/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/po/uz/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/uz/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1 @@ +GETTEXT_PROCESS_PO_FILES(uz ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR} PO_FILES xfce4-whiskermenu-plugin.po) diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/uz/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/uz/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/uz/xfce4-whiskermenu-plugin.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/uz/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,228 @@ +# Uzbek translation of xfce4-whiskermenu-plugin. +# Copyright (C) 2013 Graeme Gott +# This file is distributed under the same license as the xfce4-whiskermenu-plugin package. +# +# Translators: +# Umidjon Almasov , 2013 +msgid "" +msgstr "" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" +"PO-Revision-Date: 2013-10-19 10:18+0000\n" +"Last-Translator: Umidjon Almasov \n" +"Language-Team: Uzbek (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/uz/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uz\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: src/applications_page.cpp:312 +msgid "All" +msgstr "Hammasi" + +#: src/configuration_dialog.cpp:57 +msgid "Whisker Menu" +msgstr "Whisker menyusi" + +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "_Ko'rinish" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "_Panel tugmasi" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "_Xulqi" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "_Buyruqlar" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Nishonchani tanlash" + +#: src/configuration_dialog.cpp:265 +msgid "Show applications by _name" +msgstr "Dasturlarni _nomi bo'yicha ko'rsatish" + +#: src/configuration_dialog.cpp:271 +msgid "Show application _descriptions" +msgstr "Dastur _ta'riflarini ko'rsatish" + +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "_Qidirish elementini panel tugmasidan keyin joylashtirish" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "_Buyruqlarni qidirish elementidan keyin joylashtirish" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" +msgstr "_Band nishonchasining o'lchami:" + +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" +msgstr "_Toifa nishonchasinig o'lchami:" + +#: src/configuration_dialog.cpp:348 +msgid "Di_splay:" +msgstr "_Ko'rsatish:" + +#: src/configuration_dialog.cpp:354 +msgid "Icon" +msgstr "Nishoncha" + +#: src/configuration_dialog.cpp:355 +msgid "Title" +msgstr "Sarlavha" + +#: src/configuration_dialog.cpp:356 +msgid "Icon and title" +msgstr "Nishoncha va sarlavha" + +#: src/configuration_dialog.cpp:366 +msgid "_Title:" +msgstr "_Sarlavha" + +#: src/configuration_dialog.cpp:381 +msgid "_Icon:" +msgstr "_Nishoncha:" + +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" +msgstr "Toifalarni sichqoncha ustiga borganda o'zgartirish" + +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "Menyu _ierarxiyasini yuklash" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "_Tanlanganlarni yaqinda foydalanilganlarga qo'shish" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "Yaqinda _foydalanilganlarni sukut bo'yicha ko'rsatish" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "_Moslamalar:" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "_Ekranni qulflash:" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" +msgstr "Tizimdan _chiqish:" + +#: src/favorites_page.cpp:89 +msgid "Sort Alphabetically A-Z" +msgstr "Alifbo bo'yicha saralash A-Z" + +#: src/favorites_page.cpp:95 +msgid "Sort Alphabetically Z-A" +msgstr "Alifbo bo'yicha saralash Z-A" + +#: src/icon_size.cpp:50 +msgid "Very Small" +msgstr "Juda kichik" + +#: src/icon_size.cpp:51 +msgid "Smaller" +msgstr "Kichikroq" + +#: src/icon_size.cpp:52 +msgid "Small" +msgstr "Kichik" + +#: src/icon_size.cpp:53 +msgid "Normal" +msgstr "Oddiy" + +#: src/icon_size.cpp:54 +msgid "Large" +msgstr "Katta" + +#: src/icon_size.cpp:55 +msgid "Larger" +msgstr "Kattaroq" + +#: src/icon_size.cpp:56 +msgid "Very Large" +msgstr "Juda katta" + +#: src/launcher.cpp:259 +#, c-format +msgid "Failed to execute command \"%s\"." +msgstr "\"%s\" buyrug'ini bajarish muvaffaqiyatsiz tugadi." + +#: src/menu.cpp:110 +msgid "All Settings" +msgstr "Hamma moslamalar" + +#: src/menu.cpp:113 +msgid "Lock Screen" +msgstr "Ekranni qulflash" + +#: src/menu.cpp:116 +msgid "Log Out" +msgstr "Tizimdan chiqish" + +#: src/menu.cpp:130 +msgid "Favorites" +msgstr "Tanlanganlar" + +#: src/menu.cpp:136 +msgid "Recently Used" +msgstr "Yaqinda foydalanilganlar" + +#: src/menu.cpp:963 +msgid "Failed to open settings manager." +msgstr "Moslamalar boshqaruvchisini ochish muvaffaqiyatsiz tugadi." + +#: src/menu.cpp:977 +msgid "Failed to lock screen." +msgstr "Ekranni qulflash muvaffaqiyatsiz tugadi." + +#: src/menu.cpp:991 +msgid "Failed to log out." +msgstr "Tizimdan chiqish muvaffaqiyatsiz tugadi." + +#: src/page.cpp:194 +msgid "Add to Favorites" +msgstr "Tanlanganlarga qo'shish" + +#: src/page.cpp:202 +msgid "Remove From Favorites" +msgstr "Tanlanganlardan olib tashlash" + +#: src/page.cpp:209 +msgid "Add to Desktop" +msgstr "Ishchi stolga qo'shish" + +#: src/page.cpp:213 +msgid "Add to Panel" +msgstr "Panelga qo'shish" + +#: src/page.cpp:303 +msgid "Unable to add launcher to desktop." +msgstr "Ishga tushiruvchini ishchi stolga qo'shib bo'lmadi." + +#: src/page.cpp:342 src/page.cpp:351 +msgid "Unable to add launcher to panel." +msgstr "Ishga tushiruvchini panelga qo'shib bo'lmadi." + +#: src/panel_plugin.cpp:160 +msgid "Applications Menu" +msgstr "Dasturlar menyusi" + +#: src/recent_page.cpp:71 +msgid "Clear Recently Used" +msgstr "Yaqinda foydalanilganlarni tozalash" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/vi/xfce4-whiskermenu-plugin.po xfce4-whiskermenu-plugin-1.2.0/po/vi/xfce4-whiskermenu-plugin.po --- xfce4-whiskermenu-plugin-1.1.1/po/vi/xfce4-whiskermenu-plugin.po 2013-08-08 16:00:50.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/vi/xfce4-whiskermenu-plugin.po 2013-10-29 18:29:33.000000000 +0000 @@ -6,9 +6,9 @@ # ppanhh , 2013 msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: 2013-07-13 01:38+0000\n" "Last-Translator: ppanhh \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/xfce4-whiskermenu-plugin/language/vi/)\n" @@ -18,79 +18,121 @@ "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "Tất cả" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "Menu Tách Biệt" -#: src/configuration_dialog.cpp:68 -msgid "Appearance" +#: src/configuration_dialog.cpp:65 +#, fuzzy +msgid "_Appearance" msgstr "Giao diện" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:66 +#, fuzzy +msgid "_Panel Button" +msgstr "Nút điều khiển" + +#: src/configuration_dialog.cpp:67 +#, fuzzy +msgid "_Behavior" +msgstr "Tác động" + +#: src/configuration_dialog.cpp:68 +msgid "_Commands" +msgstr "" + +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "Chọn một biểu tượng" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "Hiển thị ứng dụng bằng_tên" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "Hiển thị mô tả_ứng dụng" -#: src/configuration_dialog.cpp:88 +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" +msgstr "" + +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 msgid "Ite_m icon size:" msgstr "Kí_ch thước biểu tượng đối tượng:" -#: src/configuration_dialog.cpp:108 +#: src/configuration_dialog.cpp:313 msgid "Categ_ory icon size:" msgstr "Kích thướ_c biểu tượng phân loại:" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" -msgstr "Nút điều khiển" - -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "H_iển thị:" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "Biểu tượng" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "Tiêu đề" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "Tiêu đề và biểu tượng" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "_Tiêu đề:" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "_Biểu tượng:" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" -msgstr "Tác động" - -#: src/configuration_dialog.cpp:187 +#: src/configuration_dialog.cpp:409 msgid "Switch categories by _hovering" msgstr "Chuyển đổi tiêu đề khi rê ch_uột" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" -msgstr "Chọn một biểu tượng" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" +msgstr "" + +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +#, fuzzy +msgid "_Settings:" +msgstr "Tất cả thiết lập" + +#: src/configuration_dialog.cpp:467 +#, fuzzy +msgid "Lock _Screen:" +msgstr "Khóa màn hình" + +#: src/configuration_dialog.cpp:482 +#, fuzzy +msgid "Log _Out:" +msgstr "Đăng xuất" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "Sắp xếp theo thứ tự A-Z" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "Sắp xếp theo thứ tự Z-A" @@ -122,68 +164,68 @@ msgid "Very Large" msgstr "Rất lớn" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Thất bại khi thi hành lệnh \"%s\"." -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "Tất cả thiết lập" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "Khóa màn hình" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "Đăng xuất" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "Ưa Thích" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "Truy cập gần đây" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "Thất bại khi mở quản lý thiết lập." -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "Thất bại khi khóa màn hình." -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "Thất bại khi đăng xuất." -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "Thêm vào Ưa Thích" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "Loại bỏ khỏi Ưa Thích" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "Thêm vào Desktop" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "Thêm và Khung" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "Không thể thêm vào thanh truy cập nhanh ở desktop." -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "Không thể thêm vào thanh truy cập nhanh hay khung." -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "Menu ứng dụng" diff -Nru xfce4-whiskermenu-plugin-1.1.1/po/xfce4-whiskermenu-plugin.pot xfce4-whiskermenu-plugin-1.2.0/po/xfce4-whiskermenu-plugin.pot --- xfce4-whiskermenu-plugin-1.1.1/po/xfce4-whiskermenu-plugin.pot 2013-08-08 15:39:17.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/po/xfce4-whiskermenu-plugin.pot 2013-10-29 18:29:33.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: xfce4-whiskermenu-plugin 1.1.1\n" +"Project-Id-Version: xfce4-whiskermenu-plugin 1.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-08 15:36+0000\n" +"POT-Creation-Date: 2013-10-09 22:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,79 +17,115 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/applications_page.cpp:299 +#: src/applications_page.cpp:312 msgid "All" msgstr "" -#: src/configuration_dialog.cpp:54 +#: src/configuration_dialog.cpp:57 msgid "Whisker Menu" msgstr "" +#: src/configuration_dialog.cpp:65 +msgid "_Appearance" +msgstr "" + +#: src/configuration_dialog.cpp:66 +msgid "_Panel Button" +msgstr "" + +#: src/configuration_dialog.cpp:67 +msgid "_Behavior" +msgstr "" + #: src/configuration_dialog.cpp:68 -msgid "Appearance" +msgid "_Commands" msgstr "" -#: src/configuration_dialog.cpp:73 +#: src/configuration_dialog.cpp:94 +msgid "Select An Icon" +msgstr "" + +#: src/configuration_dialog.cpp:265 msgid "Show applications by _name" msgstr "" -#: src/configuration_dialog.cpp:79 +#: src/configuration_dialog.cpp:271 msgid "Show application _descriptions" msgstr "" -#: src/configuration_dialog.cpp:88 -msgid "Ite_m icon size:" +#: src/configuration_dialog.cpp:277 +msgid "Position _search entry next to panel button" msgstr "" -#: src/configuration_dialog.cpp:108 -msgid "Categ_ory icon size:" +#: src/configuration_dialog.cpp:283 +msgid "Position commands next to search _entry" +msgstr "" + +#: src/configuration_dialog.cpp:293 +msgid "Ite_m icon size:" msgstr "" -#: src/configuration_dialog.cpp:125 -msgid "Panel Button" +#: src/configuration_dialog.cpp:313 +msgid "Categ_ory icon size:" msgstr "" -#: src/configuration_dialog.cpp:133 +#: src/configuration_dialog.cpp:348 msgid "Di_splay:" msgstr "" -#: src/configuration_dialog.cpp:139 +#: src/configuration_dialog.cpp:354 msgid "Icon" msgstr "" -#: src/configuration_dialog.cpp:140 +#: src/configuration_dialog.cpp:355 msgid "Title" msgstr "" -#: src/configuration_dialog.cpp:141 +#: src/configuration_dialog.cpp:356 msgid "Icon and title" msgstr "" -#: src/configuration_dialog.cpp:151 +#: src/configuration_dialog.cpp:366 msgid "_Title:" msgstr "" -#: src/configuration_dialog.cpp:166 +#: src/configuration_dialog.cpp:381 msgid "_Icon:" msgstr "" -#: src/configuration_dialog.cpp:182 -msgid "Behavior" +#: src/configuration_dialog.cpp:409 +msgid "Switch categories by _hovering" msgstr "" -#: src/configuration_dialog.cpp:187 -msgid "Switch categories by _hovering" +#: src/configuration_dialog.cpp:415 +msgid "Load menu hie_rarchy" msgstr "" -#: src/configuration_dialog.cpp:209 -msgid "Select An Icon" +#: src/configuration_dialog.cpp:421 +msgid "Include _favorites in recently used" +msgstr "" + +#: src/configuration_dialog.cpp:427 +msgid "Display recently _used by default" +msgstr "" + +#: src/configuration_dialog.cpp:452 +msgid "_Settings:" +msgstr "" + +#: src/configuration_dialog.cpp:467 +msgid "Lock _Screen:" +msgstr "" + +#: src/configuration_dialog.cpp:482 +msgid "Log _Out:" msgstr "" -#: src/favorites_page.cpp:73 +#: src/favorites_page.cpp:89 msgid "Sort Alphabetically A-Z" msgstr "" -#: src/favorites_page.cpp:79 +#: src/favorites_page.cpp:95 msgid "Sort Alphabetically Z-A" msgstr "" @@ -121,68 +157,68 @@ msgid "Very Large" msgstr "" -#: src/launcher.cpp:263 +#: src/launcher.cpp:259 #, c-format msgid "Failed to execute command \"%s\"." msgstr "" -#: src/menu.cpp:101 +#: src/menu.cpp:110 msgid "All Settings" msgstr "" -#: src/menu.cpp:104 +#: src/menu.cpp:113 msgid "Lock Screen" msgstr "" -#: src/menu.cpp:107 +#: src/menu.cpp:116 msgid "Log Out" msgstr "" -#: src/menu.cpp:121 +#: src/menu.cpp:130 msgid "Favorites" msgstr "" -#: src/menu.cpp:127 +#: src/menu.cpp:136 msgid "Recently Used" msgstr "" -#: src/menu.cpp:743 +#: src/menu.cpp:963 msgid "Failed to open settings manager." msgstr "" -#: src/menu.cpp:757 +#: src/menu.cpp:977 msgid "Failed to lock screen." msgstr "" -#: src/menu.cpp:771 +#: src/menu.cpp:991 msgid "Failed to log out." msgstr "" -#: src/page.cpp:182 +#: src/page.cpp:194 msgid "Add to Favorites" msgstr "" -#: src/page.cpp:190 +#: src/page.cpp:202 msgid "Remove From Favorites" msgstr "" -#: src/page.cpp:197 +#: src/page.cpp:209 msgid "Add to Desktop" msgstr "" -#: src/page.cpp:201 +#: src/page.cpp:213 msgid "Add to Panel" msgstr "" -#: src/page.cpp:291 +#: src/page.cpp:303 msgid "Unable to add launcher to desktop." msgstr "" -#: src/page.cpp:330 src/page.cpp:339 +#: src/page.cpp:342 src/page.cpp:351 msgid "Unable to add launcher to panel." msgstr "" -#: src/panel_plugin.cpp:150 +#: src/panel_plugin.cpp:160 msgid "Applications Menu" msgstr "" diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/CMakeLists.txt xfce4-whiskermenu-plugin-1.2.0/src/CMakeLists.txt --- xfce4-whiskermenu-plugin-1.1.1/src/CMakeLists.txt 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/CMakeLists.txt 2013-10-29 18:29:33.000000000 +0000 @@ -66,7 +66,6 @@ category.cpp configuration_dialog.cpp favorites_page.cpp - filter_page.cpp icon_size.cpp launcher.cpp launcher_model.cpp diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/applications_page.cpp xfce4-whiskermenu-plugin-1.2.0/src/applications_page.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/applications_page.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/applications_page.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -23,6 +23,8 @@ #include "menu.hpp" #include "section_button.hpp" +#include + extern "C" { #include @@ -32,11 +34,15 @@ //----------------------------------------------------------------------------- +static bool f_load_hierarchy = false; + +//----------------------------------------------------------------------------- + ApplicationsPage::ApplicationsPage(Menu* menu) : - FilterPage(menu), + Page(menu), m_garcon_menu(NULL), - m_current_category(NULL), m_all_button(NULL), + m_model(NULL), m_loaded(false) { // Set desktop environment for applications @@ -78,38 +84,29 @@ } // Find category matching button - m_current_category = NULL; + Category* category = NULL; for (std::vector::const_iterator i = m_categories.begin(), end = m_categories.end(); i != end; ++i) { if (GTK_TOGGLE_BUTTON((*i)->get_button()->get_button()) == togglebutton) { - m_current_category = *i; + category = *i; break; } } // Apply filter - refilter(); - m_current_category = NULL; -} - -//----------------------------------------------------------------------------- - -bool ApplicationsPage::on_filter(GtkTreeModel* model, GtkTreeIter* iter) -{ - if (!m_current_category) + if (category) { - return true; + get_view()->unset_model(); + get_view()->set_fixed_height_mode(!category->has_separators()); + get_view()->set_model(category->get_model()); } - - Launcher* launcher = NULL; - gtk_tree_model_get(model, iter, LauncherModel::COLUMN_LAUNCHER, &launcher, -1); - if (!launcher) + else { - return false; + get_view()->unset_model(); + get_view()->set_fixed_height_mode(true); + get_view()->set_model(m_model); } - - return m_current_category->contains(launcher); } //----------------------------------------------------------------------------- @@ -133,31 +130,45 @@ // Populate map of menu data m_garcon_menu = garcon_menu_new_applications(); - g_object_ref(m_garcon_menu); if (garcon_menu_load(m_garcon_menu, NULL, NULL)) { g_signal_connect_swapped(m_garcon_menu, "reload-required", G_CALLBACK(ApplicationsPage::invalidate_applications_slot), this); - load_menu(m_garcon_menu); + load_menu(m_garcon_menu, NULL); + } + else + { + return; + } + + // Sort items and categories + if (!f_load_hierarchy) + { + for (std::vector::const_iterator i = m_categories.begin(), end = m_categories.end(); i != end; ++i) + { + (*i)->sort(); + } + std::sort(m_categories.begin(), m_categories.end(), &Element::less_than); } // Create sorted list of menu items - std::multimap sorted_items; + std::vector sorted_items; + sorted_items.reserve(m_items.size()); for (std::map::const_iterator i = m_items.begin(), end = m_items.end(); i != end; ++i) { - gchar* collation_key = g_utf8_collate_key(i->second->get_text(), -1); - sorted_items.insert(std::make_pair(collation_key, i->second)); - g_free(collation_key); + sorted_items.push_back(i->second); } + std::sort(sorted_items.begin(), sorted_items.end(), &Element::less_than); // Add all items to model LauncherModel model; - for (std::multimap::const_iterator i = sorted_items.begin(), end = sorted_items.end(); i != end; ++i) + for (std::vector::const_iterator i = sorted_items.begin(), end = sorted_items.end(); i != end; ++i) { - model.append_item(i->second); + model.append_item(*i); } - - // Create filter model and pass ownership to view, do not delete! - set_model(model.get_model()); + m_model = model.get_model(); + g_object_ref(m_model); + get_view()->set_fixed_height_mode(true); + get_view()->set_model(m_model); // Update filters load_categories(); @@ -198,63 +209,65 @@ g_object_unref(m_garcon_menu); m_garcon_menu = NULL; } - - // Clear menu item cache - GarconMenuItemCache* cache = garcon_menu_item_cache_get_default(); - garcon_menu_item_cache_invalidate(cache); - g_object_unref(cache); } //----------------------------------------------------------------------------- -void ApplicationsPage::load_menu(GarconMenu* menu) +void ApplicationsPage::load_menu(GarconMenu* menu, Category* parent_category) { GarconMenuDirectory* directory = garcon_menu_get_directory(menu); // Skip hidden categories if (directory && !garcon_menu_directory_get_visible(directory)) { - g_object_unref(directory); return; } - // Only track single level of categories + // Track categories bool first_level = directory && (garcon_menu_get_parent(menu) == m_garcon_menu); - if (first_level) - { - m_current_category = new Category(directory); - m_categories.push_back(m_current_category); - } + Category* category = NULL; if (directory) { - g_object_unref(directory); - } - - // Add submenus - GList* menus = garcon_menu_get_menus(menu); - for (GList* li = menus; li != NULL; li = li->next) - { - load_menu(GARCON_MENU(li->data)); + if (first_level) + { + category = new Category(directory); + m_categories.push_back(category); + } + else if (!f_load_hierarchy) + { + category = parent_category; + } + else if (parent_category) + { + category = parent_category->append_menu(directory); + } } - g_list_free(menus); - // Add items - GarconMenuItemPool* pool = garcon_menu_get_item_pool(menu); - if (G_LIKELY(pool)) + // Add menu elements + GList* elements = garcon_menu_get_elements(menu); + for (GList* li = elements; li != NULL; li = li->next) { - garcon_menu_item_pool_foreach(pool, (GHFunc)&ApplicationsPage::load_menu_item, this); + if (GARCON_IS_MENU_ITEM(li->data)) + { + load_menu_item(GARCON_MENU_ITEM(li->data), category); + } + else if (GARCON_IS_MENU(li->data)) + { + load_menu(GARCON_MENU(li->data), category); + } + else if (GARCON_IS_MENU_SEPARATOR(li->data) && f_load_hierarchy && category) + { + category->append_separator(); + } } + g_list_free(elements); - // Only track single level of categories - if (first_level) + // Free unused top-level categories + if (first_level && category->empty()) { - // Free unused categories - if (m_current_category->empty()) - { - m_categories.erase(std::find(m_categories.begin(), m_categories.end(), m_current_category)); - delete m_current_category; - } - m_current_category = NULL; + m_categories.erase(std::find(m_categories.begin(), m_categories.end(), category)); + delete category; + category = NULL; } // Listen for menu changes @@ -263,7 +276,7 @@ //----------------------------------------------------------------------------- -void ApplicationsPage::load_menu_item(const gchar* desktop_id, GarconMenuItem* menu_item, ApplicationsPage* page) +void ApplicationsPage::load_menu_item(GarconMenuItem* menu_item, Category* category) { // Skip hidden items if (!garcon_menu_element_get_visible(GARCON_MENU_ELEMENT(menu_item))) @@ -272,21 +285,21 @@ } // Add to map - std::string key(desktop_id); - std::map::iterator iter = page->m_items.find(key); - if (iter == page->m_items.end()) + std::string desktop_id(garcon_menu_item_get_desktop_id(menu_item)); + std::map::iterator iter = m_items.find(desktop_id); + if (iter == m_items.end()) { - iter = page->m_items.insert(std::make_pair(key, new Launcher(menu_item))).first; + iter = m_items.insert(std::make_pair(desktop_id, new Launcher(menu_item))).first; } // Add menu item to current category - if (page->m_current_category) + if (category) { - page->m_current_category->push_back(iter->second); + category->append_item(iter->second); } // Listen for menu changes - g_signal_connect_swapped(menu_item, "changed", G_CALLBACK(ApplicationsPage::invalidate_applications_slot), page); + g_signal_connect_swapped(menu_item, "changed", G_CALLBACK(ApplicationsPage::invalidate_applications_slot), this); } //----------------------------------------------------------------------------- @@ -313,3 +326,28 @@ } //----------------------------------------------------------------------------- + +void ApplicationsPage::unset_model() +{ + if (m_model) + { + g_object_unref(m_model); + m_model = NULL; + } +} + +//----------------------------------------------------------------------------- + +bool ApplicationsPage::get_load_hierarchy() +{ + return f_load_hierarchy; +} + +//----------------------------------------------------------------------------- + +void ApplicationsPage::set_load_hierarchy(bool load) +{ + f_load_hierarchy = load; +} + +//----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/applications_page.hpp xfce4-whiskermenu-plugin-1.2.0/src/applications_page.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/applications_page.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/applications_page.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -17,7 +17,7 @@ #ifndef WHISKERMENU_APPLICATIONS_PAGE_HPP #define WHISKERMENU_APPLICATIONS_PAGE_HPP -#include "filter_page.hpp" +#include "page.hpp" #include #include @@ -37,7 +37,7 @@ class Menu; class SectionButton; -class ApplicationsPage : public FilterPage +class ApplicationsPage : public Page { public: @@ -46,23 +46,32 @@ Launcher* get_application(const std::string& desktop_id) const; + GtkTreeModel* get_model() const + { + return m_model; + } + void invalidate_applications(); void load_applications(); + static bool get_load_hierarchy(); + static void set_load_hierarchy(bool load); + private: void apply_filter(GtkToggleButton* togglebutton); bool on_filter(GtkTreeModel* model, GtkTreeIter* iter); void clear_applications(); - void load_menu(GarconMenu* menu); - static void load_menu_item(const gchar* desktop_id, GarconMenuItem* menu_item, ApplicationsPage* page); + void load_menu(GarconMenu* menu, Category* parent_category); + void load_menu_item(GarconMenuItem* menu_item, Category* category); void load_categories(); + void unset_model(); private: GarconMenu* m_garcon_menu; - Category* m_current_category; SectionButton* m_all_button; std::vector m_categories; std::map m_items; + GtkTreeModel* m_model; bool m_loaded; diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/category.cpp xfce4-whiskermenu-plugin-1.2.0/src/category.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/category.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/category.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -16,13 +16,32 @@ #include "category.hpp" +#include "launcher_model.hpp" #include "section_button.hpp" +#include + using namespace WhiskerMenu; //----------------------------------------------------------------------------- -Category::Category(GarconMenuDirectory* directory) +static bool is_category(const Element* element) +{ + return element && (element->get_type() == Category::Type); +} + +static bool is_null(const Element* element) +{ + return !element; +} + +//----------------------------------------------------------------------------- + +Category::Category(GarconMenuDirectory* directory) : + m_button(NULL), + m_model(NULL), + m_has_separators(false), + m_has_subcategories(false) { // Fetch icon const gchar* icon = garcon_menu_directory_get_icon_name(directory); @@ -30,6 +49,7 @@ { icon = ""; } + set_icon(icon); // Fetch text const gchar* text = garcon_menu_directory_get_name(directory); @@ -37,16 +57,274 @@ { text = ""; } - - // Create button - m_button = new SectionButton(icon, text); + set_text(text); } //----------------------------------------------------------------------------- Category::~Category() { + unset_model(); + delete m_button; + + for (std::vector::const_iterator i = m_items.begin(), end = m_items.end(); i != end; ++i) + { + if (is_category(*i)) + { + delete *i; + } + } +} + +//----------------------------------------------------------------------------- + +SectionButton* Category::get_button() +{ + if (!m_button) + { + m_button = new SectionButton(get_icon(), get_text()); + } + + return m_button; +} + +//----------------------------------------------------------------------------- + +GtkTreeModel* Category::get_model() +{ + if (!m_model) + { + if (m_has_subcategories) + { + GtkTreeStore* model = gtk_tree_store_new( + LauncherModel::N_COLUMNS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_POINTER); + insert_items(model, NULL, get_icon()); + m_model = GTK_TREE_MODEL(model); + } + else + { + GtkListStore* model = gtk_list_store_new( + LauncherModel::N_COLUMNS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_POINTER); + insert_items(model); + m_model = GTK_TREE_MODEL(model); + } + } + + return m_model; +} + +//----------------------------------------------------------------------------- + +bool Category::empty() const +{ + for (std::vector::const_iterator i = m_items.begin(), end = m_items.end(); i != end; ++i) + { + if (*i && (!is_category(*i) || !static_cast(*i)->empty())) + { + return false; + } + } + + return true; +} + +//----------------------------------------------------------------------------- + +Category* Category::append_menu(GarconMenuDirectory* directory) +{ + m_has_subcategories = true; + unset_model(); + Category* category = new Category(directory); + m_items.push_back(category); + return category; +} + +//----------------------------------------------------------------------------- + +void Category::append_separator() +{ + if (!m_items.empty() && m_items.back()) + { + unset_model(); + m_items.push_back(NULL); + m_has_separators = true; + } +} + +//----------------------------------------------------------------------------- + +void Category::sort() +{ + unset_model(); + merge(); + if (m_has_separators) + { + m_items.erase(std::remove_if(m_items.begin(), m_items.end(), is_null), m_items.end()); + } + std::sort(m_items.begin(), m_items.end(), &Element::less_than); +} + +//----------------------------------------------------------------------------- + +void Category::insert_items(GtkTreeStore* model, GtkTreeIter* parent, const gchar* fallback_icon) +{ + for (std::vector::size_type i = 0, end = m_items.size(); i < end; ++i) + { + Element* element = m_items.at(i); + if (is_category(element)) + { + Category* category = static_cast(element); + if (category->empty()) + { + continue; + } + + const gchar* icon = category->get_icon(); + if (!gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), icon)) + { + icon = fallback_icon; + } + gchar* text = g_markup_escape_text(category->get_text(), -1); + + GtkTreeIter iter; + gtk_tree_store_insert_with_values(model, + &iter, parent, INT_MAX, + LauncherModel::COLUMN_ICON, icon, + LauncherModel::COLUMN_TEXT, text, + LauncherModel::COLUMN_LAUNCHER, NULL, + -1); + g_free(text); + category->insert_items(model, &iter, icon); + } + else if (element) + { + Launcher* launcher = static_cast(element); + gtk_tree_store_insert_with_values(model, + NULL, parent, INT_MAX, + LauncherModel::COLUMN_ICON, launcher->get_icon(), + LauncherModel::COLUMN_TEXT, launcher->get_text(), + LauncherModel::COLUMN_LAUNCHER, launcher, + -1); + } + else if ((i + 1) < end) + { + gtk_tree_store_insert_with_values(model, + NULL, parent, INT_MAX, + LauncherModel::COLUMN_ICON, NULL, + LauncherModel::COLUMN_TEXT, NULL, + LauncherModel::COLUMN_LAUNCHER, NULL, + -1); + } + } +} + +//----------------------------------------------------------------------------- + +void Category::insert_items(GtkListStore* model) +{ + for (std::vector::size_type i = 0, end = m_items.size(); i < end; ++i) + { + Element* element = m_items.at(i); + if (element) + { + Launcher* launcher = static_cast(element); + gtk_list_store_insert_with_values(model, + NULL, INT_MAX, + LauncherModel::COLUMN_ICON, launcher->get_icon(), + LauncherModel::COLUMN_TEXT, launcher->get_text(), + LauncherModel::COLUMN_LAUNCHER, launcher, + -1); + } + else if ((i + 1) < end) + { + gtk_list_store_insert_with_values(model, + NULL, INT_MAX, + LauncherModel::COLUMN_ICON, NULL, + LauncherModel::COLUMN_TEXT, NULL, + LauncherModel::COLUMN_LAUNCHER, NULL, + -1); + } + } +} + +//----------------------------------------------------------------------------- + +void Category::merge() +{ + if (!m_has_subcategories) + { + return; + } + + // Find direct subcategories + std::vector categories; + for (std::vector::const_iterator i = m_items.begin(), end = m_items.end(); i != end; ++i) + { + if (is_category(*i)) + { + categories.push_back(static_cast(*i)); + } + } + std::vector::size_type last_direct = categories.size(); + + // Recursively find subcategories + std::vector::size_type count = m_items.size(); + for (std::vector::size_type i = 0; i < categories.size(); ++i) + { + Category* category = categories.at(i); + count += category->m_items.size(); + + for (std::vector::const_iterator j = category->m_items.begin(), end = category->m_items.end(); j != end; ++j) + { + if (is_category(*j)) + { + categories.push_back(static_cast(*j)); + } + } + } + + // Append items + m_items.reserve(count); + for (std::vector::const_iterator i = categories.begin(), end = categories.end(); i != end; ++i) + { + m_items.insert(m_items.end(), (*i)->m_items.begin(), (*i)->m_items.end()); + } + + // Remove subcategories + for (std::vector::iterator i = m_items.begin(), end = m_items.end(); i != end; ++i) + { + if (is_category(*i)) + { + *i = NULL; + } + } + + // Delete direct subcategories; they will recursively delete their subcategories + for (std::vector::size_type i = 0; i < last_direct; ++i) + { + delete categories.at(i); + } + + m_has_subcategories = false; + m_has_separators = true; +} + +//----------------------------------------------------------------------------- + +void Category::unset_model() +{ + if (m_model) + { + g_object_unref(m_model); + m_model = NULL; + } } //----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/category.hpp xfce4-whiskermenu-plugin-1.2.0/src/category.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/category.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/category.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -17,7 +17,8 @@ #ifndef WHISKERMENU_CATEGORY_HPP #define WHISKERMENU_CATEGORY_HPP -#include +#include "launcher.hpp" + #include extern "C" @@ -31,35 +32,56 @@ class Launcher; class SectionButton; -class Category +class Category : public Element { public: explicit Category(GarconMenuDirectory* directory); ~Category(); - SectionButton* get_button() const + enum { - return m_button; - } - - bool contains(Launcher* launcher) const + Type = 1 + }; + int get_type() const { - return std::find(m_items.begin(), m_items.end(), launcher) != m_items.end(); + return Type; } - bool empty() const + SectionButton* get_button(); + + GtkTreeModel* get_model(); + + bool empty() const; + + bool has_separators() const { - return m_items.empty(); + return m_has_separators; } - void push_back(Launcher* launcher) + void append_item(Launcher* launcher) { + unset_model(); m_items.push_back(launcher); } + Category* append_menu(GarconMenuDirectory* directory); + + void append_separator(); + + void sort(); + +private: + void insert_items(GtkTreeStore* model, GtkTreeIter* parent, const gchar* fallback_icon); + void insert_items(GtkListStore* model); + void merge(); + void unset_model(); + private: - std::vector m_items; SectionButton* m_button; + std::vector m_items; + GtkTreeModel* m_model; + bool m_has_separators; + bool m_has_subcategories; }; } diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/configuration_dialog.cpp xfce4-whiskermenu-plugin-1.2.0/src/configuration_dialog.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/configuration_dialog.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/configuration_dialog.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -16,9 +16,12 @@ #include "configuration_dialog.hpp" +#include "applications_page.hpp" +#include "favorites_page.hpp" #include "icon_size.hpp" #include "launcher.hpp" #include "launcher_view.hpp" +#include "menu.hpp" #include "panel_plugin.hpp" #include "section_button.hpp" @@ -57,17 +60,206 @@ g_signal_connect(m_window, "response", G_CALLBACK(ConfigurationDialog::response_slot), this); g_signal_connect_swapped(m_window, "destroy", G_CALLBACK(whiskermenu_config_dialog_delete), this); - // Fetch contents box - GtkBox* contents_vbox = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(m_window))); + // Create tabs + GtkNotebook* notebook = GTK_NOTEBOOK(gtk_notebook_new()); + gtk_notebook_append_page(notebook, init_appearance_tab(), gtk_label_new_with_mnemonic(_("_Appearance"))); + gtk_notebook_append_page(notebook, init_panel_button_tab(), gtk_label_new_with_mnemonic(_("_Panel Button"))); + gtk_notebook_append_page(notebook, init_behavior_tab(), gtk_label_new_with_mnemonic(_("_Behavior"))); + gtk_notebook_append_page(notebook, init_commands_tab(), gtk_label_new_with_mnemonic(_("_Commands"))); + + // Add tabs to dialog + GtkBox* vbox = GTK_BOX(gtk_vbox_new(false, 8)); + gtk_container_set_border_width(GTK_CONTAINER(vbox), 6); + gtk_box_pack_start(vbox, GTK_WIDGET(notebook), true, true, 0); + GtkBox* contents = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(m_window))); + gtk_box_pack_start(contents, GTK_WIDGET(vbox), true, true, 0); + // Show GTK window + gtk_widget_show_all(m_window); + + m_plugin->set_configure_enabled(false); +} + +//----------------------------------------------------------------------------- + +ConfigurationDialog::~ConfigurationDialog() +{ + m_plugin->set_configure_enabled(true); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::choose_icon() +{ + GtkWidget* chooser = exo_icon_chooser_dialog_new(_("Select An Icon"), + GTK_WINDOW(m_window), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_dialog_set_default_response(GTK_DIALOG(chooser), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_alternative_button_order(GTK_DIALOG(chooser), + GTK_RESPONSE_ACCEPT, + GTK_RESPONSE_CANCEL, -1); + exo_icon_chooser_dialog_set_icon(EXO_ICON_CHOOSER_DIALOG(chooser), m_plugin->get_button_icon_name().c_str()); + + if (gtk_dialog_run(GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) + { + gchar* icon = exo_icon_chooser_dialog_get_icon(EXO_ICON_CHOOSER_DIALOG(chooser)); + xfce_panel_image_set_from_source(XFCE_PANEL_IMAGE(m_icon), icon); + m_plugin->set_button_icon_name(icon); + g_free(icon); + } + + gtk_widget_destroy(chooser); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::category_icon_size_changed(GtkComboBox* combo) +{ + SectionButton::set_icon_size(gtk_combo_box_get_active(combo)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::item_icon_size_changed(GtkComboBox* combo) +{ + LauncherView::set_icon_size(gtk_combo_box_get_active(combo)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::style_changed(GtkComboBox* combo) +{ + m_plugin->set_button_style(PanelPlugin::ButtonStyle(gtk_combo_box_get_active(combo) + 1)); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::title_changed() +{ + const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_title)); + m_plugin->set_button_title(text ? text : ""); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_hover_switch_category(GtkToggleButton* button) +{ + SectionButton::set_hover_activate(gtk_toggle_button_get_active(button)); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_show_name(GtkToggleButton* button) +{ + Launcher::set_show_name(gtk_toggle_button_get_active(button)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_show_description(GtkToggleButton* button) +{ + Launcher::set_show_description(gtk_toggle_button_get_active(button)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* button) +{ + bool active = gtk_toggle_button_get_active(button); + Menu::set_position_search_alternate(gtk_toggle_button_get_active(button)); + gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), active); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_position_commands_alternate(GtkToggleButton* button) +{ + Menu::set_position_commands_alternate(gtk_toggle_button_get_active(button)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_load_hierarchy(GtkToggleButton* button) +{ + ApplicationsPage::set_load_hierarchy(gtk_toggle_button_get_active(button)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_remember_favorites(GtkToggleButton* button) +{ + FavoritesPage::set_remember_favorites(gtk_toggle_button_get_active(button)); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::toggle_display_recent(GtkToggleButton* button) +{ + Menu::set_display_recent(gtk_toggle_button_get_active(button)); + m_plugin->reload(); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::settings_command_changed() +{ + const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_settings_command)); + Menu::set_settings_command(text ? text : ""); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::lockscreen_command_changed() +{ + const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_lockscreen_command)); + Menu::set_lockscreen_command(text ? text : ""); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::logout_command_changed() +{ + const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_logout_command)); + Menu::set_logout_command(text ? text : ""); +} + +//----------------------------------------------------------------------------- + +void ConfigurationDialog::response(int response_id) +{ + if ((m_plugin->get_button_style() == PanelPlugin::ShowText) && m_plugin->get_button_title().empty()) + { + m_plugin->set_button_title(PanelPlugin::get_button_title_default()); + } + + if (response_id == GTK_RESPONSE_CLOSE) + { + gtk_widget_destroy(m_window); + } +} + +//----------------------------------------------------------------------------- + +GtkWidget* ConfigurationDialog::init_appearance_tab() +{ // Create size group for labels GtkSizeGroup* label_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); // Create appearance section + GtkWidget* page = gtk_alignment_new(0, 0, 1, 0); + gtk_container_set_border_width(GTK_CONTAINER(page), 8); GtkBox* appearance_vbox = GTK_BOX(gtk_vbox_new(false, 8)); - GtkWidget* appearance_frame = xfce_gtk_frame_box_new_with_content(_("Appearance"), GTK_WIDGET(appearance_vbox)); - gtk_box_pack_start(contents_vbox, appearance_frame, false, false, 0); - gtk_container_set_border_width(GTK_CONTAINER(appearance_frame), 6); + gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(appearance_vbox)); // Add option to use generic names m_show_names = gtk_check_button_new_with_mnemonic(_("Show applications by _name")); @@ -81,6 +273,19 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_show_descriptions), Launcher::get_show_description()); g_signal_connect(m_show_descriptions, "toggled", G_CALLBACK(ConfigurationDialog::toggle_show_description_slot), this); + // Add option to use alternate search entry position + m_position_search_alternate = gtk_check_button_new_with_mnemonic(_("Position _search entry next to panel button")); + gtk_box_pack_start(appearance_vbox, m_position_search_alternate, true, true, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_search_alternate), Menu::get_position_search_alternate()); + g_signal_connect(m_position_search_alternate, "toggled", G_CALLBACK(ConfigurationDialog::toggle_position_search_alternate_slot), this); + + // Add option to use alternate commands position + m_position_commands_alternate = gtk_check_button_new_with_mnemonic(_("Position commands next to search _entry")); + gtk_box_pack_start(appearance_vbox, m_position_commands_alternate, true, true, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_commands_alternate), Menu::get_position_commands_alternate()); + gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m_position_search_alternate))); + g_signal_connect(m_position_commands_alternate, "toggled", G_CALLBACK(ConfigurationDialog::toggle_position_commands_alternate_slot), this); + // Add item icon size selector GtkBox* hbox = GTK_BOX(gtk_hbox_new(false, 12)); gtk_box_pack_start(appearance_vbox, GTK_WIDGET(hbox), false, false, 0); @@ -120,17 +325,27 @@ gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_category_icon_size); g_signal_connect(m_category_icon_size, "changed", G_CALLBACK(ConfigurationDialog::category_icon_size_changed_slot), this); + return page; +} + +//----------------------------------------------------------------------------- + +GtkWidget* ConfigurationDialog::init_panel_button_tab() +{ + // Create size group for labels + GtkSizeGroup* label_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + // Create panel button section + GtkWidget* page = gtk_alignment_new(0, 0, 1, 0); + gtk_container_set_border_width(GTK_CONTAINER(page), 8); GtkBox* panel_vbox = GTK_BOX(gtk_vbox_new(false, 8)); - GtkWidget* panel_frame = xfce_gtk_frame_box_new_with_content(_("Panel Button"), GTK_WIDGET(panel_vbox)); - gtk_box_pack_start(contents_vbox, panel_frame, false, false, 0); - gtk_container_set_border_width(GTK_CONTAINER(panel_frame), 6); + gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(panel_vbox)); // Add button style selector - hbox = GTK_BOX(gtk_hbox_new(false, 12)); + GtkBox* hbox = GTK_BOX(gtk_hbox_new(false, 12)); gtk_box_pack_start(panel_vbox, GTK_WIDGET(hbox), false, false, 0); - label = gtk_label_new_with_mnemonic(_("Di_splay:")); + GtkWidget* label = gtk_label_new_with_mnemonic(_("Di_splay:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_box_pack_start(hbox, label, false, false, 0); gtk_size_group_add_widget(label_size_group, label); @@ -177,11 +392,18 @@ xfce_panel_image_set_size(XFCE_PANEL_IMAGE(m_icon), 48); gtk_container_add(GTK_CONTAINER(m_icon_button), m_icon); + return page; +} + +//----------------------------------------------------------------------------- + +GtkWidget* ConfigurationDialog::init_behavior_tab() +{ // Create behavior section + GtkWidget* page = gtk_alignment_new(0, 0, 1, 0); + gtk_container_set_border_width(GTK_CONTAINER(page), 8); GtkBox* behavior_vbox = GTK_BOX(gtk_vbox_new(false, 8)); - GtkWidget* behavior_frame = xfce_gtk_frame_box_new_with_content(_("Behavior"), GTK_WIDGET(behavior_vbox)); - gtk_box_pack_start(contents_vbox, behavior_frame, false, false, 0); - gtk_container_set_border_width(GTK_CONTAINER(behavior_frame), 6); + gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(behavior_vbox)); // Add option to use generic names m_hover_switch_category = gtk_check_button_new_with_mnemonic(_("Switch categories by _hovering")); @@ -189,113 +411,86 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_hover_switch_category), SectionButton::get_hover_activate()); g_signal_connect(m_hover_switch_category, "toggled", G_CALLBACK(ConfigurationDialog::toggle_hover_switch_category_slot), this); - // Show GTK window - gtk_widget_show_all(m_window); - - m_plugin->set_configure_enabled(false); -} - -//----------------------------------------------------------------------------- - -ConfigurationDialog::~ConfigurationDialog() -{ - m_plugin->set_configure_enabled(true); -} + // Add option to load menu hierarchy + m_load_hierarchy = gtk_check_button_new_with_mnemonic(_("Load menu hie_rarchy")); + gtk_box_pack_start(behavior_vbox, m_load_hierarchy, true, true, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_load_hierarchy), ApplicationsPage::get_load_hierarchy()); + g_signal_connect(m_load_hierarchy, "toggled", G_CALLBACK(ConfigurationDialog::toggle_load_hierarchy_slot), this); -//----------------------------------------------------------------------------- + // Add option to remember favorites + m_remember_favorites = gtk_check_button_new_with_mnemonic(_("Include _favorites in recently used")); + gtk_box_pack_start(behavior_vbox, m_remember_favorites, true, true, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_remember_favorites), FavoritesPage::get_remember_favorites()); + g_signal_connect(m_remember_favorites, "toggled", G_CALLBACK(ConfigurationDialog::toggle_remember_favorites_slot), this); -void ConfigurationDialog::choose_icon() -{ - GtkWidget* chooser = exo_icon_chooser_dialog_new(_("Select An Icon"), - GTK_WINDOW(m_window), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); + // Add option to display recently used + m_display_recent = gtk_check_button_new_with_mnemonic(_("Display recently _used by default")); + gtk_box_pack_start(behavior_vbox, m_display_recent, true, true, 0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_display_recent), Menu::get_display_recent()); + g_signal_connect(m_display_recent, "toggled", G_CALLBACK(ConfigurationDialog::toggle_display_recent_slot), this); - gtk_dialog_set_default_response(GTK_DIALOG(chooser), GTK_RESPONSE_ACCEPT); - gtk_dialog_set_alternative_button_order(GTK_DIALOG(chooser), - GTK_RESPONSE_ACCEPT, - GTK_RESPONSE_CANCEL, -1); - exo_icon_chooser_dialog_set_icon(EXO_ICON_CHOOSER_DIALOG(chooser), m_plugin->get_button_icon_name().c_str()); - - if (gtk_dialog_run(GTK_DIALOG (chooser)) == GTK_RESPONSE_ACCEPT) - { - gchar* icon = exo_icon_chooser_dialog_get_icon(EXO_ICON_CHOOSER_DIALOG(chooser)); - xfce_panel_image_set_from_source(XFCE_PANEL_IMAGE(m_icon), icon); - m_plugin->set_button_icon_name(icon); - g_free(icon); - } - - gtk_widget_destroy(chooser); + return page; } //----------------------------------------------------------------------------- -void ConfigurationDialog::category_icon_size_changed(GtkComboBox* combo) +GtkWidget* ConfigurationDialog::init_commands_tab() { - SectionButton::set_icon_size(gtk_combo_box_get_active(combo)); - m_plugin->reload(); -} - -//----------------------------------------------------------------------------- - -void ConfigurationDialog::item_icon_size_changed(GtkComboBox* combo) -{ - LauncherView::set_icon_size(gtk_combo_box_get_active(combo)); - m_plugin->reload(); -} - -//----------------------------------------------------------------------------- + // Create size group for labels + GtkSizeGroup* label_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); -void ConfigurationDialog::style_changed(GtkComboBox* combo) -{ - m_plugin->set_button_style(PanelPlugin::ButtonStyle(gtk_combo_box_get_active(combo) + 1)); -} + // Create commands section + GtkWidget* page = gtk_alignment_new(0, 0, 1, 0); + gtk_container_set_border_width(GTK_CONTAINER(page), 8); + GtkBox* panel_vbox = GTK_BOX(gtk_vbox_new(false, 8)); + gtk_container_add(GTK_CONTAINER(page), GTK_WIDGET(panel_vbox)); -//----------------------------------------------------------------------------- + // Add settings command entry + GtkBox* hbox = GTK_BOX(gtk_hbox_new(false, 12)); + gtk_box_pack_start(panel_vbox, GTK_WIDGET(hbox), false, false, 0); -void ConfigurationDialog::title_changed() -{ - const gchar* text = gtk_entry_get_text(GTK_ENTRY(m_title)); - m_plugin->set_button_title(text ? text : ""); -} + GtkWidget* label = gtk_label_new_with_mnemonic(_("_Settings:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(hbox, label, false, false, 0); + gtk_size_group_add_widget(label_size_group, label); -//----------------------------------------------------------------------------- + m_settings_command = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(m_settings_command), Menu::get_settings_command().c_str()); + gtk_box_pack_start(hbox, m_settings_command, true, true, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_settings_command); + g_signal_connect(m_settings_command, "changed", G_CALLBACK(ConfigurationDialog::settings_command_changed_slot), this); -void ConfigurationDialog::toggle_hover_switch_category(GtkToggleButton* button) -{ - SectionButton::set_hover_activate(gtk_toggle_button_get_active(button)); -} - -//----------------------------------------------------------------------------- + // Add lock screen command entry + hbox = GTK_BOX(gtk_hbox_new(false, 12)); + gtk_box_pack_start(panel_vbox, GTK_WIDGET(hbox), false, false, 0); -void ConfigurationDialog::toggle_show_name(GtkToggleButton* button) -{ - Launcher::set_show_name(gtk_toggle_button_get_active(button)); - m_plugin->reload(); -} + label = gtk_label_new_with_mnemonic(_("Lock _Screen:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(hbox, label, false, false, 0); + gtk_size_group_add_widget(label_size_group, label); -//----------------------------------------------------------------------------- + m_lockscreen_command = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(m_lockscreen_command), Menu::get_lockscreen_command().c_str()); + gtk_box_pack_start(hbox, m_lockscreen_command, true, true, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_lockscreen_command); + g_signal_connect(m_lockscreen_command, "changed", G_CALLBACK(ConfigurationDialog::lockscreen_command_changed_slot), this); -void ConfigurationDialog::toggle_show_description(GtkToggleButton* button) -{ - Launcher::set_show_description(gtk_toggle_button_get_active(button)); - m_plugin->reload(); -} + // Add log out command entry + hbox = GTK_BOX(gtk_hbox_new(false, 12)); + gtk_box_pack_start(panel_vbox, GTK_WIDGET(hbox), false, false, 0); -//----------------------------------------------------------------------------- + label = gtk_label_new_with_mnemonic(_("Log _Out:")); + gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); + gtk_box_pack_start(hbox, label, false, false, 0); + gtk_size_group_add_widget(label_size_group, label); -void ConfigurationDialog::response(int response_id) -{ - if ((m_plugin->get_button_style() == PanelPlugin::ShowText) && m_plugin->get_button_title().empty()) - { - m_plugin->set_button_title(PanelPlugin::get_button_title_default()); - } + m_logout_command = gtk_entry_new(); + gtk_entry_set_text(GTK_ENTRY(m_logout_command), Menu::get_logout_command().c_str()); + gtk_box_pack_start(hbox, m_logout_command, true, true, 0); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), m_logout_command); + g_signal_connect(m_logout_command, "changed", G_CALLBACK(ConfigurationDialog::logout_command_changed_slot), this); - if (response_id == GTK_RESPONSE_CLOSE) - { - gtk_widget_destroy(m_window); - } + return page; } //----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/configuration_dialog.hpp xfce4-whiskermenu-plugin-1.2.0/src/configuration_dialog.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/configuration_dialog.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/configuration_dialog.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -39,29 +39,56 @@ } private: - void choose_icon(); + void toggle_show_name(GtkToggleButton* button); + void toggle_show_description(GtkToggleButton* button); + void toggle_position_search_alternate(GtkToggleButton* button); + void toggle_position_commands_alternate(GtkToggleButton* button); void category_icon_size_changed(GtkComboBox* combo); void item_icon_size_changed(GtkComboBox* combo); + void style_changed(GtkComboBox* combo); void title_changed(); + void choose_icon(); + void toggle_hover_switch_category(GtkToggleButton* button); - void toggle_show_name(GtkToggleButton* button); - void toggle_show_description(GtkToggleButton* button); + void toggle_load_hierarchy(GtkToggleButton* button); + void toggle_remember_favorites(GtkToggleButton* button); + void toggle_display_recent(GtkToggleButton* button); + + void settings_command_changed(); + void lockscreen_command_changed(); + void logout_command_changed(); + void response(int response_id); + GtkWidget* init_appearance_tab(); + GtkWidget* init_panel_button_tab(); + GtkWidget* init_behavior_tab(); + GtkWidget* init_commands_tab(); private: PanelPlugin* m_plugin; - GtkWidget* m_window; + + GtkWidget* m_show_names; + GtkWidget* m_show_descriptions; + GtkWidget* m_position_search_alternate; + GtkWidget* m_position_commands_alternate; + GtkWidget* m_category_icon_size; + GtkWidget* m_item_icon_size; + GtkWidget* m_button_style; GtkWidget* m_title; GtkWidget* m_icon; GtkWidget* m_icon_button; - GtkWidget* m_category_icon_size; - GtkWidget* m_item_icon_size; - GtkWidget* m_show_names; - GtkWidget* m_show_descriptions; + GtkWidget* m_hover_switch_category; + GtkWidget* m_load_hierarchy; + GtkWidget* m_remember_favorites; + GtkWidget* m_display_recent; + + GtkWidget* m_settings_command; + GtkWidget* m_lockscreen_command; + GtkWidget* m_logout_command; private: @@ -105,10 +132,50 @@ obj->toggle_show_description(button); } + static void toggle_position_search_alternate_slot(GtkToggleButton* button, ConfigurationDialog* obj) + { + obj->toggle_position_search_alternate(button); + } + + static void toggle_position_commands_alternate_slot(GtkToggleButton* button, ConfigurationDialog* obj) + { + obj->toggle_position_commands_alternate(button); + } + + static void toggle_load_hierarchy_slot(GtkToggleButton* button, ConfigurationDialog* obj) + { + obj->toggle_load_hierarchy(button); + } + + static void toggle_remember_favorites_slot(GtkToggleButton* button, ConfigurationDialog* obj) + { + obj->toggle_remember_favorites(button); + } + + static void toggle_display_recent_slot(GtkToggleButton* button, ConfigurationDialog* obj) + { + obj->toggle_display_recent(button); + } + static void response_slot(GtkDialog*, gint response_id, ConfigurationDialog* obj) { obj->response(response_id); } + + static void settings_command_changed_slot(GtkEditable*, ConfigurationDialog* obj) + { + obj->settings_command_changed(); + } + + static void lockscreen_command_changed_slot(GtkEditable*, ConfigurationDialog* obj) + { + obj->lockscreen_command_changed(); + } + + static void logout_command_changed_slot(GtkEditable*, ConfigurationDialog* obj) + { + obj->logout_command_changed(); + } }; } diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/element.hpp xfce4-whiskermenu-plugin-1.2.0/src/element.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/element.hpp 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/element.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,93 @@ +// Copyright (C) 2013 Graeme Gott +// +// This library 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 library 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 library. If not, see . + + +#ifndef WHISKERMENU_ELEMENT_HPP +#define WHISKERMENU_ELEMENT_HPP + +extern "C" +{ +#include +} + +namespace WhiskerMenu +{ + +class Element +{ +public: + Element() : + m_icon(NULL), + m_text(NULL), + m_sort_key(NULL) + { + } + + virtual ~Element() + { + g_free(m_icon); + g_free(m_text); + g_free(m_sort_key); + } + + virtual int get_type() const = 0; + + const gchar* get_icon() const + { + return m_icon; + } + + const gchar* get_text() const + { + return m_text; + } + + static bool less_than(const Element* lhs, const Element* rhs) + { + return g_strcmp0(lhs->m_sort_key, rhs->m_sort_key) < 0; + } + +protected: + void set_icon(const gchar* icon) + { + m_icon = g_strdup(icon); + } + + void set_icon(gchar* icon) + { + m_icon = icon; + } + + void set_text(const gchar* text) + { + m_text = g_strdup(text); + m_sort_key = g_utf8_collate_key(m_text, -1); + } + + void set_text(gchar* text) + { + m_text = text; + m_sort_key = g_utf8_collate_key(m_text, -1); + } + +private: + gchar* m_icon; + gchar* m_text; + gchar* m_sort_key; +}; + +} + +#endif // WHISKERMENU_ELEMENT_HPP diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/favorites_page.cpp xfce4-whiskermenu-plugin-1.2.0/src/favorites_page.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/favorites_page.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/favorites_page.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -28,6 +28,8 @@ //----------------------------------------------------------------------------- +static bool f_remember_favorites = true; + static const std::string default_favorites[4] = { "exo-terminal-emulator.desktop", @@ -65,6 +67,20 @@ //----------------------------------------------------------------------------- +bool FavoritesPage::get_remember_favorites() +{ + return f_remember_favorites; +} + +//----------------------------------------------------------------------------- + +void FavoritesPage::set_remember_favorites(bool remember) +{ + f_remember_favorites = remember; +} + +//----------------------------------------------------------------------------- + void FavoritesPage::extend_context_menu(GtkWidget* menu) { GtkWidget* menuitem = gtk_separator_menu_item_new(); @@ -85,7 +101,14 @@ //----------------------------------------------------------------------------- -void FavoritesPage::sort(std::map& items) const +bool FavoritesPage::remember_launcher(Launcher* launcher) +{ + return f_remember_favorites ? true : !contains(launcher); +} + +//----------------------------------------------------------------------------- + +void FavoritesPage::sort(std::vector& items) const { const std::vector& desktop_ids = get_desktop_ids(); for (std::vector::const_iterator i = desktop_ids.begin(), end = desktop_ids.end(); i != end; ++i) @@ -95,10 +118,9 @@ { continue; } - gchar* collation_key = g_utf8_collate_key(launcher->get_text(), -1); - items[collation_key] = launcher; - g_free(collation_key); + items.push_back(launcher); } + std::sort(items.begin(), items.end(), &Element::less_than); } //----------------------------------------------------------------------------- @@ -106,11 +128,11 @@ void FavoritesPage::sort_ascending() { std::vector desktop_ids; - std::map items; + std::vector items; sort(items); - for (std::map::const_iterator i = items.begin(), end = items.end(); i != end; ++i) + for (std::vector::const_iterator i = items.begin(), end = items.end(); i != end; ++i) { - desktop_ids.push_back(i->second->get_desktop_id()); + desktop_ids.push_back((*i)->get_desktop_id()); } set_desktop_ids(desktop_ids); } @@ -120,11 +142,11 @@ void FavoritesPage::sort_descending() { std::vector desktop_ids; - std::map items; + std::vector items; sort(items); - for (std::map::const_reverse_iterator i = items.rbegin(), end = items.rend(); i != end; ++i) + for (std::vector::const_reverse_iterator i = items.rbegin(), end = items.rend(); i != end; ++i) { - desktop_ids.push_back(i->second->get_desktop_id()); + desktop_ids.push_back((*i)->get_desktop_id()); } set_desktop_ids(desktop_ids); } diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/favorites_page.hpp xfce4-whiskermenu-plugin-1.2.0/src/favorites_page.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/favorites_page.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/favorites_page.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -31,9 +31,13 @@ void add(Launcher* launcher); + static bool get_remember_favorites(); + static void set_remember_favorites(bool remember); + private: void extend_context_menu(GtkWidget* menu); - void sort(std::map& items) const; + bool remember_launcher(Launcher* launcher); + void sort(std::vector& items) const; void sort_ascending(); void sort_descending(); diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/filter_page.cpp xfce4-whiskermenu-plugin-1.2.0/src/filter_page.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/filter_page.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/filter_page.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -// Copyright (C) 2013 Graeme Gott -// -// This library 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 library 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 library. If not, see . - - -#include "filter_page.hpp" - -#include "launcher_view.hpp" - -using namespace WhiskerMenu; - -//----------------------------------------------------------------------------- - -FilterPage::FilterPage(Menu* menu) : - Page(menu), - m_filter_model(NULL) -{ -} - -//----------------------------------------------------------------------------- - -FilterPage::~FilterPage() -{ - unset_model(); -} - -//----------------------------------------------------------------------------- - -GtkTreeModel* FilterPage::get_model() const -{ - return m_filter_model ? gtk_tree_model_filter_get_model(m_filter_model) : NULL; -} - -//----------------------------------------------------------------------------- - -void FilterPage::refilter() -{ - if (m_filter_model) - { - gtk_tree_model_filter_refilter(m_filter_model); - } -} - -//----------------------------------------------------------------------------- - -GtkTreePath* FilterPage::convert_child_path_to_path(GtkTreePath* path) const -{ - return gtk_tree_model_filter_convert_child_path_to_path((m_filter_model), path); -} - -//----------------------------------------------------------------------------- - -void FilterPage::set_model(GtkTreeModel* model) -{ - unset_model(); - - m_filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_filter_new(model, NULL)); - gtk_tree_model_filter_set_visible_func(m_filter_model, (GtkTreeModelFilterVisibleFunc)&FilterPage::filter_visible, this, NULL); - get_view()->set_model(GTK_TREE_MODEL(m_filter_model)); -} - -//----------------------------------------------------------------------------- - -void FilterPage::unset_model() -{ - get_view()->unset_model(); - - if (m_filter_model) - { - g_object_unref(m_filter_model); - m_filter_model = NULL; - } -} - -//----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/filter_page.hpp xfce4-whiskermenu-plugin-1.2.0/src/filter_page.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/filter_page.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/filter_page.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -// Copyright (C) 2013 Graeme Gott -// -// This library 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 library 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 library. If not, see . - - -#ifndef WHISKERMENU_FILTER_PAGE_HPP -#define WHISKERMENU_FILTER_PAGE_HPP - -#include "page.hpp" - -namespace WhiskerMenu -{ - -class FilterPage : public Page -{ -public: - explicit FilterPage(Menu* menu); - ~FilterPage(); - - GtkTreeModel* get_model() const; - -protected: - GtkTreePath* convert_child_path_to_path(GtkTreePath* path) const; - virtual bool on_filter(GtkTreeModel* model, GtkTreeIter* iter)=0; - void refilter(); - void set_model(GtkTreeModel* model); - void unset_model(); - -private: - static gboolean filter_visible(GtkTreeModel* model, GtkTreeIter* iter, FilterPage* page) - { - return page->on_filter(model, iter); - } - -private: - GtkTreeModelFilter* m_filter_model; -}; - -} - -#endif // WHISKERMENU_FILTER_PAGE_HPP diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/launcher.cpp xfce4-whiskermenu-plugin-1.2.0/src/launcher.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/launcher.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/launcher.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -77,12 +77,8 @@ //----------------------------------------------------------------------------- Launcher::Launcher(GarconMenuItem* item) : - m_item(item), - m_icon(NULL), - m_text(NULL) + m_item(item) { - garcon_menu_item_ref(m_item); - // Fetch icon const gchar* icon = garcon_menu_item_get_icon_name(m_item); if (G_LIKELY(icon)) @@ -92,7 +88,7 @@ gchar* pos = g_strrstr(icon, "."); if (!pos) { - m_icon = g_strdup(icon); + set_icon(icon); } else { @@ -102,18 +98,18 @@ || (strcmp(suffix, ".svg") == 0) || (strcmp(suffix, ".svgz") == 0)) { - m_icon = g_strndup(icon, pos - icon); + set_icon(g_strndup(icon, pos - icon)); } else { - m_icon = g_strdup(icon); + set_icon(icon); } g_free(suffix); } } else { - m_icon = g_strdup(icon); + set_icon(icon); } } @@ -140,7 +136,7 @@ { details = generic_name; } - m_text = g_markup_printf_escaped("%s%s\n%s%s", direction, m_display_name, direction, details); + set_text(g_markup_printf_escaped("%s%s\n%s%s", direction, m_display_name, direction, details)); // Create search text for comment gchar* normalized = g_utf8_normalize(details, -1, G_NORMALIZE_DEFAULT); @@ -151,7 +147,7 @@ } else { - m_text = g_markup_printf_escaped("%s%s", direction, m_display_name); + set_text(g_markup_printf_escaped("%s%s", direction, m_display_name)); } // Create search text for display name @@ -177,9 +173,6 @@ Launcher::~Launcher() { - garcon_menu_item_unref(m_item); - g_free(m_icon); - g_free(m_text); } //----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/launcher.hpp xfce4-whiskermenu-plugin-1.2.0/src/launcher.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/launcher.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/launcher.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -17,6 +17,7 @@ #ifndef WHISKERMENU_LAUNCHER_HPP #define WHISKERMENU_LAUNCHER_HPP +#include "element.hpp" #include "query.hpp" #include @@ -30,25 +31,24 @@ namespace WhiskerMenu { -class Launcher +class Launcher : public Element { public: explicit Launcher(GarconMenuItem* item); ~Launcher(); - const gchar* get_display_name() const + enum { - return m_display_name; - } - - const gchar* get_icon() const + Type = 2 + }; + int get_type() const { - return m_icon; + return Type; } - const gchar* get_text() const + const gchar* get_display_name() const { - return m_text; + return m_display_name; } const gchar* get_desktop_id() const @@ -77,8 +77,6 @@ private: GarconMenuItem* m_item; const gchar* m_display_name; - gchar* m_icon; - gchar* m_text; std::string m_search_name; std::string m_search_comment; std::string m_search_command; diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/launcher_model.cpp xfce4-whiskermenu-plugin-1.2.0/src/launcher_model.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/launcher_model.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/launcher_model.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -56,12 +56,21 @@ void LauncherModel::insert_item(Launcher* launcher, int position) { - gtk_list_store_insert_with_values( - m_model, NULL, position, - COLUMN_ICON, launcher->get_icon(), - COLUMN_TEXT, launcher->get_text(), - COLUMN_LAUNCHER, launcher, - -1); + if (launcher) + { + gtk_list_store_insert_with_values( + m_model, NULL, position, + COLUMN_ICON, launcher->get_icon(), + COLUMN_TEXT, launcher->get_text(), + COLUMN_LAUNCHER, launcher, + -1); + } + else + { + gtk_list_store_insert_with_values( + m_model, NULL, position, + -1); + } } //----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/launcher_view.cpp xfce4-whiskermenu-plugin-1.2.0/src/launcher_view.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/launcher_view.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/launcher_view.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -33,6 +33,13 @@ static IconSize f_icon_size(IconSize::Small); +static gboolean is_separator(GtkTreeModel* model, GtkTreeIter* iter, gpointer) +{ + const gchar* text; + gtk_tree_model_get(model, iter, LauncherModel::COLUMN_TEXT, &text, -1); + return exo_str_is_empty(text); +} + //----------------------------------------------------------------------------- LauncherView::LauncherView() : @@ -46,6 +53,7 @@ gtk_tree_view_set_hover_selection(m_view, true); gtk_tree_view_set_enable_search(m_view, false); gtk_tree_view_set_fixed_height_mode(m_view, true); + gtk_tree_view_set_row_separator_func(m_view, &is_separator, NULL, NULL); create_column(); g_signal_connect(m_view, "key-press-event", G_CALLBACK(LauncherView::on_key_press_event_slot), this); g_signal_connect(m_view, "key-release-event", G_CALLBACK(LauncherView::on_key_release_event_slot), this); @@ -115,6 +123,13 @@ //----------------------------------------------------------------------------- +void LauncherView::set_fixed_height_mode(bool fixed_height) +{ + gtk_tree_view_set_fixed_height_mode(m_view, fixed_height); +} + +//----------------------------------------------------------------------------- + void LauncherView::set_reorderable(bool reorderable) { gtk_tree_view_set_reorderable(m_view, reorderable); @@ -130,6 +145,13 @@ //----------------------------------------------------------------------------- +void LauncherView::collapse_all() +{ + gtk_tree_view_collapse_all(m_view); +} + +//----------------------------------------------------------------------------- + void LauncherView::unselect_all() { GtkTreeSelection* selection = gtk_tree_view_get_selection(m_view); diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/launcher_view.hpp xfce4-whiskermenu-plugin-1.2.0/src/launcher_view.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/launcher_view.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/launcher_view.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -40,14 +40,15 @@ GtkTreePath* get_selected_path() const; void activate_path(GtkTreePath* path); - void scroll_to_path(GtkTreePath* path); void select_path(GtkTreePath* path); void set_cursor(GtkTreePath* path); + void set_fixed_height_mode(bool fixed_height); void set_reorderable(bool reorderable); void set_selection_mode(GtkSelectionMode mode); + void collapse_all(); void unselect_all(); GtkTreeModel* get_model() const diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/menu.cpp xfce4-whiskermenu-plugin-1.2.0/src/menu.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/menu.cpp 2013-08-02 09:26:57.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/menu.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -49,12 +49,21 @@ return button; } +Menu::Command Menu::m_settings_command = "xfce4-settings-manager"; +Menu::Command Menu::m_lockscreen_command = "xflock4"; +Menu::Command Menu::m_logout_command = "xfce4-session-logout"; +bool Menu::m_display_recent = false; +bool Menu::m_position_search_alternate = false; +bool Menu::m_position_commands_alternate = false; + //----------------------------------------------------------------------------- Menu::Menu(XfceRc* settings) : m_window(NULL), m_layout_left(true), m_layout_bottom(true), + m_layout_search_alternate(false), + m_layout_commands_alternate(false), m_modified(false) { m_geometry.x = 0; @@ -134,22 +143,42 @@ // Create search results m_search_results = new SearchPage(this); + // Handle default page + if (!m_display_recent) + { + m_default_button = m_favorites_button; + m_default_page = m_favorites; + } + else + { + m_default_button = m_recent_button; + m_default_page = m_recent; + } + // Create box for packing children m_vbox = GTK_BOX(gtk_vbox_new(false, 6)); gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(m_vbox)); gtk_container_set_border_width(GTK_CONTAINER(m_vbox), 2); - // Create box for packing username and action buttons + // Create box for packing commands + m_commands_align = GTK_ALIGNMENT(gtk_alignment_new(1, 0, 0, 0)); + m_commands_box = GTK_BOX(gtk_hbox_new(false, 0)); + gtk_box_pack_start(m_commands_box, GTK_WIDGET(m_settings_button), false, false, 0); + gtk_box_pack_start(m_commands_box, GTK_WIDGET(m_lock_screen_button), false, false, 0); + gtk_box_pack_start(m_commands_box, GTK_WIDGET(m_log_out_button), false, false, 0); + gtk_container_add(GTK_CONTAINER(m_commands_align), GTK_WIDGET(m_commands_box)); + + // Create box for packing username, commands, and resize widget m_title_box = GTK_BOX(gtk_hbox_new(false, 0)); gtk_box_pack_start(m_vbox, GTK_WIDGET(m_title_box), false, false, 0); gtk_box_pack_start(m_title_box, GTK_WIDGET(m_username), true, true, 0); - gtk_box_pack_start(m_title_box, GTK_WIDGET(m_settings_button), false, false, 0); - gtk_box_pack_start(m_title_box, GTK_WIDGET(m_lock_screen_button), false, false, 0); - gtk_box_pack_start(m_title_box, GTK_WIDGET(m_log_out_button), false, false, 0); + gtk_box_pack_start(m_title_box, GTK_WIDGET(m_commands_align), false, false, 0); gtk_box_pack_start(m_title_box, GTK_WIDGET(m_resizer->get_widget()), false, false, 0); // Add search to layout - gtk_box_pack_start(m_vbox, GTK_WIDGET(m_search_entry), false, true, 0); + m_search_box = GTK_BOX(gtk_hbox_new(false, 6)); + gtk_box_pack_start(m_vbox, GTK_WIDGET(m_search_box), false, true, 0); + gtk_box_pack_start(m_search_box, GTK_WIDGET(m_search_entry), true, true, 0); // Create box for packing launcher pages and sidebar m_contents_box = GTK_BOX(gtk_hbox_new(false, 6)); @@ -180,15 +209,20 @@ gtk_container_add(GTK_CONTAINER(m_sidebar), viewport); gtk_container_add(GTK_CONTAINER(viewport), GTK_WIDGET(m_sidebar_box)); + GtkSizeGroup* sidebar_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget(sidebar_size_group, GTK_WIDGET(m_sidebar)); + gtk_size_group_add_widget(sidebar_size_group, GTK_WIDGET(m_commands_align)); + // Populate app menu m_applications->load_applications(); // Show widgets gtk_widget_show_all(GTK_WIDGET(m_vbox)); + gtk_widget_hide(m_favorites->get_widget()); gtk_widget_hide(m_recent->get_widget()); gtk_widget_hide(m_applications->get_widget()); gtk_widget_hide(m_search_results->get_widget()); - m_favorites_button->set_active(true); + m_default_button->set_active(true); gtk_widget_show(frame); // Resize to last known size @@ -224,11 +258,23 @@ // Hide window gtk_widget_hide(GTK_WIDGET(m_window)); - // Reset mouse cursor by forcing favorites to hide - gtk_widget_hide(m_favorites->get_widget()); + // Update default page + if (m_display_recent && (m_default_page == m_favorites)) + { + m_default_button = m_recent_button; + m_default_page = m_recent; + } + else if (!m_display_recent && (m_default_page == m_recent)) + { + m_default_button = m_favorites_button; + m_default_page = m_favorites; + } + + // Reset mouse cursor by forcing default page to hide + gtk_widget_hide(m_default_page->get_widget()); - // Switch back to favorites - show_favorites(); + // Switch back to default page + show_default_page(); } //----------------------------------------------------------------------------- @@ -244,11 +290,16 @@ m_recent->get_view()->reload_icon_size(); m_applications->get_view()->reload_icon_size(); + // Make sure commands are valid + check_command(m_settings_command, GTK_WIDGET(m_settings_button)); + check_command(m_lockscreen_command, GTK_WIDGET(m_lock_screen_button)); + check_command(m_logout_command, GTK_WIDGET(m_log_out_button)); + // Make sure applications list is current; does nothing unless list has changed m_applications->load_applications(); - // Reset mouse cursor by forcing favorites to hide - gtk_widget_show(m_favorites->get_widget()); + // Reset mouse cursor by forcing default page to hide + gtk_widget_show(m_default_page->get_widget()); GdkScreen* screen = NULL; int parent_x = 0, parent_y = 0, parent_w = 0, parent_h = 0; @@ -369,18 +420,76 @@ { layout_left = !layout_left; } + if (m_layout_commands_alternate != m_position_commands_alternate) + { + m_layout_left = !layout_left; + m_layout_commands_alternate = m_position_commands_alternate; + if (m_layout_commands_alternate) + { + g_object_ref(m_commands_align); + gtk_container_remove(GTK_CONTAINER(m_title_box), GTK_WIDGET(m_commands_align)); + gtk_box_pack_start(m_search_box, GTK_WIDGET(m_commands_align), false, false, 0); + g_object_unref(m_commands_align); + } + else + { + g_object_ref(m_commands_align); + gtk_container_remove(GTK_CONTAINER(m_search_box), GTK_WIDGET(m_commands_align)); + gtk_box_pack_start(m_title_box, GTK_WIDGET(m_commands_align), false, false, 0); + g_object_unref(m_commands_align); + } + } if (layout_left != m_layout_left) { m_layout_left = layout_left; - if (m_layout_left) + if (m_layout_left && m_layout_commands_alternate) + { + gtk_misc_set_alignment(GTK_MISC(m_username), 0.0f, 0.5f); + + gtk_alignment_set(m_commands_align, 1, 0, 0, 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_settings_button), 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_lock_screen_button), 1); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_log_out_button), 2); + + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 0); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 1); + + gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 0); + gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_align), 1); + + gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_box), 1); + gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_sidebar), 2); + } + else if (m_layout_commands_alternate) + { + gtk_misc_set_alignment(GTK_MISC(m_username), 1.0f, 0.5f); + + gtk_alignment_set(m_commands_align, 0, 0, 0, 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_settings_button), 2); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_lock_screen_button), 1); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_log_out_button), 0); + + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 1); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 0); + + gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 1); + gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_align), 0); + + gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_box), 2); + gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_sidebar), 1); + } + else if (m_layout_left) { gtk_misc_set_alignment(GTK_MISC(m_username), 0.0f, 0.5f); + gtk_alignment_set(m_commands_align, 1, 0, 0, 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_settings_button), 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_lock_screen_button), 1); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_log_out_button), 2); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 0); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_settings_button), 1); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_lock_screen_button), 2); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_log_out_button), 3); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 4); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_commands_align), 1); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 2); gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_box), 1); gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_sidebar), 2); @@ -389,10 +498,13 @@ { gtk_misc_set_alignment(GTK_MISC(m_username), 1.0f, 0.5f); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 4); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_settings_button), 3); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_lock_screen_button), 2); - gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_log_out_button), 1); + gtk_alignment_set(m_commands_align, 0, 0, 0, 0); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_settings_button), 2); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_lock_screen_button), 1); + gtk_box_reorder_child(m_commands_box, GTK_WIDGET(m_log_out_button), 0); + + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 2); + gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_commands_align), 1); gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 0); gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_box), 2); @@ -400,19 +512,32 @@ } } - if (layout_bottom != m_layout_bottom) + if ((layout_bottom != m_layout_bottom) || (m_layout_search_alternate != m_position_search_alternate)) { m_layout_bottom = layout_bottom; - if (m_layout_bottom) + m_layout_search_alternate = m_position_search_alternate; + if (m_layout_bottom && m_layout_search_alternate) { gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_title_box), 0); - gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_entry), 1); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_contents_box), 1); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_box), 2); + } + else if (m_layout_search_alternate) + { + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_title_box), 2); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_contents_box), 1); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_box), 0); + } + else if (m_layout_bottom) + { + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_title_box), 0); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_box), 1); gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_contents_box), 2); } else { gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_title_box), 2); - gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_entry), 1); + gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_search_box), 1); gtk_box_reorder_child(m_vbox, GTK_WIDGET(m_contents_box), 0); } } @@ -448,7 +573,7 @@ } gtk_widget_show_all(GTK_WIDGET(m_sidebar_box)); - show_favorites(); + show_default_page(); } //----------------------------------------------------------------------------- @@ -506,6 +631,94 @@ //----------------------------------------------------------------------------- +std::string Menu::get_settings_command() +{ + return m_settings_command.m_exec; +} + +//----------------------------------------------------------------------------- + +std::string Menu::get_lockscreen_command() +{ + return m_lockscreen_command.m_exec; +} + +//----------------------------------------------------------------------------- + +std::string Menu::get_logout_command() +{ + return m_logout_command.m_exec; +} + +//----------------------------------------------------------------------------- + +bool Menu::get_display_recent() +{ + return m_display_recent; +} + +//----------------------------------------------------------------------------- + +bool Menu::get_position_search_alternate() +{ + return m_position_search_alternate; +} + +//----------------------------------------------------------------------------- + +bool Menu::get_position_commands_alternate() +{ + return m_position_commands_alternate; +} + +//----------------------------------------------------------------------------- + +void Menu::set_settings_command(const std::string& command) +{ + m_settings_command = command; +} + +//----------------------------------------------------------------------------- + +void Menu::set_lockscreen_command(const std::string& command) +{ + m_lockscreen_command = command; +} + +//----------------------------------------------------------------------------- + +void Menu::set_logout_command(const std::string& command) +{ + m_logout_command = command; +} + +//----------------------------------------------------------------------------- + +void Menu::set_display_recent(bool display) +{ + m_display_recent = display; +} + +//----------------------------------------------------------------------------- + +void Menu::set_position_search_alternate(bool alternate) +{ + m_position_search_alternate = alternate; + if (!alternate) + { + m_position_commands_alternate = false; + } +} + +//----------------------------------------------------------------------------- + +void Menu::set_position_commands_alternate(bool alternate) +{ + m_position_commands_alternate = alternate && m_position_search_alternate; +} + +//----------------------------------------------------------------------------- + bool Menu::on_leave_notify_event(GdkEventCrossing* event) { if ( (event->detail == GDK_NOTIFY_INFERIOR) @@ -694,6 +907,18 @@ //----------------------------------------------------------------------------- +void Menu::show_default_page() +{ + // Switch to favorites panel + m_default_button->set_active(true); + + // Clear search entry + gtk_entry_set_text(m_search_entry, ""); + gtk_widget_grab_focus(GTK_WIDGET(m_search_entry)); +} + +//----------------------------------------------------------------------------- + void Menu::search() { // Fetch search string @@ -738,7 +963,7 @@ hide(); GError* error = NULL; - if (g_spawn_command_line_async("xfce4-settings-manager", &error) == false) + if (g_spawn_command_line_async(m_settings_command.m_exec.c_str(), &error) == false) { xfce_dialog_show_error(NULL, error, _("Failed to open settings manager.")); g_error_free(error); @@ -752,7 +977,7 @@ hide(); GError* error = NULL; - if (g_spawn_command_line_async("xflock4", &error) == false) + if (g_spawn_command_line_async(m_lockscreen_command.m_exec.c_str(), &error) == false) { xfce_dialog_show_error(NULL, error, _("Failed to lock screen.")); g_error_free(error); @@ -766,7 +991,7 @@ hide(); GError* error = NULL; - if (g_spawn_command_line_async("xfce4-session-logout", &error) == false) + if (g_spawn_command_line_async(m_logout_command.m_exec.c_str(), &error) == false) { xfce_dialog_show_error(NULL, error, _("Failed to log out.")); g_error_free(error); @@ -774,3 +999,16 @@ } //----------------------------------------------------------------------------- + +void Menu::check_command(Command& command, GtkWidget* button) +{ + if (command.m_status == Unchecked) + { + gchar* path = g_find_program_in_path(command.m_exec.c_str()); + command.m_status = path ? Valid : Invalid; + g_free(path); + } + gtk_widget_set_sensitive(button, command.m_status == Valid); +} + +//----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/menu.hpp xfce4-whiskermenu-plugin-1.2.0/src/menu.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/menu.hpp 2013-07-29 08:50:22.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/menu.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -33,6 +33,7 @@ class ApplicationsPage; class FavoritesPage; class Launcher; +class Page; class ResizerWidget; class RecentPage; class SearchPage; @@ -40,6 +41,32 @@ class Menu { + enum CommandStatus + { + Unchecked = -1, + Invalid, + Valid + }; + + struct Command + { + std::string m_exec; + CommandStatus m_status; + + Command(const char* exec = NULL) : + m_exec(exec ? exec : ""), + m_status(Unchecked) + { + } + + Command& operator=(const std::string& exec) + { + m_exec = exec; + m_status = Unchecked; + return *this; + } + }; + public: explicit Menu(XfceRc* settings); ~Menu(); @@ -82,6 +109,19 @@ void set_modified(); void unset_items(); + static std::string get_settings_command(); + static std::string get_lockscreen_command(); + static std::string get_logout_command(); + static bool get_display_recent(); + static bool get_position_search_alternate(); + static bool get_position_commands_alternate(); + static void set_settings_command(const std::string& command); + static void set_lockscreen_command(const std::string& command); + static void set_logout_command(const std::string& command); + static void set_display_recent(bool display); + static void set_position_search_alternate(bool alternate); + static void set_position_commands_alternate(bool alternate); + private: bool on_enter_notify_event(GdkEventCrossing* event); bool on_leave_notify_event(GdkEventCrossing* event); @@ -95,25 +135,31 @@ void recent_toggled(); void category_toggled(); void show_favorites(); + void show_default_page(); void search(); void launch_settings_manager(); void lock_screen(); void log_out(); + static void check_command(Command& command, GtkWidget* button); private: GtkWindow* m_window; GtkBox* m_vbox; GtkBox* m_title_box; + GtkBox* m_commands_box; + GtkBox* m_search_box; GtkBox* m_contents_box; GtkBox* m_panels_box; GtkBox* m_sidebar_box; GtkLabel* m_username; + ResizerWidget* m_resizer; + + GtkAlignment* m_commands_align; GtkButton* m_settings_button; GtkButton* m_lock_screen_button; GtkButton* m_log_out_button; - ResizerWidget* m_resizer; GtkEntry* m_search_entry; @@ -121,16 +167,27 @@ FavoritesPage* m_favorites; RecentPage* m_recent; ApplicationsPage* m_applications; + Page* m_default_page; GtkScrolledWindow* m_sidebar; SectionButton* m_favorites_button; SectionButton* m_recent_button; + SectionButton* m_default_button; GdkRectangle m_geometry; bool m_layout_left; bool m_layout_bottom; + bool m_layout_search_alternate; + bool m_layout_commands_alternate; bool m_modified; + static Command m_settings_command; + static Command m_lockscreen_command; + static Command m_logout_command; + static bool m_display_recent; + static bool m_position_search_alternate; + static bool m_position_commands_alternate; + private: static gboolean on_enter_notify_event_slot(GtkWidget*, GdkEventCrossing* event, Menu* obj) diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/page.cpp xfce4-whiskermenu-plugin-1.2.0/src/page.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/page.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/page.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -68,10 +68,12 @@ void Page::reset_selection() { + m_view->collapse_all(); + // Clear selection and scroll to top GtkTreeModel* model = m_view->get_model(); GtkTreeIter iter; - if (gtk_tree_model_get_iter_first(model, &iter)) + if (model && gtk_tree_model_get_iter_first(model, &iter)) { GtkTreePath* path = gtk_tree_model_get_path(model, &iter); get_view()->scroll_to_path(path); @@ -98,6 +100,13 @@ //----------------------------------------------------------------------------- +bool Page::remember_launcher(Launcher*) +{ + return true; +} + +//----------------------------------------------------------------------------- + void Page::launcher_activated(GtkTreeView* view, GtkTreePath* path) { GtkTreeIter iter; @@ -113,7 +122,10 @@ } // Add to recent - m_menu->get_recent()->add(launcher); + if (remember_launcher(launcher)) + { + m_menu->get_recent()->add(launcher); + } // Hide window m_menu->hide(); diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/page.hpp xfce4-whiskermenu-plugin-1.2.0/src/page.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/page.hpp 2013-07-29 08:50:22.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/page.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -55,6 +55,7 @@ } private: + virtual bool remember_launcher(Launcher* launcher); void launcher_activated(GtkTreeView* view, GtkTreePath* path); bool view_button_press_event(GtkWidget* view, GdkEventButton* event); bool view_popup_menu_event(GtkWidget* view); diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/panel_plugin.cpp xfce4-whiskermenu-plugin-1.2.0/src/panel_plugin.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/panel_plugin.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/panel_plugin.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -18,6 +18,7 @@ #include "applications_page.hpp" #include "configuration_dialog.hpp" +#include "favorites_page.hpp" #include "icon_size.hpp" #include "launcher.hpp" #include "launcher_view.hpp" @@ -66,6 +67,14 @@ SectionButton::set_hover_activate(xfce_rc_read_bool_entry(settings, "hover-switch-category", SectionButton::get_hover_activate())); SectionButton::set_icon_size(xfce_rc_read_int_entry(settings, "category-icon-size", SectionButton::get_icon_size())); LauncherView::set_icon_size(xfce_rc_read_int_entry(settings, "item-icon-size", LauncherView::get_icon_size())); + ApplicationsPage::set_load_hierarchy(xfce_rc_read_bool_entry(settings, "load-hierarchy", ApplicationsPage::get_load_hierarchy())); + FavoritesPage::set_remember_favorites(xfce_rc_read_bool_entry(settings, "favorites-in-recent", FavoritesPage::get_remember_favorites())); + Menu::set_display_recent(xfce_rc_read_bool_entry(settings, "display-recent-default", Menu::get_display_recent())); + Menu::set_position_search_alternate(xfce_rc_read_bool_entry(settings, "position-search-alternate", Menu::get_position_search_alternate())); + Menu::set_position_commands_alternate(xfce_rc_read_bool_entry(settings, "position-commands-alternate", Menu::get_position_commands_alternate())); + Menu::set_settings_command(xfce_rc_read_entry(settings, "command-settings", Menu::get_settings_command().c_str())); + Menu::set_lockscreen_command(xfce_rc_read_entry(settings, "command-lockscreen", Menu::get_lockscreen_command().c_str())); + Menu::set_logout_command(xfce_rc_read_entry(settings, "command-logout", Menu::get_logout_command().c_str())); m_menu = new Menu(settings); xfce_rc_close(settings); @@ -106,7 +115,8 @@ gtk_widget_show(GTK_WIDGET(m_button_icon)); } - m_button_label = GTK_LABEL(gtk_label_new(m_button_title.c_str())); + m_button_label = GTK_LABEL(gtk_label_new(NULL)); + gtk_label_set_markup(m_button_label, m_button_title.c_str()); gtk_box_pack_start(m_button_box, GTK_WIDGET(m_button_label), false, false, 0); if (m_button_title_visible) { @@ -190,7 +200,7 @@ void PanelPlugin::set_button_title(const std::string& title) { m_button_title = title; - gtk_label_set_label(m_button_label, m_button_title.c_str()); + gtk_label_set_markup(m_button_label, m_button_title.c_str()); size_changed(xfce_panel_plugin_get_size(m_plugin)); } @@ -309,6 +319,14 @@ xfce_rc_write_bool_entry(settings, "hover-switch-category", SectionButton::get_hover_activate()); xfce_rc_write_int_entry(settings, "category-icon-size", SectionButton::get_icon_size()); xfce_rc_write_int_entry(settings, "item-icon-size", LauncherView::get_icon_size()); + xfce_rc_write_bool_entry(settings, "load-hierarchy", ApplicationsPage::get_load_hierarchy()); + xfce_rc_write_bool_entry(settings, "favorites-in-recent", FavoritesPage::get_remember_favorites()); + xfce_rc_write_bool_entry(settings, "display-recent-default", Menu::get_display_recent()); + xfce_rc_write_bool_entry(settings, "position-search-alternate", Menu::get_position_search_alternate()); + xfce_rc_write_bool_entry(settings, "position-commands-alternate", Menu::get_position_commands_alternate()); + xfce_rc_write_entry(settings, "command-settings", Menu::get_settings_command().c_str()); + xfce_rc_write_entry(settings, "command-lockscreen", Menu::get_lockscreen_command().c_str()); + xfce_rc_write_entry(settings, "command-logout", Menu::get_logout_command().c_str()); m_menu->save(settings); xfce_rc_close(settings); diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/search_page.cpp xfce4-whiskermenu-plugin-1.2.0/src/search_page.cpp --- xfce4-whiskermenu-plugin-1.1.1/src/search_page.cpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/search_page.cpp 2013-10-29 18:29:33.000000000 +0000 @@ -31,7 +31,8 @@ //----------------------------------------------------------------------------- SearchPage::SearchPage(Menu* menu) : - FilterPage(menu), + Page(menu), + m_filter_model(NULL), m_sort_model(NULL), m_current_results(NULL) { @@ -114,7 +115,7 @@ get_view()->unset_model(); gtk_tree_model_sort_reset_default_sort_func(m_sort_model); - refilter(); + gtk_tree_model_filter_refilter(m_filter_model); gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(m_sort_model), (GtkTreeIterCompareFunc)&SearchPage::on_sort, this, NULL); get_view()->set_model(GTK_TREE_MODEL(m_sort_model)); @@ -152,11 +153,13 @@ valid = gtk_tree_model_iter_next(model, &iter); } - unset_search_model(); - set_model(model); - m_sort_model = GTK_TREE_MODEL_SORT(gtk_tree_model_sort_new_with_model(get_view()->get_model())); + unset_model(); + + m_filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_filter_new(model, NULL)); + gtk_tree_model_filter_set_visible_func(m_filter_model, (GtkTreeModelFilterVisibleFunc)&SearchPage::on_filter, this, NULL); + + m_sort_model = GTK_TREE_MODEL_SORT(gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(m_filter_model))); gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(m_sort_model), (GtkTreeIterCompareFunc)&SearchPage::on_sort, this, NULL); - get_view()->unset_model(); } //----------------------------------------------------------------------------- @@ -166,15 +169,14 @@ m_launchers.clear(); m_results.clear(); m_current_results = NULL; - unset_search_model(); unset_model(); } //----------------------------------------------------------------------------- -bool SearchPage::on_filter(GtkTreeModel* model, GtkTreeIter* iter) +gboolean SearchPage::on_filter(GtkTreeModel* model, GtkTreeIter* iter, SearchPage* page) { - if (!m_current_results) + if (!page->m_current_results) { return false; } @@ -182,7 +184,7 @@ // Check if launcher search string contains text Launcher* launcher = NULL; gtk_tree_model_get(model, iter, LauncherModel::COLUMN_LAUNCHER, &launcher, -1); - return launcher && (m_current_results->find(launcher) != m_current_results->end()); + return launcher && (page->m_current_results->find(launcher) != page->m_current_results->end()); } //----------------------------------------------------------------------------- @@ -204,14 +206,21 @@ //----------------------------------------------------------------------------- -void SearchPage::unset_search_model() +void SearchPage::unset_model() { + get_view()->unset_model(); + + if (m_filter_model) + { + g_object_unref(m_filter_model); + m_filter_model = NULL; + } + if (m_sort_model) { g_object_unref(m_sort_model); m_sort_model = NULL; } - get_view()->unset_model(); } //----------------------------------------------------------------------------- diff -Nru xfce4-whiskermenu-plugin-1.1.1/src/search_page.hpp xfce4-whiskermenu-plugin-1.2.0/src/search_page.hpp --- xfce4-whiskermenu-plugin-1.1.1/src/search_page.hpp 2013-08-08 14:41:10.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/src/search_page.hpp 2013-10-29 18:29:33.000000000 +0000 @@ -17,7 +17,7 @@ #ifndef WHISKERMENU_SEARCH_PAGE_HPP #define WHISKERMENU_SEARCH_PAGE_HPP -#include "filter_page.hpp" +#include "page.hpp" #include "query.hpp" #include @@ -29,7 +29,7 @@ class LauncherView; -class SearchPage : public FilterPage +class SearchPage : public Page { public: explicit SearchPage(Menu* menu); @@ -42,12 +42,13 @@ private: void clear_search(GtkEntry* entry, GtkEntryIconPosition icon_pos); bool search_entry_key_press(GtkWidget* widget, GdkEventKey* event); - bool on_filter(GtkTreeModel* model, GtkTreeIter* iter); static gint on_sort(GtkTreeModel* model, GtkTreeIter* a, GtkTreeIter* b, SearchPage* page); - void unset_search_model(); + static gboolean on_filter(GtkTreeModel* model, GtkTreeIter* iter, SearchPage* page); + void unset_model(); private: Query m_query; + GtkTreeModelFilter* m_filter_model; GtkTreeModelSort* m_sort_model; std::vector m_launchers; std::map > m_results; diff -Nru xfce4-whiskermenu-plugin-1.1.1/update-po.sh xfce4-whiskermenu-plugin-1.2.0/update-po.sh --- xfce4-whiskermenu-plugin-1.1.1/update-po.sh 2013-08-08 14:43:24.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/update-po.sh 2013-10-29 18:29:33.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh -xgettext --language=C++ --keyword=_ --package-name="xfce4-whiskermenu-plugin" --package-version="1.1.1" `find src -name \*.cpp | sort` -o po/xfce4-whiskermenu-plugin.pot +xgettext --language=C++ --keyword=_ --package-name="xfce4-whiskermenu-plugin" --package-version="1.2.0" `find src -name \*.cpp | sort` -o po/xfce4-whiskermenu-plugin.pot for pofile in `find po -name \*.po`; do diff -Nru xfce4-whiskermenu-plugin-1.1.1/whiskermenu.desktop xfce4-whiskermenu-plugin-1.2.0/whiskermenu.desktop --- xfce4-whiskermenu-plugin-1.1.1/whiskermenu.desktop 2013-08-07 09:21:26.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/whiskermenu.desktop 2013-10-29 18:29:33.000000000 +0000 @@ -5,12 +5,15 @@ Name[ar]=قائمة Whisker Name[bg]=Whisker Меню Name[ca]=Menú Whisker +Name[cs]=Whisker Menu Name[da]=Whisker Menu Name[de]=Whisker Menü Name[el]=Μενού Whisker Name[es]=Menú Whisker +Name[fi]=Whisker-valikko Name[fr]=Menu Whisker Name[he]=תפריט זיף +Name[hr]=Whisker Izbornik Name[hu]=Whisker Menü Name[id]=Menu Whisker Name[it]=Menu Whisker @@ -25,19 +28,24 @@ Name[ro]=Meniu Whisker Name[ru]=Меню Whisker Name[sk]=Whisker Menu +Name[sr@latin]=Meni Whisker Name[sv]=Whiskermeny Name[tr]=Gözde Menü +Name[uz]=Whisker menyusi Name[vi]=Menu Tách Biệt Comment=Show a menu to easily access installed applications Comment[ar]=عرض القائمة لوصول إلى التطبيقات المثبتة بكل سهولة Comment[bg]=Показване на меню за лесен достъп до инсталираните приложения Comment[ca]=Mostra un menú per accedir fàcilment a les aplicacions instal·lades +Comment[cs]=Ukázat menu pro snadný přístup k nainstalovaným aplikacím Comment[da]=Vis en menu for hurtig adgang til applikationer Comment[de]=Zeige ein Menü um installierte Programme einfach zugänglich zu machen Comment[el]=Εμφάνιση ενός μενού για την γρήγορη πρόσβαση στις εγκατεστημένες εφαρμογές. Comment[es]=Muestra un menú para acceder fácilmente a las aplicaciones instaladas +Comment[fi]=Näytä valikko, josta on helppo pääsy asennettuihin ohjelmiin Comment[fr]=Affiche un menu pour accéder facilement aux applications installées Comment[he]=תפריט לגישה קלה ליישומים מותקנים +Comment[hr]=Prikaži izbornik za brzo pristupanje instaliranim aplikacijama Comment[hu]=Menü megjelenítése a telepített alkalmazások egyszerű eléréséhez. Comment[id]=Tampilkan menu untuk mempermudah akses aplikasi yang terpasang Comment[it]=Mostra un menu per accedere facilmente le applicazioni installate @@ -52,8 +60,10 @@ Comment[ro]=Arată un meniu pentru a accesa ușor aplicațiile instalate Comment[ru]=Показывает меню для простого доступа к установленным приложениям Comment[sk]=Zobrazí menu na ľahký prístup k nainštalovaným aplikáciám +Comment[sr@latin]=Prikaži Meni za lak pristup instaliranim aplikacijama Comment[sv]=En meny för att visa dina installerade program Comment[tr]=Kurulu uygulamalara kolay erişim menüsünü göster +Comment[uz]=O'rnatilgan dasturlarga oson yetish uchun menyu ko'rsatish Comment[vi]=Hiển thị menu để dễ dàng truy cập tới các ứng dụng đã cài đặt Icon=xfce4-whiskermenu X-XFCE-Module=whiskermenu diff -Nru xfce4-whiskermenu-plugin-1.1.1/xfce4-popup-whiskermenu.1 xfce4-whiskermenu-plugin-1.2.0/xfce4-popup-whiskermenu.1 --- xfce4-whiskermenu-plugin-1.1.1/xfce4-popup-whiskermenu.1 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/xfce4-popup-whiskermenu.1 2013-10-29 18:29:33.000000000 +0000 @@ -0,0 +1,61 @@ +.TH XFCE4-POPUP-WHISKERMENU "1" "October 2013" + +.SH "NAME" +xfce4-popup-whiskermenu \- shows Whisker Menu + +.SH "SYNOPSIS" +.PP +.B xfce4\-popup\-whiskermenu \-h +.br +.B xfce4\-popup\-whiskermenu \-\-help +.br +.B xfce4\-popup\-whiskermenu \-V +.br +.B xfce4\-popup\-whiskermenu \-\-version +.br +.B xfce4\-popup\-whiskermenu +[ \-\fBp\fR ] + +.SH "DESCRIPTION" +.PP +\fBxfce4\-popup\-whiskermenu\fR shows Whisker Menu if at least one Whisker +Menu applet is present on one of your panels. +.PP +The default behavior is to show Whisker Menu near the applet button. If +you have several Whisker Menu applets, only the first one you have set up +will pop up. + +.SH "OPTIONS" +.TP +\fB\-h\fR, \fB\-\-help\fR +Show help options. +.TP +\fB\-p\fR, \fB\-\-pointer\fR +Popup menu at current mouse position. +.TP +\fB\-V\fR, \fB\-\-version\fR +Print version information and exit. + +.SH "COPYRIGHT" +.PP +Copyright \(co 2013 Graeme Gott +.PP +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. +.PP +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. +.PP +You should have received a copy of the GNU General Public License +along with this program. If not, see . + +.SH "AUTHOR" +.PP +Graeme Gott . +.PP +This manual page was derived from the manual page for the Xfce window list +written by Francois Wendling . diff -Nru xfce4-whiskermenu-plugin-1.1.1/xfce4-popup-whiskermenu.in xfce4-whiskermenu-plugin-1.2.0/xfce4-popup-whiskermenu.in --- xfce4-whiskermenu-plugin-1.1.1/xfce4-popup-whiskermenu.in 2013-07-18 15:34:33.000000000 +0000 +++ xfce4-whiskermenu-plugin-1.2.0/xfce4-popup-whiskermenu.in 2013-10-29 18:32:34.000000000 +0000 @@ -19,7 +19,7 @@ # export TEXTDOMAIN="xfce4-panel" -export TEXTDOMAINDIR="@localedir@" +export TEXTDOMAINDIR="@CMAKE_INSTALL_FULL_LOCALEDIR@" ATPOINTER="false" @@ -35,7 +35,8 @@ exit 0 ;; -V|--version) - exec @bindir@/xfce4-panel -V "$(basename $0)" + echo "$(basename $0) 1.2.0" + echo "Copyright (C) 2013 Graeme Gott" exit 0 ;; -p|--pointer)