diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index d3b2f7e..d0b39fb 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -2396,6 +2396,278 @@ + + 5 + wxALIGN_RIGHT + 0 + + + bSizerCategoriesCtrl + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + All + + 0 + + + 0 + + 1 + m_categoriesAll + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + + 0 + + + + + + + + + + OnCategoriesAll + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + None + + 0 + + + 0 + + 1 + m_categoriesNone + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + + 0 + + + + + + + + + + OnCategoriesNone + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + + wxID_ANY + Invert + + 0 + + + 0 + + 1 + m_categoriesInvert + + 1 + + + protected + 1 + + Resizable + 1 + + wxHL_DEFAULT_STYLE + + 0 + + + + + + + + + + OnCategoriesInvert + + + + + + + + + + + + + + + + + + + + + + + + 5 wxALL|wxEXPAND diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index df0bb40..e5dfb42 100644 --- a/ZRCola/locale/ZRCola.pot +++ b/ZRCola/locale/ZRCola.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-24 16:26+0200\n" +"POT-Creation-Date: 2016-05-26 17:15+0200\n" "PO-Revision-Date: 2016-05-13 15:52+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -23,20 +23,16 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU" -#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101 -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy msgid "ZRCola" msgstr "ZRCola" -#: zrcolafrm.cpp:108 +#: zrcolafrm.cpp:104 #, fuzzy msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " @@ -45,12 +41,12 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." -#: zrcolafrm.cpp:108 zrcolafrm.cpp:110 +#: zrcolafrm.cpp:104 zrcolafrm.cpp:106 #, fuzzy msgid "Warning" msgstr "Opozorilo" -#: zrcolafrm.cpp:110 +#: zrcolafrm.cpp:106 #, fuzzy msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " @@ -59,7 +55,7 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." -#: zrcolafrm.cpp:336 +#: zrcolafrm.cpp:341 #, fuzzy msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "http://zrcola-2.amebis.si/contact/" @@ -190,12 +186,14 @@ msgid "Submit a request to ZRC to add a new character" msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka" #: zrcolagui.cpp:146 +#, fuzzy msgid "Check for &Updates..." -msgstr "" +msgstr "Preveri za &posodobitev ..." #: zrcolagui.cpp:146 +#, fuzzy msgid "Check online for product update" -msgstr "" +msgstr "Preveri na spletu za posodobitev izdelka" #: zrcolagui.cpp:155 #, fuzzy @@ -237,7 +235,7 @@ msgstr "Prilepi izbor" msgid "Edit" msgstr "Urejanje" -#: zrcolagui.cpp:170 zrcolagui.h:225 +#: zrcolagui.cpp:170 zrcolagui.h:232 #, fuzzy msgid "Character Selector" msgstr "Izbirnik znaka" @@ -267,52 +265,66 @@ msgstr "Katalog znakov" msgid "(De)Composer" msgstr "Raz/Sestavljalnik" -#: zrcolagui.cpp:222 +#: zrcolagui.cpp:224 #, fuzzy msgid "Decomposed Text" msgstr "Razstavljeno besedilo" -#: zrcolagui.cpp:242 +#: zrcolagui.cpp:244 #, fuzzy msgid "Decomposed Unicode Dump" msgstr "Unicode razstavljenega" -#: zrcolagui.cpp:269 +#: zrcolagui.cpp:271 #, fuzzy msgid "Composed Text" msgstr "Sestavljeno besedilo" -#: zrcolagui.cpp:289 +#: zrcolagui.cpp:291 #, fuzzy msgid "Composed Unicode Dump" msgstr "Unicode sestavljenega" -#: zrcolagui.cpp:409 +#: zrcolagui.cpp:411 #, fuzzy msgid "&Browse" msgstr "Pre&brskaj" -#: zrcolagui.cpp:457 +#: zrcolagui.cpp:423 +#, fuzzy +msgid "All" +msgstr "Vse" + +#: zrcolagui.cpp:426 +#, fuzzy +msgid "None" +msgstr "Nič" + +#: zrcolagui.cpp:429 +msgid "Invert" +msgstr "" + +#: zrcolagui.cpp:474 #, fuzzy msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:498 +#: zrcolagui.cpp:515 #, fuzzy msgid "Preview" msgstr "Predogled:" -#: zrcolagui.cpp:503 +#: zrcolagui.cpp:520 #, fuzzy msgid "U+" msgstr "U+" -#: zrcolagui.cpp:554 +#: zrcolagui.cpp:571 #, fuzzy msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:654 +#: zrcolagui.cpp:677 #, fuzzy msgid "" "Some character native to specific language you are working with should not " @@ -323,22 +335,22 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:658 +#: zrcolagui.cpp:681 #, fuzzy msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:661 +#: zrcolagui.cpp:684 #, fuzzy msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:673 +#: zrcolagui.cpp:696 #, fuzzy msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:678 +#: zrcolagui.cpp:701 #, fuzzy msgid "" "ZRCola can be launched every time you log in to your computer.\n" @@ -349,17 +361,17 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:682 +#: zrcolagui.cpp:705 #, fuzzy msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:689 +#: zrcolagui.cpp:712 #, fuzzy msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:768 +#: zrcolagui.cpp:791 #, fuzzy msgid "" "Editor: Janoš Ježovnik\n" @@ -370,22 +382,22 @@ msgstr "" "Razvoj: Amebis d. o. o.\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:776 +#: zrcolagui.cpp:799 #, fuzzy msgid "www.zrc-sazu.si" msgstr "www.zrc-sazu.si" -#: zrcolagui.cpp:815 +#: zrcolagui.cpp:838 #, fuzzy msgid "Log" -msgstr "Prijavi me" +msgstr "Dnevnik" -#: zrcolagui.cpp:831 +#: zrcolagui.cpp:854 #, fuzzy msgid "&Update" -msgstr "Potrdite osvežitev registra" +msgstr "&Posodobi" -#: zrcolagui.cpp:836 +#: zrcolagui.cpp:859 #, fuzzy msgid "&Close" msgstr "&Zapri" @@ -404,38 +416,31 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:262 +#: zrcolagui.h:269 #, fuzzy msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:286 +#: zrcolagui.h:293 #, fuzzy msgid "About ZRCola" msgstr "O ZRColi" -#: zrcolagui.h:309 +#: zrcolagui.h:316 +#, fuzzy msgid "Product Update" -msgstr "" +msgstr "Posodabljanje izdelka" -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:3 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.x64.Release.Feature-2.idtx:3 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1250" -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index 8d28e40..461eec8 100644 --- a/ZRCola/locale/de_DE.po +++ b/ZRCola/locale/de_DE.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-24 16:27+0200\n" -"PO-Revision-Date: 2016-05-24 16:27+0200\n" +"POT-Creation-Date: 2016-05-26 17:15+0200\n" +"PO-Revision-Date: 2016-05-26 17:15+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: de_DE\n" @@ -20,37 +20,33 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "" -#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101 -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy msgid "ZRCola" msgstr "ZRCola:." -#: zrcolafrm.cpp:108 +#: zrcolafrm.cpp:104 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " "will not be available." msgstr "" -#: zrcolafrm.cpp:108 zrcolafrm.cpp:110 +#: zrcolafrm.cpp:104 zrcolafrm.cpp:106 #, fuzzy msgid "Warning" msgstr "Warnung: " -#: zrcolafrm.cpp:110 +#: zrcolafrm.cpp:106 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." msgstr "" -#: zrcolafrm.cpp:336 +#: zrcolafrm.cpp:341 msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "" @@ -207,7 +203,7 @@ msgstr "Auswahl einfügen" msgid "Edit" msgstr "Bearbeiten" -#: zrcolagui.cpp:170 zrcolagui.h:225 +#: zrcolagui.cpp:170 zrcolagui.h:232 msgid "Character Selector" msgstr "" @@ -231,101 +227,115 @@ msgstr "" msgid "(De)Composer" msgstr "" -#: zrcolagui.cpp:222 +#: zrcolagui.cpp:224 msgid "Decomposed Text" msgstr "" -#: zrcolagui.cpp:242 +#: zrcolagui.cpp:244 msgid "Decomposed Unicode Dump" msgstr "" -#: zrcolagui.cpp:269 +#: zrcolagui.cpp:271 msgid "Composed Text" msgstr "" -#: zrcolagui.cpp:289 +#: zrcolagui.cpp:291 msgid "Composed Unicode Dump" msgstr "" -#: zrcolagui.cpp:409 +#: zrcolagui.cpp:411 #, fuzzy msgid "&Browse" msgstr "Durchsuchen" -#: zrcolagui.cpp:457 +#: zrcolagui.cpp:423 +#, fuzzy +msgid "All" +msgstr "Alle" + +#: zrcolagui.cpp:426 +#, fuzzy +msgid "None" +msgstr "Kein" + +#: zrcolagui.cpp:429 +msgid "Invert" +msgstr "" + +#: zrcolagui.cpp:474 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:498 +#: zrcolagui.cpp:515 #, fuzzy msgid "Preview" msgstr " Vorschau" -#: zrcolagui.cpp:503 +#: zrcolagui.cpp:520 #, fuzzy msgid "U+" msgstr "Hilfeverzeichnis %u nicht gefunden." -#: zrcolagui.cpp:554 +#: zrcolagui.cpp:571 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:654 +#: zrcolagui.cpp:677 msgid "" "Some character native to specific language you are working with should not " "decompose to primitives.\n" "For optimal decomposition you should set the language correctly." msgstr "" -#: zrcolagui.cpp:658 +#: zrcolagui.cpp:681 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:661 +#: zrcolagui.cpp:684 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:673 +#: zrcolagui.cpp:696 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:678 +#: zrcolagui.cpp:701 msgid "" "ZRCola can be launched every time you log in to your computer.\n" "It will be available on the system tray and via registered shortcuts Win+F5 " "and Win+F6." msgstr "" -#: zrcolagui.cpp:682 +#: zrcolagui.cpp:705 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:689 +#: zrcolagui.cpp:712 msgid "Startup" msgstr "" -#: zrcolagui.cpp:768 +#: zrcolagui.cpp:791 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:776 +#: zrcolagui.cpp:799 msgid "www.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:815 +#: zrcolagui.cpp:838 #, fuzzy msgid "Log" msgstr "&Log" -#: zrcolagui.cpp:831 +#: zrcolagui.cpp:854 #, fuzzy msgid "&Update" msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren." -#: zrcolagui.cpp:836 +#: zrcolagui.cpp:859 #, fuzzy msgid "&Close" msgstr "&Schließen" @@ -340,37 +350,29 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:262 +#: zrcolagui.h:269 msgid "Settings" msgstr "" -#: zrcolagui.h:286 +#: zrcolagui.h:293 msgid "About ZRCola" msgstr "" -#: zrcolagui.h:309 +#: zrcolagui.h:316 msgid "Product Update" msgstr "" # Windows charset for this language (decimal) -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:3 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.x64.Release.Feature-2.idtx:3 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1252" -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "Input system for linguistic use" diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index eedf17f..1452aa4 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-24 16:27+0200\n" -"PO-Revision-Date: 2016-05-24 16:27+0200\n" +"POT-Creation-Date: 2016-05-26 17:15+0200\n" +"PO-Revision-Date: 2016-05-26 17:15+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -21,36 +21,32 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "" -#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101 -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 #, fuzzy msgid "ZRCola" msgstr "ZRCola:." -#: zrcolafrm.cpp:108 +#: zrcolafrm.cpp:104 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " "will not be available." msgstr "" -#: zrcolafrm.cpp:108 zrcolafrm.cpp:110 +#: zrcolafrm.cpp:104 zrcolafrm.cpp:106 msgid "Warning" msgstr "" -#: zrcolafrm.cpp:110 +#: zrcolafrm.cpp:106 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." msgstr "" -#: zrcolafrm.cpp:336 +#: zrcolafrm.cpp:341 msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "" @@ -194,7 +190,7 @@ msgstr "" msgid "Edit" msgstr "" -#: zrcolagui.cpp:170 zrcolagui.h:225 +#: zrcolagui.cpp:170 zrcolagui.h:232 msgid "Character Selector" msgstr "" @@ -218,96 +214,109 @@ msgstr "" msgid "(De)Composer" msgstr "" -#: zrcolagui.cpp:222 +#: zrcolagui.cpp:224 msgid "Decomposed Text" msgstr "" -#: zrcolagui.cpp:242 +#: zrcolagui.cpp:244 msgid "Decomposed Unicode Dump" msgstr "" -#: zrcolagui.cpp:269 +#: zrcolagui.cpp:271 msgid "Composed Text" msgstr "" -#: zrcolagui.cpp:289 +#: zrcolagui.cpp:291 msgid "Composed Unicode Dump" msgstr "" -#: zrcolagui.cpp:409 +#: zrcolagui.cpp:411 msgid "&Browse" msgstr "" -#: zrcolagui.cpp:457 +#: zrcolagui.cpp:423 +#, fuzzy +msgid "All" +msgstr "Alt" + +#: zrcolagui.cpp:426 +msgid "None" +msgstr "" + +#: zrcolagui.cpp:429 +msgid "Invert" +msgstr "" + +#: zrcolagui.cpp:474 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:498 +#: zrcolagui.cpp:515 msgid "Preview" msgstr "" -#: zrcolagui.cpp:503 +#: zrcolagui.cpp:520 msgid "U+" msgstr "" -#: zrcolagui.cpp:554 +#: zrcolagui.cpp:571 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:654 +#: zrcolagui.cpp:677 msgid "" "Some character native to specific language you are working with should not " "decompose to primitives.\n" "For optimal decomposition you should set the language correctly." msgstr "" -#: zrcolagui.cpp:658 +#: zrcolagui.cpp:681 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:661 +#: zrcolagui.cpp:684 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:673 +#: zrcolagui.cpp:696 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:678 +#: zrcolagui.cpp:701 msgid "" "ZRCola can be launched every time you log in to your computer.\n" "It will be available on the system tray and via registered shortcuts Win+F5 " "and Win+F6." msgstr "" -#: zrcolagui.cpp:682 +#: zrcolagui.cpp:705 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:689 +#: zrcolagui.cpp:712 msgid "Startup" msgstr "" -#: zrcolagui.cpp:768 +#: zrcolagui.cpp:791 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:776 +#: zrcolagui.cpp:799 msgid "www.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:815 +#: zrcolagui.cpp:838 msgid "Log" msgstr "" -#: zrcolagui.cpp:831 +#: zrcolagui.cpp:854 msgid "&Update" msgstr "" -#: zrcolagui.cpp:836 +#: zrcolagui.cpp:859 msgid "&Close" msgstr "" @@ -321,37 +330,29 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "" -#: zrcolagui.h:262 +#: zrcolagui.h:269 msgid "Settings" msgstr "" -#: zrcolagui.h:286 +#: zrcolagui.h:293 msgid "About ZRCola" msgstr "" -#: zrcolagui.h:309 +#: zrcolagui.h:316 msgid "Product Update" msgstr "" # Windows charset for this language (decimal) -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:3 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.x64.Release.Feature-2.idtx:3 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1251" -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "Input system for linguistic use" diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index df0a109..14d4aad 100644 --- a/ZRCola/locale/sl_SI.po +++ b/ZRCola/locale/sl_SI.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-05-24 16:26+0200\n" -"PO-Revision-Date: 2016-05-24 16:27+0200\n" +"POT-Creation-Date: 2016-05-26 17:15+0200\n" +"PO-Revision-Date: 2016-05-26 17:15+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -21,19 +21,15 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU" -#: zrcolaapp.cpp:78 zrcolafrm.cpp:90 zrcolagui.cpp:758 zrcolagui.h:101 -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:86 zrcolagui.cpp:781 zrcolagui.h:102 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "ZRCola" msgstr "ZRCola" -#: zrcolafrm.cpp:108 +#: zrcolafrm.cpp:104 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " "will not be available." @@ -41,11 +37,11 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." -#: zrcolafrm.cpp:108 zrcolafrm.cpp:110 +#: zrcolafrm.cpp:104 zrcolafrm.cpp:106 msgid "Warning" msgstr "Opozorilo" -#: zrcolafrm.cpp:110 +#: zrcolafrm.cpp:106 msgid "" "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality " "will not be available." @@ -53,7 +49,7 @@ msgstr "" "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj " "funkcionalnosti ne bo na voljo." -#: zrcolafrm.cpp:336 +#: zrcolafrm.cpp:341 msgid "http://zrcola-2.amebis.si/en/contact/" msgstr "http://zrcola-2.amebis.si/contact/" @@ -197,7 +193,7 @@ msgstr "Prilepi izbor" msgid "Edit" msgstr "Urejanje" -#: zrcolagui.cpp:170 zrcolagui.h:225 +#: zrcolagui.cpp:170 zrcolagui.h:232 msgid "Character Selector" msgstr "Izbirnik znaka" @@ -221,43 +217,55 @@ msgstr "Katalog znakov" msgid "(De)Composer" msgstr "Raz/Sestavljalnik" -#: zrcolagui.cpp:222 +#: zrcolagui.cpp:224 msgid "Decomposed Text" msgstr "Razstavljeno besedilo" -#: zrcolagui.cpp:242 +#: zrcolagui.cpp:244 msgid "Decomposed Unicode Dump" msgstr "Unicode razstavljenega" -#: zrcolagui.cpp:269 +#: zrcolagui.cpp:271 msgid "Composed Text" msgstr "Sestavljeno besedilo" -#: zrcolagui.cpp:289 +#: zrcolagui.cpp:291 msgid "Composed Unicode Dump" msgstr "Unicode sestavljenega" -#: zrcolagui.cpp:409 +#: zrcolagui.cpp:411 msgid "&Browse" msgstr "Pre&brskaj" -#: zrcolagui.cpp:457 +#: zrcolagui.cpp:423 +msgid "All" +msgstr "Vse" + +#: zrcolagui.cpp:426 +msgid "None" +msgstr "Nič" + +#: zrcolagui.cpp:429 +msgid "Invert" +msgstr "Obrni" + +#: zrcolagui.cpp:474 msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:498 +#: zrcolagui.cpp:515 msgid "Preview" msgstr "Predogled" -#: zrcolagui.cpp:503 +#: zrcolagui.cpp:520 msgid "U+" msgstr "U+" -#: zrcolagui.cpp:554 +#: zrcolagui.cpp:571 msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:654 +#: zrcolagui.cpp:677 msgid "" "Some character native to specific language you are working with should not " "decompose to primitives.\n" @@ -267,19 +275,19 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:658 +#: zrcolagui.cpp:681 msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:661 +#: zrcolagui.cpp:684 msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:673 +#: zrcolagui.cpp:696 msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:678 +#: zrcolagui.cpp:701 msgid "" "ZRCola can be launched every time you log in to your computer.\n" "It will be available on the system tray and via registered shortcuts Win+F5 " @@ -289,15 +297,15 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:682 +#: zrcolagui.cpp:705 msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:689 +#: zrcolagui.cpp:712 msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:768 +#: zrcolagui.cpp:791 msgid "" "Editor: Janoš Ježovnik\n" "Development: Amebis d. o. o.\n" @@ -307,19 +315,19 @@ msgstr "" "Razvoj: Amebis d. o. o.\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:776 +#: zrcolagui.cpp:799 msgid "www.zrc-sazu.si" msgstr "www.zrc-sazu.si" -#: zrcolagui.cpp:815 +#: zrcolagui.cpp:838 msgid "Log" msgstr "Dnevnik" -#: zrcolagui.cpp:831 +#: zrcolagui.cpp:854 msgid "&Update" msgstr "&Posodobi" -#: zrcolagui.cpp:836 +#: zrcolagui.cpp:859 msgid "&Close" msgstr "&Zapri" @@ -335,36 +343,28 @@ msgstr "" msgid "Start ZRCola automatically on logon" msgstr "Samodejno zaženi ZRColo ob prijavi" -#: zrcolagui.h:262 +#: zrcolagui.h:269 msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:286 +#: zrcolagui.h:293 msgid "About ZRCola" msgstr "O ZRColi" -#: zrcolagui.h:309 +#: zrcolagui.h:316 msgid "Product Update" msgstr "Posodabljanje izdelka" # Windows charset for this language (decimal) -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.Win32.Release.Feature-2.idtx:3 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:3 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3 #: MSIBuild/En.x64.Release.Feature-2.idtx:3 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1250" -#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4 -#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 -#: MSIBuild/En.x64.Debug.Feature-2.idtx:4 -#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "Input system for linguistic use" diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp index 75e483c..1fae1ef 100644 --- a/ZRCola/zrcolachrslct.cpp +++ b/ZRCola/zrcolachrslct.cpp @@ -146,6 +146,42 @@ void wxZRColaCharSelect::OnSearchText(wxCommandEvent& event) } +void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event) +{ + event.StopPropagation(); + + ZRColaApp *app = (ZRColaApp*)wxTheApp; + for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) + m_categories->Check(i, true); + + m_searchChanged = true; +} + + +void wxZRColaCharSelect::OnCategoriesNone(wxHyperlinkEvent& event) +{ + event.StopPropagation(); + + ZRColaApp *app = (ZRColaApp*)wxTheApp; + for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) + m_categories->Check(i, false); + + m_searchChanged = true; +} + + +void wxZRColaCharSelect::OnCategoriesInvert(wxHyperlinkEvent& event) +{ + event.StopPropagation(); + + ZRColaApp *app = (ZRColaApp*)wxTheApp; + for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) + m_categories->Check(i, !m_categories->IsChecked(i)); + + m_searchChanged = true; +} + + void wxZRColaCharSelect::OnCategoriesToggle(wxCommandEvent& event) { event.Skip(); diff --git a/ZRCola/zrcolachrslct.h b/ZRCola/zrcolachrslct.h index e23c3a7..97cc98c 100644 --- a/ZRCola/zrcolachrslct.h +++ b/ZRCola/zrcolachrslct.h @@ -53,6 +53,9 @@ public: protected: virtual void OnIdle(wxIdleEvent& event); virtual void OnSearchText(wxCommandEvent& event); + virtual void OnCategoriesAll(wxHyperlinkEvent& event); + virtual void OnCategoriesNone(wxHyperlinkEvent& event); + virtual void OnCategoriesInvert(wxHyperlinkEvent& event); virtual void OnCategoriesToggle(wxCommandEvent& event); void OnSearchComplete(wxThreadEvent& event); virtual void OnResultSelectCell(wxGridEvent& event); diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index 7442362..52b27ef 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -417,6 +417,21 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, m_search->ShowCancelButton( true ); sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 ); + wxBoxSizer* bSizerCategoriesCtrl; + bSizerCategoriesCtrl = new wxBoxSizer( wxHORIZONTAL ); + + m_categoriesAll = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 ); + + m_categoriesNone = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 ); + + m_categoriesInvert = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 ); + + + sbSizerBrowse->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 ); + wxArrayString m_categoriesChoices; m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 ); sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 ); @@ -611,6 +626,9 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, // Connect Events this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) ); m_search->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this ); + m_categoriesAll->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this ); + m_categoriesNone->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this ); + m_categoriesInvert->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesInvert ), NULL, this ); m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this ); m_gridResults->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( wxZRColaCharSelectBase::OnResultCellDClick ), NULL, this ); m_gridResults->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnResultSelectCell ), NULL, this ); @@ -628,6 +646,9 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase() // Disconnect Events this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) ); m_search->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this ); + m_categoriesAll->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this ); + m_categoriesNone->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this ); + m_categoriesInvert->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesInvert ), NULL, this ); m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this ); m_gridResults->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( wxZRColaCharSelectBase::OnResultCellDClick ), NULL, this ); m_gridResults->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnResultSelectCell ), NULL, this ); diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 8cbc992..463bb19 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.h @@ -38,6 +38,7 @@ class wxZRColaComposerPanel; #include #include #include +#include #include #include #include @@ -48,7 +49,6 @@ class wxZRColaComposerPanel; #include #include #include -#include /////////////////////////////////////////////////////////////////////////// @@ -193,6 +193,9 @@ class wxZRColaCharSelectBase : public wxDialog protected: wxSearchCtrl* m_search; + wxHyperlinkCtrl* m_categoriesAll; + wxHyperlinkCtrl* m_categoriesNone; + wxHyperlinkCtrl* m_categoriesInvert; wxCheckListBox* m_categories; wxZRColaCharGrid* m_gridResults; wxZRColaCharGrid* m_gridRecent; @@ -209,6 +212,9 @@ class wxZRColaCharSelectBase : public wxDialog // Virtual event handlers, overide them in your derived class virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); } virtual void OnSearchText( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); } + virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); } + virtual void OnCategoriesInvert( wxHyperlinkEvent& event ) { event.Skip(); } virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); } virtual void OnResultCellDClick( wxGridEvent& event ) { event.Skip(); } virtual void OnResultSelectCell( wxGridEvent& event ) { event.Skip(); }