From fbd60a53dc4e98889cd913d5b1f17b74d6618fb7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 13 Jun 2016 13:25:05 +0200 Subject: [PATCH] Categories are collapsible in Character Search dialog now --- ZRCola/ZRCola.fbp | 727 ++++++++++++++++++++++++--------------- ZRCola/locale/ZRCola.pot | 142 ++++---- ZRCola/locale/de_DE.po | 432 ++++++++++++++++++----- ZRCola/locale/ru_RU.po | 126 ++++--- ZRCola/locale/sl_SI.po | 132 ++++--- ZRCola/zrcolachrslct.cpp | 34 +- ZRCola/zrcolachrslct.h | 1 + ZRCola/zrcolagui.cpp | 31 +- ZRCola/zrcolagui.h | 5 +- 9 files changed, 1095 insertions(+), 535 deletions(-) diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp index 766c0d8..aeb874a 100644 --- a/ZRCola/ZRCola.fbp +++ b/ZRCola/ZRCola.fbp @@ -2434,7 +2434,7 @@ 5 wxALL|wxEXPAND 0 - + 1 1 1 @@ -2448,7 +2448,6 @@ 1 0 - 1 1 @@ -2462,15 +2461,18 @@ 0 0 + wxID_ANY + Search Options 0 - -1,-1 + 0 1 - m_categories + m_search_more + 1 @@ -2479,24 +2481,20 @@ Resizable 1 - -1,60 - + + wxHL_DEFAULT_STYLE 0 - List of Unicode character categories to search in - - wxFILTER_NONE - wxDefaultValidator - + Shows/hides additional search options + + - - - OnCategoriesToggle + OnSearchMore @@ -2521,272 +2519,447 @@ 5 - wxALIGN_RIGHT + wxEXPAND 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 1 + wxID_ANY + + 0 + + + 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 - Select all categories - - - - - - - - - OnCategoriesAll - - - - - - - - - - - - - - - - - - - - + 1 + m_search_panel + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + sbSizerSearch + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + -1,-1 + + 0 + + 1 + m_categories + 1 + + + protected + 1 + + Resizable + 1 + -1,60 + + + 0 + List of Unicode character categories to search in + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + OnCategoriesToggle + + + + + + + + + + + + + + + + + + + + + + + - - - 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 - Clear category selection - - - - - - - - - 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 - Invert category selection - - - - - - - - - OnCategoriesInvert - - - - - - - - - - - - - - - - - - - - + + 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 + Select all categories + + + + + + + + + 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 + Clear category selection + + + + + + + + + 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 + Invert category selection + + + + + + + + + OnCategoriesInvert + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index 300fe74..f8ad81f 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-06-02 20:52+0200\n" +"POT-Creation-Date: 2016-06-13 13:20+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,7 +23,7 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU" -#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -32,21 +32,31 @@ msgstr "© 2004-%s ZRC SAZU" msgid "ZRCola" msgstr "ZRCola" -#: zrcolachrreq.cpp:49 zrcolagui.cpp:970 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:989 #, fuzzy msgid "Character" msgstr "Znak" -#: zrcolachrreq.cpp:58 zrcolagui.cpp:991 +#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010 #, fuzzy msgid "Context" msgstr "Kontekst" -#: zrcolachrreq.cpp:64 zrcolagui.h:357 +#: zrcolachrreq.cpp:64 zrcolagui.h:360 #, fuzzy msgid "Request a New Character" msgstr "Zahtevaj nov znak" +#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624 +#, fuzzy +msgid "▸ Search Options" +msgstr "▶ Možnosti iskanja" + +#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621 +#, fuzzy +msgid "▾ Search Options" +msgstr "▶ Možnosti iskanja" + #: zrcolafrm.cpp:111 #, fuzzy msgid "" @@ -110,12 +120,14 @@ msgid "Select all text" msgstr "Izberi celotno besedilo" #: zrcolagui.cpp:78 +#, fuzzy msgid "Find C&haracter..." -msgstr "" +msgstr "Poišči &znak ..." #: zrcolagui.cpp:78 zrcolagui.cpp:180 +#, fuzzy msgid "Display character search to select character to insert into text" -msgstr "" +msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo" #: zrcolagui.cpp:89 #, fuzzy @@ -278,8 +290,9 @@ msgid "Edit" msgstr "Urejanje" #: zrcolagui.cpp:180 +#, fuzzy msgid "Find Character" -msgstr "" +msgstr "Poišči znak" #: zrcolagui.cpp:182 #, fuzzy @@ -339,122 +352,132 @@ msgid "" msgstr "" "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje" -#: zrcolagui.cpp:434 +#: zrcolagui.cpp:432 +#, fuzzy +msgid "Search Options" +msgstr "Možnosti iskanja" + +#: zrcolagui.cpp:433 +#, fuzzy +msgid "Shows/hides additional search options" +msgstr "Prikaže/skrije dodatne možnosti iskanja" + +#: zrcolagui.cpp:445 #, fuzzy msgid "List of Unicode character categories to search in" msgstr "Seznam kategorij znaka Unicode za iskanje" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:452 #, fuzzy msgid "All" msgstr "Vse" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:453 #, fuzzy msgid "Select all categories" msgstr "Izberi vse kategorije" -#: zrcolagui.cpp:446 +#: zrcolagui.cpp:457 #, fuzzy msgid "None" msgstr "Nič" -#: zrcolagui.cpp:447 +#: zrcolagui.cpp:458 #, fuzzy msgid "Clear category selection" msgstr "Počisti izbor kategorij" -#: zrcolagui.cpp:451 +#: zrcolagui.cpp:462 #, fuzzy msgid "Invert" msgstr "Obrni" -#: zrcolagui.cpp:452 +#: zrcolagui.cpp:463 #, fuzzy msgid "Invert category selection" msgstr "Obrni izbor kategorij" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:502 #, fuzzy msgid "Character search results" msgstr "Rezultati iskanja znakov" -#: zrcolagui.cpp:495 +#: zrcolagui.cpp:512 #, fuzzy msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:523 +#: zrcolagui.cpp:540 #, fuzzy msgid "List of recently inserted characters" msgstr "Seznam nedavno vstavljenih znakov" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:554 #, fuzzy msgid "Preview" msgstr "Predogled:" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:559 #, fuzzy msgid "U+" msgstr "U+" -#: zrcolagui.cpp:547 +#: zrcolagui.cpp:564 #, fuzzy msgid "Unicode hexadecimal code" msgstr "Šestnajstiška koda Unicode" -#: zrcolagui.cpp:552 +#: zrcolagui.cpp:569 #, fuzzy msgid "Keyboard shortcut in Composer window" msgstr "Bližnjica na tipkovnici v oknu sestavljalnika" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:604 #, fuzzy msgid "Character preview" msgstr "Predogled znaka" -#: zrcolagui.cpp:592 +#: zrcolagui.cpp:609 #, fuzzy msgid "Unicode character description" msgstr "Opis znaka Unicode" -#: zrcolagui.cpp:597 +#: zrcolagui.cpp:614 #, fuzzy msgid "Unicode character category" msgstr "Kategorija znaka Unicode" -#: zrcolagui.cpp:604 +#: zrcolagui.cpp:621 #, fuzzy msgid "« Back" msgstr "< &Nazaj" -#: zrcolagui.cpp:606 +#: zrcolagui.cpp:623 #, fuzzy msgid "To previously viewed character" msgstr "Na prejšnji prikazan znak" -#: zrcolagui.cpp:610 +#: zrcolagui.cpp:627 #, fuzzy msgid "Forward »" msgstr "Naprej »" -#: zrcolagui.cpp:612 +#: zrcolagui.cpp:629 #, fuzzy msgid "To following viewed character" msgstr "Na naslednji prikazan znak" -#: zrcolagui.cpp:623 +#: zrcolagui.cpp:640 #, fuzzy msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:650 +#: zrcolagui.cpp:667 #, fuzzy msgid "List of related characters" msgstr "Seznam sorodnih znakov" -#: zrcolagui.cpp:737 +#: zrcolagui.cpp:756 #, fuzzy msgid "" "Some character native to specific language you are working with should not " @@ -465,22 +488,22 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:741 +#: zrcolagui.cpp:760 #, fuzzy msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:744 +#: zrcolagui.cpp:763 #, fuzzy msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:756 +#: zrcolagui.cpp:775 #, fuzzy msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:761 +#: zrcolagui.cpp:780 #, fuzzy msgid "" "ZRCola can be launched every time you log in to your computer.\n" @@ -491,17 +514,17 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:765 +#: zrcolagui.cpp:784 #, fuzzy msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:772 +#: zrcolagui.cpp:791 #, fuzzy msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:851 +#: zrcolagui.cpp:870 #, fuzzy msgid "" "Program and Website Editor: Janoš Ježovnik\n" @@ -512,11 +535,12 @@ msgstr "" "Razvoj: Amebis, d. o. o., Kamnik\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:878 +#, fuzzy msgid "zrcola.zrc-sazu.si" -msgstr "" +msgstr "zrcola.zrc-sazu.si" -#: zrcolagui.cpp:865 +#: zrcolagui.cpp:884 #, fuzzy msgid "" "Texts made using ZRCola have to include in the colophon, foreword, footnote " @@ -526,7 +550,7 @@ msgstr "" "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim " "zapisom:" -#: zrcolagui.cpp:869 +#: zrcolagui.cpp:888 #, fuzzy msgid "" "This text was written using the ZRCola input system (http://zrcola.zrc-sazu." @@ -537,42 +561,42 @@ msgstr "" "sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani " "(http://www.zrc-sazu.si) razvil dr. Peter Weiss." -#: zrcolagui.cpp:910 +#: zrcolagui.cpp:929 #, fuzzy msgid "Log" msgstr "Dnevnik" -#: zrcolagui.cpp:926 +#: zrcolagui.cpp:945 #, fuzzy msgid "Quit and &Update..." msgstr "Za&ustavi in posodobi ..." -#: zrcolagui.cpp:928 +#: zrcolagui.cpp:947 #, fuzzy msgid "Exit this program and launch product update" msgstr "Zaustavi ta program in zaženi posodobitev izdelka" -#: zrcolagui.cpp:932 +#: zrcolagui.cpp:951 #, fuzzy msgid "&Close" msgstr "&Zapri" -#: zrcolagui.cpp:933 +#: zrcolagui.cpp:952 #, fuzzy msgid "Close this window" msgstr "Zapri to okno" -#: zrcolagui.cpp:972 +#: zrcolagui.cpp:991 #, fuzzy msgid "Enter the &character you would like to request:" msgstr "Vpišite &znak, ki ga želite zahtevati:" -#: zrcolagui.cpp:979 +#: zrcolagui.cpp:998 #, fuzzy msgid "Decomposed character to request" msgstr "Razstavljen znak, ki ga zahtevate" -#: zrcolagui.cpp:983 +#: zrcolagui.cpp:1002 #, fuzzy msgid "" "Please, use the decomposed form.\n" @@ -583,19 +607,19 @@ msgstr "" "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate " "in prilepite iz okna z razstavljenim besedilom." -#: zrcolagui.cpp:993 +#: zrcolagui.cpp:1012 #, fuzzy msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:" -#: zrcolagui.cpp:999 +#: zrcolagui.cpp:1018 #, fuzzy msgid "Additional notes for character request" msgstr "Dodatne opombe za zahtevo znaka" -#: zrcolagui.cpp:1006 +#: zrcolagui.cpp:1025 #, fuzzy msgid "" "After clicking OK button, your e-mail application should open allowing you " @@ -633,22 +657,22 @@ msgstr "" "Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n" "Ali ste prepričani?" -#: zrcolaupdater.cpp:94 zrcolagui.h:328 +#: zrcolaupdater.cpp:94 zrcolagui.h:331 #, fuzzy msgid "Product Update" msgstr "Posodabljanje izdelka" -#: zrcolagui.h:240 +#: zrcolagui.h:243 #, fuzzy msgid "Character Search" -msgstr "Rezultati iskanja znakov" +msgstr "Poišči znak" -#: zrcolagui.h:277 +#: zrcolagui.h:280 #, fuzzy msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:303 +#: zrcolagui.h:306 #, fuzzy msgid "About ZRCola" msgstr "O ZRColi" diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index bb42df4..41f62d5 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-06-02 20:53+0200\n" -"PO-Revision-Date: 2016-06-02 20:53+0200\n" +"POT-Creation-Date: 2016-06-13 13:21+0200\n" +"PO-Revision-Date: 2016-06-13 13:21+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: de_DE\n" @@ -20,7 +20,7 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "" -#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -29,20 +29,28 @@ msgstr "" msgid "ZRCola" msgstr "ZRCola:." -#: zrcolachrreq.cpp:49 zrcolagui.cpp:970 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:989 #, fuzzy msgid "Character" msgstr "Eingabe eines Zeichenstils" -#: zrcolachrreq.cpp:58 zrcolagui.cpp:991 +#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010 #, fuzzy msgid "Context" msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren." -#: zrcolachrreq.cpp:64 zrcolagui.h:357 +#: zrcolachrreq.cpp:64 zrcolagui.h:360 msgid "Request a New Character" msgstr "" +#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624 +msgid "▸ Search Options" +msgstr "" + +#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621 +msgid "▾ Search Options" +msgstr "" + #: zrcolafrm.cpp:111 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " @@ -298,216 +306,224 @@ msgid "" "search for" msgstr "" -#: zrcolagui.cpp:434 +#: zrcolagui.cpp:432 +msgid "Search Options" +msgstr "" + +#: zrcolagui.cpp:433 +msgid "Shows/hides additional search options" +msgstr "" + +#: zrcolagui.cpp:445 msgid "List of Unicode character categories to search in" msgstr "" -#: zrcolagui.cpp:441 -#, fuzzy -msgid "All" -msgstr "Alle" - -#: zrcolagui.cpp:442 -msgid "Select all categories" -msgstr "" - -#: zrcolagui.cpp:446 -#, fuzzy -msgid "None" -msgstr "Kein" - -#: zrcolagui.cpp:447 -#, fuzzy -msgid "Clear category selection" -msgstr "Auswahl kopieren" - -#: zrcolagui.cpp:451 -msgid "Invert" -msgstr "" - #: zrcolagui.cpp:452 #, fuzzy +msgid "All" +msgstr "Alle" + +#: zrcolagui.cpp:453 +msgid "Select all categories" +msgstr "" + +#: zrcolagui.cpp:457 +#, fuzzy +msgid "None" +msgstr "Kein" + +#: zrcolagui.cpp:458 +#, fuzzy +msgid "Clear category selection" +msgstr "Auswahl kopieren" + +#: zrcolagui.cpp:462 +msgid "Invert" +msgstr "" + +#: zrcolagui.cpp:463 +#, fuzzy msgid "Invert category selection" msgstr "Auswahl einfügen" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:502 #, fuzzy msgid "Character search results" msgstr "Skupine &znakov" -#: zrcolagui.cpp:495 +#: zrcolagui.cpp:512 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:523 +#: zrcolagui.cpp:540 msgid "List of recently inserted characters" msgstr "" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:554 #, fuzzy msgid "Preview" msgstr " Vorschau" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:559 #, fuzzy msgid "U+" msgstr "Hilfeverzeichnis %u nicht gefunden." -#: zrcolagui.cpp:547 +#: zrcolagui.cpp:564 msgid "Unicode hexadecimal code" msgstr "" -#: zrcolagui.cpp:552 +#: zrcolagui.cpp:569 msgid "Keyboard shortcut in Composer window" msgstr "" -#: zrcolagui.cpp:587 -#, fuzzy -msgid "Character preview" -msgstr "Skupine &znakov" - -#: zrcolagui.cpp:592 -msgid "Unicode character description" -msgstr "" - -#: zrcolagui.cpp:597 -msgid "Unicode character category" -msgstr "" - #: zrcolagui.cpp:604 #, fuzzy +msgid "Character preview" +msgstr "Skupine &znakov" + +#: zrcolagui.cpp:609 +msgid "Unicode character description" +msgstr "" + +#: zrcolagui.cpp:614 +msgid "Unicode character category" +msgstr "" + +#: zrcolagui.cpp:621 +#, fuzzy msgid "« Back" msgstr "< &Zurück" -#: zrcolagui.cpp:606 +#: zrcolagui.cpp:623 msgid "To previously viewed character" msgstr "" -#: zrcolagui.cpp:610 +#: zrcolagui.cpp:627 #, fuzzy msgid "Forward »" msgstr "&Vorwärts" -#: zrcolagui.cpp:612 +#: zrcolagui.cpp:629 msgid "To following viewed character" msgstr "" -#: zrcolagui.cpp:623 +#: zrcolagui.cpp:640 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:650 +#: zrcolagui.cpp:667 msgid "List of related characters" msgstr "" -#: zrcolagui.cpp:737 +#: zrcolagui.cpp:756 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:741 +#: zrcolagui.cpp:760 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:744 +#: zrcolagui.cpp:763 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:756 +#: zrcolagui.cpp:775 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:761 +#: zrcolagui.cpp:780 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:765 +#: zrcolagui.cpp:784 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:772 +#: zrcolagui.cpp:791 msgid "Startup" msgstr "" -#: zrcolagui.cpp:851 +#: zrcolagui.cpp:870 msgid "" "Program and Website Editor: Janoš Ježovnik\n" "Development: Amebis, d. o. o., Kamnik\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:878 msgid "zrcola.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:865 +#: zrcolagui.cpp:884 msgid "" "Texts made using ZRCola have to include in the colophon, foreword, footnote " "or some other appropriate part of the publication the note below:" msgstr "" -#: zrcolagui.cpp:869 +#: zrcolagui.cpp:888 msgid "" "This text was written using the ZRCola input system (http://zrcola.zrc-sazu." "si), developed at the Science and Research Centre of SAZU in Ljubljana " "(http://www.zrc-sazu.si) by Dr. Peter Weiss." msgstr "" -#: zrcolagui.cpp:910 +#: zrcolagui.cpp:929 #, fuzzy msgid "Log" msgstr "&Log" -#: zrcolagui.cpp:926 +#: zrcolagui.cpp:945 #, fuzzy msgid "Quit and &Update..." msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren." -#: zrcolagui.cpp:928 +#: zrcolagui.cpp:947 msgid "Exit this program and launch product update" msgstr "" -#: zrcolagui.cpp:932 +#: zrcolagui.cpp:951 #, fuzzy msgid "&Close" msgstr "&Schließen" -#: zrcolagui.cpp:933 +#: zrcolagui.cpp:952 #, fuzzy msgid "Close this window" msgstr "Fenster schließen" -#: zrcolagui.cpp:972 +#: zrcolagui.cpp:991 msgid "Enter the &character you would like to request:" msgstr "" -#: zrcolagui.cpp:979 +#: zrcolagui.cpp:998 msgid "Decomposed character to request" msgstr "" -#: zrcolagui.cpp:983 +#: zrcolagui.cpp:1002 msgid "" "Please, use the decomposed form.\n" "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste " "it from the Decomposed window." msgstr "" -#: zrcolagui.cpp:993 +#: zrcolagui.cpp:1012 msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "" -#: zrcolagui.cpp:999 +#: zrcolagui.cpp:1018 msgid "Additional notes for character request" msgstr "" -#: zrcolagui.cpp:1006 +#: zrcolagui.cpp:1025 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -532,20 +548,20 @@ msgid "" "Are you sure?" msgstr "" -#: zrcolaupdater.cpp:94 zrcolagui.h:328 +#: zrcolaupdater.cpp:94 zrcolagui.h:331 msgid "Product Update" msgstr "" -#: zrcolagui.h:240 +#: zrcolagui.h:243 #, fuzzy msgid "Character Search" msgstr "Skupine &znakov" -#: zrcolagui.h:277 +#: zrcolagui.h:280 msgid "Settings" msgstr "" -#: zrcolagui.h:303 +#: zrcolagui.h:306 msgid "About ZRCola" msgstr "" @@ -564,3 +580,257 @@ msgstr "1252" #: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "Input system for linguistic use" msgstr "" + +#~ msgid "Auto Start" +#~ msgstr "Samodejni zagon" + +#~ msgid "Select %s language for decomposition" +#~ msgstr "Izberi jezik %s za razstavljanje" + +#~ msgid "&Start on Logon" +#~ msgstr "Z&aženi ob prijavi" + +#~ msgid "Start this program automatically on logon" +#~ msgstr "Samodejno zaženi ta program ob prijavi" + +#~ msgid "Set language according to keyboard layout automatically" +#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico" + +#~ msgid "&Unicode" +#~ msgstr "&Unicode" + +#~ msgid "Esc" +#~ msgstr "Esc" + +#~ msgid "F1" +#~ msgstr "F1" + +#~ msgid "F2" +#~ msgstr "F2" + +#~ msgid "F3" +#~ msgstr "F3" + +#~ msgid "F4" +#~ msgstr "F4" + +#~ msgid "F5" +#~ msgstr "F5" + +#~ msgid "F6" +#~ msgstr "F6" + +#~ msgid "F7" +#~ msgstr "F7" + +#~ msgid "F8" +#~ msgstr "F8" + +#~ msgid "F9" +#~ msgstr "F9" + +#~ msgid "F10" +#~ msgstr "F10" + +#~ msgid "F11" +#~ msgstr "F11" + +#~ msgid "F12" +#~ msgstr "F12" + +#~ msgid "Print Screen" +#~ msgstr "Print Screen" + +#~ msgid "Scroll Lock" +#~ msgstr "Scroll Lock" + +#~ msgid "Pause" +#~ msgstr "Pause" + +#~ msgid "Backspace" +#~ msgstr "Backspace" + +#~ msgid "Tab" +#~ msgstr "Tab" + +#~ msgid "Caps Lock" +#~ msgstr "Caps Lock" + +#~ msgid "Return" +#~ msgstr "Return" + +#~ msgid "Space" +#~ msgstr "preslednica" + +#~ msgid "Shift" +#~ msgstr "Shift" + +#, fuzzy +#~ msgid "Alt" +#~ msgstr "Alle" + +#~ msgid "Ctrl" +#~ msgstr "Ctrl" + +#~ msgid "Menu" +#~ msgstr "Menu" + +#~ msgid "Insert" +#~ msgstr "Insert" + +#~ msgid "Delete" +#~ msgstr "Delete" + +#~ msgid "Page Up" +#~ msgstr "Page Up" + +#~ msgid "Page Down" +#~ msgstr "Page Down" + +#~ msgid "Home" +#~ msgstr "Home" + +#~ msgid "End" +#~ msgstr "End" + +#~ msgid "Left" +#~ msgstr "Left" + +#~ msgid "Up" +#~ msgstr "Up" + +#~ msgid "Right" +#~ msgstr "Right" + +#~ msgid "Down" +#~ msgstr "Down" + +#~ msgid "Num Lock" +#~ msgstr "Num Lock" + +#~ msgid "`" +#~ msgstr "`" + +#~ msgid "-" +#~ msgstr "-" + +#~ msgid "[" +#~ msgstr "[" + +#~ msgid "]" +#~ msgstr "]" + +#~ msgid ":" +#~ msgstr ":" + +#~ msgid "'" +#~ msgstr "'" + +#~ msgid "\\" +#~ msgstr "\\" + +#~ msgid "," +#~ msgstr "," + +#~ msgid "." +#~ msgstr "." + +#~ msgid "/" +#~ msgstr "/" + +#~ msgid "INS" +#~ msgstr "INS" + +#, fuzzy +#~ msgid "Character &Groups" +#~ msgstr "Eingabe eines Zeichenstils" + +#~ msgid "Language:" +#~ msgstr "Jezik:" + +#~ msgid "&About" +#~ msgstr "O progr&amu" + +#~ msgid "Cuts selected text and puts it on the clipboard" +#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče" + +#~ msgid "Copies selected text to the clipboard" +#~ msgstr "Kopira izbrano besedilo na odložišče" + +#~ msgid "Inserts text from the clipboard" +#~ msgstr "Vstavi besedilo z odložišča" + +#, fuzzy +#~ msgid "&Copy" +#~ msgstr "Kopieren" + +#, fuzzy +#~ msgid "&Paste" +#~ msgstr "Einfügen" + +#~ msgid "&File" +#~ msgstr "&Datoteka" + +#, fuzzy +#~ msgid "Send Decomposed (F6)" +#~ msgstr "Pošlji razstavljeno (F6)" + +#, fuzzy +#~ msgid "Send Composed (F5)" +#~ msgstr "Pošlji sestavljeno (F5)" + +#~ msgid "" +#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some " +#~ "functionality will not be available." +#~ msgstr "" +#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. " +#~ "Nekaj funkcionalnosti ne bo na voljo." + +#, fuzzy +#~ msgid "Authentication progress real time monitor" +#~ msgstr "Nadzira postopek overovljanja v realnem času" + +#~ msgid "Grave\t&7" +#~ msgstr "Krativec\t&7" + +#~ msgid "Acute\t&9" +#~ msgstr "Ostrivec\t&9" + +#~ msgid "Circumflex\t&3" +#~ msgstr "Cirkumfleks\t&3" + +#~ msgid "Inverted &breve" +#~ msgstr "O&brnjen polkrog" + +#~ msgid "&Accents" +#~ msgstr "N&aglasi" + +#~ msgid "" +#~ "There is already an auto hidden bar on this edge.\n" +#~ "Only one auto hidden bar is allowed on each edge.\n" +#~ "Auto-hide feature is now off." +#~ msgstr "" +#~ "Ob tem robu je že samodejno skrita pasica.\n" +#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n" +#~ "Samodejno skrivanje je zdaj izklopljeno." + +#~ msgid "Hello World" +#~ msgstr "Zdravo svet" + +#~ msgid "&Hello...\tCtrl+H" +#~ msgstr "&Pozdrav ...\tCtrl+H" + +#~ msgid "Help string shown in status bar for this menu item" +#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija" + +#~ msgid "This is a wxWidgets' Hello world sample" +#~ msgstr "To je primer Zdravo svet v wxWidgets" + +#~ msgid "About Hello World" +#~ msgstr "O Zdravo svet" + +#~ msgid "Hello world from wxWidgets!" +#~ msgstr "Zdravo svet iz wxWidgets!" + +#~ msgid "Welcome to wxWidgets!" +#~ msgstr "Dobrodošli v wxWidgets!" diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index 16b37ce..2ccf6d9 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-06-02 20:53+0200\n" -"PO-Revision-Date: 2016-06-02 20:53+0200\n" +"POT-Creation-Date: 2016-06-13 13:21+0200\n" +"PO-Revision-Date: 2016-06-13 13:21+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -21,7 +21,7 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "" -#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -30,19 +30,27 @@ msgstr "" msgid "ZRCola" msgstr "ZRCola:." -#: zrcolachrreq.cpp:49 zrcolagui.cpp:970 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:989 #, fuzzy msgid "Character" msgstr "Skupine &znakov" -#: zrcolachrreq.cpp:58 zrcolagui.cpp:991 +#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010 msgid "Context" msgstr "" -#: zrcolachrreq.cpp:64 zrcolagui.h:357 +#: zrcolachrreq.cpp:64 zrcolagui.h:360 msgid "Request a New Character" msgstr "" +#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624 +msgid "▸ Search Options" +msgstr "" + +#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621 +msgid "▾ Search Options" +msgstr "" + #: zrcolafrm.cpp:111 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " @@ -285,205 +293,213 @@ msgid "" "search for" msgstr "" -#: zrcolagui.cpp:434 +#: zrcolagui.cpp:432 +msgid "Search Options" +msgstr "" + +#: zrcolagui.cpp:433 +msgid "Shows/hides additional search options" +msgstr "" + +#: zrcolagui.cpp:445 msgid "List of Unicode character categories to search in" msgstr "" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:452 #, fuzzy msgid "All" msgstr "Alt" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:453 msgid "Select all categories" msgstr "" -#: zrcolagui.cpp:446 +#: zrcolagui.cpp:457 msgid "None" msgstr "" -#: zrcolagui.cpp:447 +#: zrcolagui.cpp:458 msgid "Clear category selection" msgstr "" -#: zrcolagui.cpp:451 +#: zrcolagui.cpp:462 msgid "Invert" msgstr "" -#: zrcolagui.cpp:452 +#: zrcolagui.cpp:463 msgid "Invert category selection" msgstr "" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:502 #, fuzzy msgid "Character search results" msgstr "Skupine &znakov" -#: zrcolagui.cpp:495 +#: zrcolagui.cpp:512 msgid "Re¢ly Used" msgstr "" -#: zrcolagui.cpp:523 +#: zrcolagui.cpp:540 msgid "List of recently inserted characters" msgstr "" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:554 msgid "Preview" msgstr "" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:559 msgid "U+" msgstr "" -#: zrcolagui.cpp:547 +#: zrcolagui.cpp:564 msgid "Unicode hexadecimal code" msgstr "" -#: zrcolagui.cpp:552 +#: zrcolagui.cpp:569 msgid "Keyboard shortcut in Composer window" msgstr "" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:604 #, fuzzy msgid "Character preview" msgstr "Skupine &znakov" -#: zrcolagui.cpp:592 +#: zrcolagui.cpp:609 msgid "Unicode character description" msgstr "" -#: zrcolagui.cpp:597 +#: zrcolagui.cpp:614 msgid "Unicode character category" msgstr "" -#: zrcolagui.cpp:604 +#: zrcolagui.cpp:621 msgid "« Back" msgstr "" -#: zrcolagui.cpp:606 +#: zrcolagui.cpp:623 msgid "To previously viewed character" msgstr "" -#: zrcolagui.cpp:610 +#: zrcolagui.cpp:627 msgid "Forward »" msgstr "" -#: zrcolagui.cpp:612 +#: zrcolagui.cpp:629 msgid "To following viewed character" msgstr "" -#: zrcolagui.cpp:623 +#: zrcolagui.cpp:640 msgid "Re&lated" msgstr "" -#: zrcolagui.cpp:650 +#: zrcolagui.cpp:667 msgid "List of related characters" msgstr "" -#: zrcolagui.cpp:737 +#: zrcolagui.cpp:756 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:741 +#: zrcolagui.cpp:760 msgid "Select language &automatically according to selected keyboard" msgstr "" -#: zrcolagui.cpp:744 +#: zrcolagui.cpp:763 msgid "&Manually select the language from the list below:" msgstr "" -#: zrcolagui.cpp:756 +#: zrcolagui.cpp:775 msgid "Text Language" msgstr "" -#: zrcolagui.cpp:761 +#: zrcolagui.cpp:780 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:765 +#: zrcolagui.cpp:784 msgid "Start ZRCola &automatically on logon" msgstr "" -#: zrcolagui.cpp:772 +#: zrcolagui.cpp:791 msgid "Startup" msgstr "" -#: zrcolagui.cpp:851 +#: zrcolagui.cpp:870 msgid "" "Program and Website Editor: Janoš Ježovnik\n" "Development: Amebis, d. o. o., Kamnik\n" "Development and maintenance (2004-2015): dr. Peter Weiss" msgstr "" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:878 msgid "zrcola.zrc-sazu.si" msgstr "" -#: zrcolagui.cpp:865 +#: zrcolagui.cpp:884 msgid "" "Texts made using ZRCola have to include in the colophon, foreword, footnote " "or some other appropriate part of the publication the note below:" msgstr "" -#: zrcolagui.cpp:869 +#: zrcolagui.cpp:888 msgid "" "This text was written using the ZRCola input system (http://zrcola.zrc-sazu." "si), developed at the Science and Research Centre of SAZU in Ljubljana " "(http://www.zrc-sazu.si) by Dr. Peter Weiss." msgstr "" -#: zrcolagui.cpp:910 +#: zrcolagui.cpp:929 msgid "Log" msgstr "" -#: zrcolagui.cpp:926 +#: zrcolagui.cpp:945 msgid "Quit and &Update..." msgstr "" -#: zrcolagui.cpp:928 +#: zrcolagui.cpp:947 msgid "Exit this program and launch product update" msgstr "" -#: zrcolagui.cpp:932 +#: zrcolagui.cpp:951 msgid "&Close" msgstr "" -#: zrcolagui.cpp:933 +#: zrcolagui.cpp:952 msgid "Close this window" msgstr "" -#: zrcolagui.cpp:972 +#: zrcolagui.cpp:991 msgid "Enter the &character you would like to request:" msgstr "" -#: zrcolagui.cpp:979 +#: zrcolagui.cpp:998 msgid "Decomposed character to request" msgstr "" -#: zrcolagui.cpp:983 +#: zrcolagui.cpp:1002 msgid "" "Please, use the decomposed form.\n" "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste " "it from the Decomposed window." msgstr "" -#: zrcolagui.cpp:993 +#: zrcolagui.cpp:1012 msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "" -#: zrcolagui.cpp:999 +#: zrcolagui.cpp:1018 msgid "Additional notes for character request" msgstr "" -#: zrcolagui.cpp:1006 +#: zrcolagui.cpp:1025 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -508,20 +524,20 @@ msgid "" "Are you sure?" msgstr "" -#: zrcolaupdater.cpp:94 zrcolagui.h:328 +#: zrcolaupdater.cpp:94 zrcolagui.h:331 msgid "Product Update" msgstr "" -#: zrcolagui.h:240 +#: zrcolagui.h:243 #, fuzzy msgid "Character Search" msgstr "Skupine &znakov" -#: zrcolagui.h:277 +#: zrcolagui.h:280 msgid "Settings" msgstr "" -#: zrcolagui.h:303 +#: zrcolagui.h:306 msgid "About ZRCola" msgstr "" diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index b462c7e..e079cf0 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-06-02 20:52+0200\n" -"PO-Revision-Date: 2016-06-02 20:52+0200\n" +"POT-Creation-Date: 2016-06-13 13:20+0200\n" +"PO-Revision-Date: 2016-06-13 13:20+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -21,7 +21,7 @@ msgstr "" msgid "© 2004-%s ZRC SAZU" msgstr "© 2004-%s ZRC SAZU" -#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104 +#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104 #: MSIBuild/En.Win32.Release.Feature-2.idtx:4 #: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 #: MSIBuild/En.x64.Release.Feature-2.idtx:4 @@ -29,18 +29,26 @@ msgstr "© 2004-%s ZRC SAZU" msgid "ZRCola" msgstr "ZRCola" -#: zrcolachrreq.cpp:49 zrcolagui.cpp:970 +#: zrcolachrreq.cpp:49 zrcolagui.cpp:989 msgid "Character" msgstr "Znak" -#: zrcolachrreq.cpp:58 zrcolagui.cpp:991 +#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010 msgid "Context" msgstr "Kontekst" -#: zrcolachrreq.cpp:64 zrcolagui.h:357 +#: zrcolachrreq.cpp:64 zrcolagui.h:360 msgid "Request a New Character" msgstr "Zahtevaj nov znak" +#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624 +msgid "▸ Search Options" +msgstr "▸ Možnosti iskanja" + +#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621 +msgid "▾ Search Options" +msgstr "▾ Možnosti iskanja" + #: zrcolafrm.cpp:111 msgid "" "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality " @@ -280,99 +288,107 @@ msgid "" msgstr "" "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje" -#: zrcolagui.cpp:434 +#: zrcolagui.cpp:432 +msgid "Search Options" +msgstr "Možnosti iskanja" + +#: zrcolagui.cpp:433 +msgid "Shows/hides additional search options" +msgstr "Prikaže/skrije dodatne možnosti iskanja" + +#: zrcolagui.cpp:445 msgid "List of Unicode character categories to search in" msgstr "Seznam kategorij znaka Unicode za iskanje" -#: zrcolagui.cpp:441 +#: zrcolagui.cpp:452 msgid "All" msgstr "Vse" -#: zrcolagui.cpp:442 +#: zrcolagui.cpp:453 msgid "Select all categories" msgstr "Izberi vse kategorije" -#: zrcolagui.cpp:446 +#: zrcolagui.cpp:457 msgid "None" msgstr "Nič" -#: zrcolagui.cpp:447 +#: zrcolagui.cpp:458 msgid "Clear category selection" msgstr "Počisti izbor kategorij" -#: zrcolagui.cpp:451 +#: zrcolagui.cpp:462 msgid "Invert" msgstr "Obrni" -#: zrcolagui.cpp:452 +#: zrcolagui.cpp:463 msgid "Invert category selection" msgstr "Obrni izbor kategorij" -#: zrcolagui.cpp:485 +#: zrcolagui.cpp:502 msgid "Character search results" msgstr "Rezultati iskanja znakov" -#: zrcolagui.cpp:495 +#: zrcolagui.cpp:512 msgid "Re¢ly Used" msgstr "Nedavno &uporabljeni" -#: zrcolagui.cpp:523 +#: zrcolagui.cpp:540 msgid "List of recently inserted characters" msgstr "Seznam nedavno vstavljenih znakov" -#: zrcolagui.cpp:537 +#: zrcolagui.cpp:554 msgid "Preview" msgstr "Predogled" -#: zrcolagui.cpp:542 +#: zrcolagui.cpp:559 msgid "U+" msgstr "U+" -#: zrcolagui.cpp:547 +#: zrcolagui.cpp:564 msgid "Unicode hexadecimal code" msgstr "Šestnajstiška koda Unicode" -#: zrcolagui.cpp:552 +#: zrcolagui.cpp:569 msgid "Keyboard shortcut in Composer window" msgstr "Bližnjica na tipkovnici v oknu sestavljalnika" -#: zrcolagui.cpp:587 +#: zrcolagui.cpp:604 msgid "Character preview" msgstr "Predogled znaka" -#: zrcolagui.cpp:592 +#: zrcolagui.cpp:609 msgid "Unicode character description" msgstr "Opis znaka Unicode" -#: zrcolagui.cpp:597 +#: zrcolagui.cpp:614 msgid "Unicode character category" msgstr "Kategorija znaka Unicode" -#: zrcolagui.cpp:604 +#: zrcolagui.cpp:621 msgid "« Back" msgstr "« Nazaj" -#: zrcolagui.cpp:606 +#: zrcolagui.cpp:623 msgid "To previously viewed character" msgstr "Na prejšnji prikazan znak" -#: zrcolagui.cpp:610 +#: zrcolagui.cpp:627 msgid "Forward »" msgstr "Naprej »" -#: zrcolagui.cpp:612 +#: zrcolagui.cpp:629 msgid "To following viewed character" msgstr "Na naslednji prikazan znak" -#: zrcolagui.cpp:623 +#: zrcolagui.cpp:640 msgid "Re&lated" msgstr "&Sorodni" -#: zrcolagui.cpp:650 +#: zrcolagui.cpp:667 msgid "List of related characters" msgstr "Seznam sorodnih znakov" -#: zrcolagui.cpp:737 +#: zrcolagui.cpp:756 msgid "" "Some character native to specific language you are working with should not " "decompose to primitives.\n" @@ -382,19 +398,19 @@ msgstr "" "razstaviti v dele.\n" "Za optimalno razstavljanje izberite pravilni jezik." -#: zrcolagui.cpp:741 +#: zrcolagui.cpp:760 msgid "Select language &automatically according to selected keyboard" msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico" -#: zrcolagui.cpp:744 +#: zrcolagui.cpp:763 msgid "&Manually select the language from the list below:" msgstr "Ročno izberi jezik na spodnje&m spisku:" -#: zrcolagui.cpp:756 +#: zrcolagui.cpp:775 msgid "Text Language" msgstr "Jezik besedila" -#: zrcolagui.cpp:761 +#: zrcolagui.cpp:780 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 " @@ -404,15 +420,15 @@ msgstr "" "Na voljo bo na vrstici za sistemska obvestila ter preko registriranih " "bližnjic Win+F5 in Win+F6." -#: zrcolagui.cpp:765 +#: zrcolagui.cpp:784 msgid "Start ZRCola &automatically on logon" msgstr "S&amodejno zaženi ZRColo ob prijavi" -#: zrcolagui.cpp:772 +#: zrcolagui.cpp:791 msgid "Startup" msgstr "Zagon" -#: zrcolagui.cpp:851 +#: zrcolagui.cpp:870 msgid "" "Program and Website Editor: Janoš Ježovnik\n" "Development: Amebis, d. o. o., Kamnik\n" @@ -422,11 +438,11 @@ msgstr "" "Razvoj: Amebis, d. o. o., Kamnik\n" "Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss" -#: zrcolagui.cpp:859 +#: zrcolagui.cpp:878 msgid "zrcola.zrc-sazu.si" msgstr "zrcola.zrc-sazu.si" -#: zrcolagui.cpp:865 +#: zrcolagui.cpp:884 msgid "" "Texts made using ZRCola have to include in the colophon, foreword, footnote " "or some other appropriate part of the publication the note below:" @@ -435,7 +451,7 @@ msgstr "" "opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim " "zapisom:" -#: zrcolagui.cpp:869 +#: zrcolagui.cpp:888 msgid "" "This text was written using the ZRCola input system (http://zrcola.zrc-sazu." "si), developed at the Science and Research Centre of SAZU in Ljubljana " @@ -445,36 +461,36 @@ msgstr "" "sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani " "(http://www.zrc-sazu.si) razvil dr. Peter Weiss." -#: zrcolagui.cpp:910 +#: zrcolagui.cpp:929 msgid "Log" msgstr "Dnevnik" -#: zrcolagui.cpp:926 +#: zrcolagui.cpp:945 msgid "Quit and &Update..." msgstr "Za&ustavi in posodobi ..." -#: zrcolagui.cpp:928 +#: zrcolagui.cpp:947 msgid "Exit this program and launch product update" msgstr "Zaustavi ta program in zaženi posodobitev izdelka" -#: zrcolagui.cpp:932 +#: zrcolagui.cpp:951 msgid "&Close" msgstr "&Zapri" -#: zrcolagui.cpp:933 +#: zrcolagui.cpp:952 msgid "Close this window" msgstr "Zapri to okno" -#: zrcolagui.cpp:972 +#: zrcolagui.cpp:991 msgid "Enter the &character you would like to request:" msgstr "Vpišite &znak, ki ga želite zahtevati:" -#: zrcolagui.cpp:979 +#: zrcolagui.cpp:998 msgid "Decomposed character to request" msgstr "Razstavljen znak, ki ga zahtevate" # Please use a double && for final "&" character -#: zrcolagui.cpp:983 +#: zrcolagui.cpp:1002 msgid "" "Please, use the decomposed form.\n" "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste " @@ -484,17 +500,17 @@ msgstr "" "Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate " "in prilepite iz okna z razstavljenim besedilom." -#: zrcolagui.cpp:993 +#: zrcolagui.cpp:1012 msgid "" "The &context, examples or short description why and where the character is " "required:" msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:" -#: zrcolagui.cpp:999 +#: zrcolagui.cpp:1018 msgid "Additional notes for character request" msgstr "Dodatne opombe za zahtevo znaka" -#: zrcolagui.cpp:1006 +#: zrcolagui.cpp:1025 msgid "" "After clicking OK button, your e-mail application should open allowing you " "to submit the new character request to ZRCola Editor.\n" @@ -528,19 +544,19 @@ msgstr "" "Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n" "Ali ste prepričani?" -#: zrcolaupdater.cpp:94 zrcolagui.h:328 +#: zrcolaupdater.cpp:94 zrcolagui.h:331 msgid "Product Update" msgstr "Posodabljanje izdelka" -#: zrcolagui.h:240 +#: zrcolagui.h:243 msgid "Character Search" msgstr "Poišči znak" -#: zrcolagui.h:277 +#: zrcolagui.h:280 msgid "Settings" msgstr "Nastavitve" -#: zrcolagui.h:303 +#: zrcolagui.h:306 msgid "About ZRCola" msgstr "O ZRColi" @@ -816,6 +832,12 @@ msgstr "Vnašalni sistem za jezikoslovno rabo" #~ msgid "Welcome to wxWidgets!" #~ msgstr "Dobrodošli v wxWidgets!" +#~ msgid "▼ Search Options" +#~ msgstr "▼ Možnosti iskanja" + +#~ msgid "Less Search Options ▲" +#~ msgstr "Manj možnosti iskanja ▲" + #~ msgid "Character Selector" #~ msgstr "Izbirnik znaka" diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp index f78ba50..53800be 100644 --- a/ZRCola/zrcolachrslct.cpp +++ b/ZRCola/zrcolachrslct.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright 2015-2016 Amebis This file is part of ZRCola. @@ -36,6 +36,8 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) : { Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this); + m_search_more->SetLabel(_(L"▸ Search Options")); + m_unicode->SetValidator(wxHexValidator(&m_char, wxNUM_VAL_DEFAULT, 4)); // Fill categories. @@ -169,6 +171,22 @@ void wxZRColaCharSelect::OnSearchText(wxCommandEvent& event) } +void wxZRColaCharSelect::OnSearchMore(wxHyperlinkEvent& event) +{ + event.StopPropagation(); + + if (m_search_panel->IsShown()) { + m_search_panel->Show(false); + m_search_more->SetLabel(_(L"▸ Search Options")); + } else { + m_search_panel->Show(true); + m_search_more->SetLabel(_(L"▾ Search Options")); + } + + this->Layout(); +} + + void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event) { event.StopPropagation(); @@ -573,6 +591,8 @@ void wxPersistentZRColaCharSelect::Save() const name.Append(cc.id.data, _countof(cc.id.data)); SaveValue(name, wnd->m_categories->IsChecked(i)); } + + SaveValue(wxT("searchPanel"), wnd->m_search_panel->IsShown()); } @@ -593,6 +613,18 @@ bool wxPersistentZRColaCharSelect::Restore() if (RestoreValue(name, &val)) wnd->m_categories->Check(i, val); } + + bool search_panel; + if (RestoreValue(wxT("searchPanel"), &search_panel)) { + if (search_panel) { + wnd->m_search_panel->Show(true); + wnd->m_search_more->SetLabel(_(L"▾ Search Options")); + } else { + wnd->m_search_panel->Show(false); + wnd->m_search_more->SetLabel(_(L"▸ Search Options")); + } + } + wnd->ResetResults(); return wxPersistentDialog::Restore(); diff --git a/ZRCola/zrcolachrslct.h b/ZRCola/zrcolachrslct.h index 8e49b12..ac452ec 100644 --- a/ZRCola/zrcolachrslct.h +++ b/ZRCola/zrcolachrslct.h @@ -55,6 +55,7 @@ public: protected: virtual void OnIdle(wxIdleEvent& event); virtual void OnSearchText(wxCommandEvent& event); + virtual void OnSearchMore(wxHyperlinkEvent& event); virtual void OnCategoriesAll(wxHyperlinkEvent& event); virtual void OnCategoriesNone(wxHyperlinkEvent& event); virtual void OnCategoriesInvert(wxHyperlinkEvent& event); diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp index 8d0cc23..fa80d18 100644 --- a/ZRCola/zrcolagui.cpp +++ b/ZRCola/zrcolagui.cpp @@ -429,32 +429,49 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id, sbSizerBrowse->Add( m_search, 0, wxALL|wxEXPAND, 5 ); + m_search_more = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Search Options"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_search_more->SetToolTip( _("Shows/hides additional search options") ); + + sbSizerBrowse->Add( m_search_more, 0, wxALL|wxEXPAND, 5 ); + + m_search_panel = new wxPanel( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + m_search_panel->Hide(); + + wxBoxSizer* sbSizerSearch; + sbSizerSearch = new wxBoxSizer( wxVERTICAL ); + wxArrayString m_categoriesChoices; - m_categories = new wxCheckListBox( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 ); + m_categories = new wxCheckListBox( m_search_panel, wxID_ANY, wxDefaultPosition, wxSize( -1,60 ), m_categoriesChoices, 0 ); m_categories->SetToolTip( _("List of Unicode character categories to search in") ); - sbSizerBrowse->Add( m_categories, 0, wxALL|wxEXPAND, 5 ); + sbSizerSearch->Add( m_categories, 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 ); + m_categoriesAll = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("All"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesAll->SetToolTip( _("Select all categories") ); bSizerCategoriesCtrl->Add( m_categoriesAll, 0, wxALL, 5 ); - m_categoriesNone = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_categoriesNone = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("None"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesNone->SetToolTip( _("Clear category selection") ); bSizerCategoriesCtrl->Add( m_categoriesNone, 0, wxALL, 5 ); - m_categoriesInvert = new wxHyperlinkCtrl( sbSizerBrowse->GetStaticBox(), wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); + m_categoriesInvert = new wxHyperlinkCtrl( m_search_panel, wxID_ANY, _("Invert"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE ); m_categoriesInvert->SetToolTip( _("Invert category selection") ); bSizerCategoriesCtrl->Add( m_categoriesInvert, 0, wxALL, 5 ); - sbSizerBrowse->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 ); + sbSizerSearch->Add( bSizerCategoriesCtrl, 0, wxALIGN_RIGHT, 5 ); + + + m_search_panel->SetSizer( sbSizerSearch ); + m_search_panel->Layout(); + sbSizerSearch->Fit( m_search_panel ); + sbSizerBrowse->Add( m_search_panel, 0, wxEXPAND, 5 ); m_gridResults = new wxZRColaCharGrid( sbSizerBrowse->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSTATIC_BORDER ); @@ -680,6 +697,7 @@ 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_search_more->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this ); m_categories->Connect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this ); m_categoriesAll->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this ); m_categoriesNone->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this ); @@ -703,6 +721,7 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase() // Disconnect Events this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaCharSelectBase::OnIdle ) ); m_search->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxZRColaCharSelectBase::OnSearchText ), NULL, this ); + m_search_more->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnSearchMore ), NULL, this ); m_categories->Disconnect( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEventHandler( wxZRColaCharSelectBase::OnCategoriesToggle ), NULL, this ); m_categoriesAll->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesAll ), NULL, this ); m_categoriesNone->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnCategoriesNone ), NULL, this ); diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h index 4ba9a8b..5383de6 100644 --- a/ZRCola/zrcolagui.h +++ b/ZRCola/zrcolagui.h @@ -38,8 +38,8 @@ class wxZRColaComposerPanel; #include #include #include -#include #include +#include #include #include #include @@ -195,6 +195,8 @@ class wxZRColaCharSelectBase : public wxDialog protected: wxSearchCtrl* m_search; + wxHyperlinkCtrl* m_search_more; + wxPanel* m_search_panel; wxCheckListBox* m_categories; wxHyperlinkCtrl* m_categoriesAll; wxHyperlinkCtrl* m_categoriesNone; @@ -217,6 +219,7 @@ 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 OnSearchMore( wxHyperlinkEvent& event ) { event.Skip(); } virtual void OnCategoriesToggle( wxCommandEvent& event ) { event.Skip(); } virtual void OnCategoriesAll( wxHyperlinkEvent& event ) { event.Skip(); } virtual void OnCategoriesNone( wxHyperlinkEvent& event ) { event.Skip(); }