diff --git a/ZRCola/ZRCola.fbp b/ZRCola/ZRCola.fbp
index aeb874a..adf88d3 100644
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
@@ -2062,7 +2062,7 @@
0
-
+ Select category to display
wxFILTER_NONE
wxDefaultValidator
@@ -2239,6 +2239,94 @@
+
diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index 1aa6aff..e20e322 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-14 09:58+0200\n"
+"POT-Creation-Date: 2016-06-14 11:32+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,30 +23,26 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
#: 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"
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
#, fuzzy
msgid "Character"
msgstr "Znak"
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
#, fuzzy
msgid "Context"
msgstr "Kontekst"
-#: zrcolachrreq.cpp:64 zrcolagui.h:360
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
#, fuzzy
msgid "Request a New Character"
msgstr "Zahtevaj nov znak"
@@ -343,12 +339,25 @@ msgstr "Sestavljeno besedilo"
msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega"
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+#, fuzzy
+msgid "Show &All"
+msgstr "Prikaži vse"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
#, fuzzy
msgid "&Browse"
msgstr "Pre&brskaj"
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
#, fuzzy
msgid ""
"Full or partial terms from Unicode character description (in English) to "
@@ -356,132 +365,132 @@ msgid ""
msgstr ""
"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:441
#, fuzzy
msgid "Search Options"
msgstr "Možnosti iskanja"
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:442
#, fuzzy
msgid "Shows/hides additional search options"
msgstr "Prikaže/skrije dodatne možnosti iskanja"
-#: zrcolagui.cpp:445
+#: zrcolagui.cpp:454
#, fuzzy
msgid "List of Unicode character categories to search in"
msgstr "Seznam kategorij znaka Unicode za iskanje"
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:461
#, fuzzy
msgid "All"
msgstr "Vse"
-#: zrcolagui.cpp:453
+#: zrcolagui.cpp:462
#, fuzzy
msgid "Select all categories"
msgstr "Izberi vse kategorije"
-#: zrcolagui.cpp:457
+#: zrcolagui.cpp:466
#, fuzzy
msgid "None"
msgstr "Nič"
-#: zrcolagui.cpp:458
+#: zrcolagui.cpp:467
#, fuzzy
msgid "Clear category selection"
msgstr "Počisti izbor kategorij"
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:471
#, fuzzy
msgid "Invert"
msgstr "Obrni"
-#: zrcolagui.cpp:463
+#: zrcolagui.cpp:472
#, fuzzy
msgid "Invert category selection"
msgstr "Obrni izbor kategorij"
-#: zrcolagui.cpp:502
+#: zrcolagui.cpp:511
#, fuzzy
msgid "Character search results"
msgstr "Rezultati iskanja znakov"
-#: zrcolagui.cpp:512
+#: zrcolagui.cpp:521
#, fuzzy
msgid "Re¢ly Used"
msgstr "Nedavno &uporabljeni"
-#: zrcolagui.cpp:540
+#: zrcolagui.cpp:549
#, fuzzy
msgid "List of recently inserted characters"
msgstr "Seznam nedavno vstavljenih znakov"
-#: zrcolagui.cpp:554
+#: zrcolagui.cpp:563
#, fuzzy
msgid "Preview"
msgstr "Predogled:"
-#: zrcolagui.cpp:559
+#: zrcolagui.cpp:568
#, fuzzy
msgid "U+"
msgstr "U+"
-#: zrcolagui.cpp:564
+#: zrcolagui.cpp:573
#, fuzzy
msgid "Unicode hexadecimal code"
msgstr "Šestnajstiška koda Unicode"
-#: zrcolagui.cpp:569
+#: zrcolagui.cpp:578
#, fuzzy
msgid "Keyboard shortcut in Composer window"
msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:613
#, fuzzy
msgid "Character preview"
msgstr "Predogled znaka"
-#: zrcolagui.cpp:609
+#: zrcolagui.cpp:618
#, fuzzy
msgid "Unicode character description"
msgstr "Opis znaka Unicode"
-#: zrcolagui.cpp:614
+#: zrcolagui.cpp:623
#, fuzzy
msgid "Unicode character category"
msgstr "Kategorija znaka Unicode"
-#: zrcolagui.cpp:621
+#: zrcolagui.cpp:630
#, fuzzy
msgid "« Back"
msgstr "< &Nazaj"
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:632
#, fuzzy
msgid "To previously viewed character"
msgstr "Na prejšnji prikazan znak"
-#: zrcolagui.cpp:627
+#: zrcolagui.cpp:636
#, fuzzy
msgid "Forward »"
msgstr "Naprej »"
-#: zrcolagui.cpp:629
+#: zrcolagui.cpp:638
#, fuzzy
msgid "To following viewed character"
msgstr "Na naslednji prikazan znak"
-#: zrcolagui.cpp:640
+#: zrcolagui.cpp:649
#, fuzzy
msgid "Re&lated"
msgstr "&Sorodni"
-#: zrcolagui.cpp:667
+#: zrcolagui.cpp:676
#, fuzzy
msgid "List of related characters"
msgstr "Seznam sorodnih znakov"
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:765
#, fuzzy
msgid ""
"Some character native to specific language you are working with should not "
@@ -492,22 +501,22 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
-#: zrcolagui.cpp:760
+#: zrcolagui.cpp:769
#, fuzzy
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
-#: zrcolagui.cpp:763
+#: zrcolagui.cpp:772
#, fuzzy
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
-#: zrcolagui.cpp:775
+#: zrcolagui.cpp:784
#, fuzzy
msgid "Text Language"
msgstr "Jezik besedila"
-#: zrcolagui.cpp:780
+#: zrcolagui.cpp:789
#, fuzzy
msgid ""
"ZRCola can be launched every time you log in to your computer.\n"
@@ -518,17 +527,17 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
-#: zrcolagui.cpp:784
+#: zrcolagui.cpp:793
#, fuzzy
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
-#: zrcolagui.cpp:791
+#: zrcolagui.cpp:800
#, fuzzy
msgid "Startup"
msgstr "Zagon"
-#: zrcolagui.cpp:870
+#: zrcolagui.cpp:879
#, fuzzy
msgid ""
"Program and Website Editor: Janoš Ježovnik\n"
@@ -539,12 +548,12 @@ msgstr ""
"Razvoj: Amebis, d. o. o., Kamnik\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
-#: zrcolagui.cpp:878
+#: zrcolagui.cpp:887
#, fuzzy
msgid "zrcola.zrc-sazu.si"
msgstr "zrcola.zrc-sazu.si"
-#: zrcolagui.cpp:884
+#: zrcolagui.cpp:893
#, fuzzy
msgid ""
"Texts made using ZRCola have to include in the colophon, foreword, footnote "
@@ -554,7 +563,7 @@ msgstr ""
"opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
"zapisom:"
-#: zrcolagui.cpp:888
+#: zrcolagui.cpp:897
#, fuzzy
msgid ""
"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
@@ -565,42 +574,42 @@ msgstr ""
"sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
"(http://www.zrc-sazu.si) razvil dr. Peter Weiss."
-#: zrcolagui.cpp:929
+#: zrcolagui.cpp:938
#, fuzzy
msgid "Log"
msgstr "Dnevnik"
-#: zrcolagui.cpp:945
+#: zrcolagui.cpp:954
#, fuzzy
msgid "Quit and &Update..."
msgstr "Za&ustavi in posodobi ..."
-#: zrcolagui.cpp:947
+#: zrcolagui.cpp:956
#, fuzzy
msgid "Exit this program and launch product update"
msgstr "Zaustavi ta program in zaženi posodobitev izdelka"
-#: zrcolagui.cpp:951
+#: zrcolagui.cpp:960
#, fuzzy
msgid "&Close"
msgstr "&Zapri"
-#: zrcolagui.cpp:952
+#: zrcolagui.cpp:961
#, fuzzy
msgid "Close this window"
msgstr "Zapri to okno"
-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:1000
#, fuzzy
msgid "Enter the &character you would like to request:"
msgstr "Vpišite &znak, ki ga želite zahtevati:"
-#: zrcolagui.cpp:998
+#: zrcolagui.cpp:1007
#, fuzzy
msgid "Decomposed character to request"
msgstr "Razstavljen znak, ki ga zahtevate"
-#: zrcolagui.cpp:1002
+#: zrcolagui.cpp:1011
#, fuzzy
msgid ""
"Please, use the decomposed form.\n"
@@ -611,19 +620,19 @@ msgstr ""
"Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
"in prilepite iz okna z razstavljenim besedilom."
-#: zrcolagui.cpp:1012
+#: zrcolagui.cpp:1021
#, 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:1018
+#: zrcolagui.cpp:1027
#, fuzzy
msgid "Additional notes for character request"
msgstr "Dodatne opombe za zahtevo znaka"
-#: zrcolagui.cpp:1025
+#: zrcolagui.cpp:1034
#, fuzzy
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
@@ -661,35 +670,29 @@ msgstr ""
"Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
"Ali ste prepričani?"
-#: zrcolaupdater.cpp:94 zrcolagui.h:331
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
#, fuzzy
msgid "Product Update"
msgstr "Posodabljanje izdelka"
-#: zrcolagui.h:243
+#: zrcolagui.h:245
#, fuzzy
msgid "Character Search"
msgstr "Poišči znak"
-#: zrcolagui.h:280
+#: zrcolagui.h:282
#, fuzzy
msgid "Settings"
msgstr "Nastavitve"
-#: zrcolagui.h:306
+#: zrcolagui.h:308
#, fuzzy
msgid "About ZRCola"
msgstr "O ZRColi"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
#: MSIBuild/En.Win32.Release.Control-2.idtx:14
#: MSIBuild/En.Win32.Release.Control-2.idtx:19
#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Debug.Control-2.idtx:14
-#: MSIBuild/En.x64.Debug.Control-2.idtx:19
-#: MSIBuild/En.x64.Debug.Control-2.idtx:9
#: MSIBuild/En.x64.Release.Control-2.idtx:14
#: MSIBuild/En.x64.Release.Control-2.idtx:19
#: MSIBuild/En.x64.Release.Control-2.idtx:9
@@ -697,39 +700,27 @@ msgstr "O ZRColi"
msgid "&Continue"
msgstr "&Nadaljuj"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Debug.Control-2.idtx:11
#: MSIBuild/En.x64.Release.Control-2.idtx:11
#, fuzzy
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Debug.Control-2.idtx:16
#: MSIBuild/En.x64.Release.Control-2.idtx:16
#, fuzzy
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Debug.Control-2.idtx:5
#: MSIBuild/En.x64.Release.Control-2.idtx:5
#, fuzzy
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.Win32.Release.Control-2.idtx:3
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Debug.Control-2.idtx:3
-#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
-#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.x64.Release.Control-2.idtx:3
#: MSIBuild/En.x64.Release.Feature-2.idtx:3
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
@@ -737,39 +728,27 @@ msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
msgid "1252"
msgstr "1250"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
#: MSIBuild/En.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Debug.Control-2.idtx:6
#: MSIBuild/En.x64.Release.Control-2.idtx:6
#, fuzzy
msgid "bintutorial1.bmp"
msgstr "bintutorial1.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Debug.Control-2.idtx:12
#: MSIBuild/En.x64.Release.Control-2.idtx:12
#, fuzzy
msgid "bintutorial2.bmp"
msgstr "bintutorial2.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Debug.Control-2.idtx:17
#: MSIBuild/En.x64.Release.Control-2.idtx:17
#, fuzzy
msgid "bintutorial3.bmp"
msgstr "bintutorial3.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
#: MSIBuild/En.Win32.Release.Control-2.idtx:10
#: MSIBuild/En.Win32.Release.Control-2.idtx:15
#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Debug.Control-2.idtx:10
-#: MSIBuild/En.x64.Debug.Control-2.idtx:15
-#: MSIBuild/En.x64.Debug.Control-2.idtx:4
#: MSIBuild/En.x64.Release.Control-2.idtx:10
#: MSIBuild/En.x64.Release.Control-2.idtx:15
#: MSIBuild/En.x64.Release.Control-2.idtx:4
@@ -777,9 +756,7 @@ msgstr "bintutorial3.bmp"
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
#: MSIBuild/En.Win32.Release.Control-2.idtx:18
-#: MSIBuild/En.x64.Debug.Control-2.idtx:18
#: MSIBuild/En.x64.Release.Control-2.idtx:18
#, fuzzy
msgid ""
@@ -789,9 +766,7 @@ msgstr ""
"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
#: MSIBuild/En.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Debug.Control-2.idtx:8
#: MSIBuild/En.x64.Release.Control-2.idtx:8
#, fuzzy
msgid ""
@@ -804,21 +779,15 @@ msgstr ""
"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
"vedel, kam vstaviti želene znake!"
-#: 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
msgid "Input system for linguistic use"
msgstr "Vnašalni sistem za jezikoslovno rabo"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
#: MSIBuild/En.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Debug.Control-2.idtx:13
#: MSIBuild/En.x64.Release.Control-2.idtx:13
#, fuzzy
msgid ""
@@ -830,9 +799,7 @@ msgstr ""
"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
"vnesemo s pritiskom na tipko F5."
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
#: MSIBuild/En.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.x64.Debug.Control-2.idtx:7
#: MSIBuild/En.x64.Release.Control-2.idtx:7
#, fuzzy
msgid ""
diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po
index 72a64ab..fb798dd 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-14 09:58+0200\n"
-"PO-Revision-Date: 2016-06-14 09:58+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-06-14 11:34+0200\n"
"Last-Translator: Simon Rozman \n"
"Language-Team: Amebis, d. o. o., Kamnik \n"
"Language: de_DE\n"
@@ -20,30 +20,26 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
#: 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:."
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
#, fuzzy
msgid "Character"
msgstr "Eingabe eines Zeichenstils"
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
#, fuzzy
msgid "Context"
msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
-#: zrcolachrreq.cpp:64 zrcolagui.h:360
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
msgid "Request a New Character"
msgstr ""
@@ -299,235 +295,248 @@ msgstr ""
msgid "Composed Unicode Dump"
msgstr ""
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+#, fuzzy
+msgid "Show &All"
+msgstr "Alles zeigen"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
#, fuzzy
msgid "&Browse"
msgstr "Durchsuchen"
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:441
msgid "Search Options"
msgstr ""
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:442
msgid "Shows/hides additional search options"
msgstr ""
-#: zrcolagui.cpp:445
+#: zrcolagui.cpp:454
msgid "List of Unicode character categories to search in"
msgstr ""
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:461
#, fuzzy
msgid "All"
msgstr "Alle"
-#: zrcolagui.cpp:453
+#: zrcolagui.cpp:462
msgid "Select all categories"
msgstr ""
-#: zrcolagui.cpp:457
+#: zrcolagui.cpp:466
#, fuzzy
msgid "None"
msgstr "Kein"
-#: zrcolagui.cpp:458
+#: zrcolagui.cpp:467
#, fuzzy
msgid "Clear category selection"
msgstr "Auswahl kopieren"
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:471
msgid "Invert"
msgstr ""
-#: zrcolagui.cpp:463
+#: zrcolagui.cpp:472
#, fuzzy
msgid "Invert category selection"
msgstr "Auswahl einfügen"
-#: zrcolagui.cpp:502
+#: zrcolagui.cpp:511
#, fuzzy
msgid "Character search results"
msgstr "Skupine &znakov"
-#: zrcolagui.cpp:512
+#: zrcolagui.cpp:521
msgid "Re¢ly Used"
msgstr ""
-#: zrcolagui.cpp:540
+#: zrcolagui.cpp:549
msgid "List of recently inserted characters"
msgstr ""
-#: zrcolagui.cpp:554
+#: zrcolagui.cpp:563
#, fuzzy
msgid "Preview"
msgstr " Vorschau"
-#: zrcolagui.cpp:559
+#: zrcolagui.cpp:568
#, fuzzy
msgid "U+"
msgstr "Hilfeverzeichnis %u nicht gefunden."
-#: zrcolagui.cpp:564
+#: zrcolagui.cpp:573
msgid "Unicode hexadecimal code"
msgstr ""
-#: zrcolagui.cpp:569
+#: zrcolagui.cpp:578
msgid "Keyboard shortcut in Composer window"
msgstr ""
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:613
#, fuzzy
msgid "Character preview"
msgstr "Skupine &znakov"
-#: zrcolagui.cpp:609
+#: zrcolagui.cpp:618
msgid "Unicode character description"
msgstr ""
-#: zrcolagui.cpp:614
+#: zrcolagui.cpp:623
msgid "Unicode character category"
msgstr ""
-#: zrcolagui.cpp:621
+#: zrcolagui.cpp:630
#, fuzzy
msgid "« Back"
msgstr "< &Zurück"
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:632
msgid "To previously viewed character"
msgstr ""
-#: zrcolagui.cpp:627
+#: zrcolagui.cpp:636
#, fuzzy
msgid "Forward »"
msgstr "&Vorwärts"
-#: zrcolagui.cpp:629
+#: zrcolagui.cpp:638
msgid "To following viewed character"
msgstr ""
-#: zrcolagui.cpp:640
+#: zrcolagui.cpp:649
msgid "Re&lated"
msgstr ""
-#: zrcolagui.cpp:667
+#: zrcolagui.cpp:676
msgid "List of related characters"
msgstr ""
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:765
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:760
+#: zrcolagui.cpp:769
msgid "Select language &automatically according to selected keyboard"
msgstr ""
-#: zrcolagui.cpp:763
+#: zrcolagui.cpp:772
msgid "&Manually select the language from the list below:"
msgstr ""
-#: zrcolagui.cpp:775
+#: zrcolagui.cpp:784
msgid "Text Language"
msgstr ""
-#: zrcolagui.cpp:780
+#: zrcolagui.cpp:789
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:784
+#: zrcolagui.cpp:793
msgid "Start ZRCola &automatically on logon"
msgstr ""
-#: zrcolagui.cpp:791
+#: zrcolagui.cpp:800
msgid "Startup"
msgstr ""
-#: zrcolagui.cpp:870
+#: zrcolagui.cpp:879
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:878
+#: zrcolagui.cpp:887
msgid "zrcola.zrc-sazu.si"
msgstr ""
-#: zrcolagui.cpp:884
+#: zrcolagui.cpp:893
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:888
+#: zrcolagui.cpp:897
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:929
+#: zrcolagui.cpp:938
#, fuzzy
msgid "Log"
msgstr "&Log"
-#: zrcolagui.cpp:945
+#: zrcolagui.cpp:954
#, fuzzy
msgid "Quit and &Update..."
msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
-#: zrcolagui.cpp:947
+#: zrcolagui.cpp:956
msgid "Exit this program and launch product update"
msgstr ""
-#: zrcolagui.cpp:951
+#: zrcolagui.cpp:960
#, fuzzy
msgid "&Close"
msgstr "&Schließen"
-#: zrcolagui.cpp:952
+#: zrcolagui.cpp:961
#, fuzzy
msgid "Close this window"
msgstr "Fenster schließen"
-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:1000
msgid "Enter the &character you would like to request:"
msgstr ""
-#: zrcolagui.cpp:998
+#: zrcolagui.cpp:1007
msgid "Decomposed character to request"
msgstr ""
-#: zrcolagui.cpp:1002
+#: zrcolagui.cpp:1011
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:1012
+#: zrcolagui.cpp:1021
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr ""
-#: zrcolagui.cpp:1018
+#: zrcolagui.cpp:1027
msgid "Additional notes for character request"
msgstr ""
-#: zrcolagui.cpp:1025
+#: zrcolagui.cpp:1034
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
@@ -552,32 +561,26 @@ msgid ""
"Are you sure?"
msgstr ""
-#: zrcolaupdater.cpp:94 zrcolagui.h:331
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
msgid "Product Update"
msgstr ""
-#: zrcolagui.h:243
+#: zrcolagui.h:245
#, fuzzy
msgid "Character Search"
msgstr "Skupine &znakov"
-#: zrcolagui.h:280
+#: zrcolagui.h:282
msgid "Settings"
msgstr ""
-#: zrcolagui.h:306
+#: zrcolagui.h:308
msgid "About ZRCola"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
#: MSIBuild/En.Win32.Release.Control-2.idtx:14
#: MSIBuild/En.Win32.Release.Control-2.idtx:19
#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Debug.Control-2.idtx:14
-#: MSIBuild/En.x64.Debug.Control-2.idtx:19
-#: MSIBuild/En.x64.Debug.Control-2.idtx:9
#: MSIBuild/En.x64.Release.Control-2.idtx:14
#: MSIBuild/En.x64.Release.Control-2.idtx:19
#: MSIBuild/En.x64.Release.Control-2.idtx:9
@@ -585,37 +588,25 @@ msgstr ""
msgid "&Continue"
msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Debug.Control-2.idtx:11
#: MSIBuild/En.x64.Release.Control-2.idtx:11
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Debug.Control-2.idtx:16
#: MSIBuild/En.x64.Release.Control-2.idtx:16
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Debug.Control-2.idtx:5
#: MSIBuild/En.x64.Release.Control-2.idtx:5
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
msgstr ""
# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.Win32.Release.Control-2.idtx:3
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Debug.Control-2.idtx:3
-#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
-#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.x64.Release.Control-2.idtx:3
#: MSIBuild/En.x64.Release.Feature-2.idtx:3
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
@@ -623,36 +614,24 @@ msgstr ""
msgid "1252"
msgstr "1252"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
#: MSIBuild/En.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Debug.Control-2.idtx:6
#: MSIBuild/En.x64.Release.Control-2.idtx:6
msgid "bintutorial1.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Debug.Control-2.idtx:12
#: MSIBuild/En.x64.Release.Control-2.idtx:12
msgid "bintutorial2.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Debug.Control-2.idtx:17
#: MSIBuild/En.x64.Release.Control-2.idtx:17
msgid "bintutorial3.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
#: MSIBuild/En.Win32.Release.Control-2.idtx:10
#: MSIBuild/En.Win32.Release.Control-2.idtx:15
#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Debug.Control-2.idtx:10
-#: MSIBuild/En.x64.Debug.Control-2.idtx:15
-#: MSIBuild/En.x64.Debug.Control-2.idtx:4
#: MSIBuild/En.x64.Release.Control-2.idtx:10
#: MSIBuild/En.x64.Release.Control-2.idtx:15
#: MSIBuild/En.x64.Release.Control-2.idtx:4
@@ -660,18 +639,14 @@ msgstr ""
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
#: MSIBuild/En.Win32.Release.Control-2.idtx:18
-#: MSIBuild/En.x64.Debug.Control-2.idtx:18
#: MSIBuild/En.x64.Release.Control-2.idtx:18
msgid ""
"Characters can be entered using keyboard shortcuts, the character catalogue "
"(F4) or the character finding tool (F8)."
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
#: MSIBuild/En.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Debug.Control-2.idtx:8
#: MSIBuild/En.x64.Release.Control-2.idtx:8
msgid ""
"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
@@ -680,20 +655,14 @@ msgid ""
"where to insert the special characters!"
msgstr ""
-#: 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"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
#: MSIBuild/En.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Debug.Control-2.idtx:13
#: MSIBuild/En.x64.Release.Control-2.idtx:13
msgid ""
"The string of basic and substitute characters is entered into the upper "
@@ -701,9 +670,7 @@ msgid ""
"characters are displayed. To insert them in the text, the F5 key is used."
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
#: MSIBuild/En.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.x64.Debug.Control-2.idtx:7
#: MSIBuild/En.x64.Release.Control-2.idtx:7
msgid ""
"When configured, ZRCola starts at system startup and runs in the background. "
diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po
index 02f97ad..360a6d7 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-14 09:58+0200\n"
-"PO-Revision-Date: 2016-06-14 09:58+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-06-14 11:33+0200\n"
"Last-Translator: Simon Rozman \n"
"Language-Team: Amebis, d. o. o., Kamnik \n"
"Language: ru_RU\n"
@@ -21,29 +21,25 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr ""
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
#: 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:."
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
#, fuzzy
msgid "Character"
msgstr "Skupine &znakov"
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
msgid "Context"
msgstr ""
-#: zrcolachrreq.cpp:64 zrcolagui.h:360
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
msgid "Request a New Character"
msgstr ""
@@ -287,223 +283,235 @@ msgstr ""
msgid "Composed Unicode Dump"
msgstr ""
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+msgid "Show &All"
+msgstr ""
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
msgid "&Browse"
msgstr ""
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:441
msgid "Search Options"
msgstr ""
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:442
msgid "Shows/hides additional search options"
msgstr ""
-#: zrcolagui.cpp:445
+#: zrcolagui.cpp:454
msgid "List of Unicode character categories to search in"
msgstr ""
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:461
#, fuzzy
msgid "All"
msgstr "Alt"
-#: zrcolagui.cpp:453
+#: zrcolagui.cpp:462
msgid "Select all categories"
msgstr ""
-#: zrcolagui.cpp:457
+#: zrcolagui.cpp:466
msgid "None"
msgstr ""
-#: zrcolagui.cpp:458
+#: zrcolagui.cpp:467
msgid "Clear category selection"
msgstr ""
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:471
msgid "Invert"
msgstr ""
-#: zrcolagui.cpp:463
+#: zrcolagui.cpp:472
msgid "Invert category selection"
msgstr ""
-#: zrcolagui.cpp:502
+#: zrcolagui.cpp:511
#, fuzzy
msgid "Character search results"
msgstr "Skupine &znakov"
-#: zrcolagui.cpp:512
+#: zrcolagui.cpp:521
msgid "Re¢ly Used"
msgstr ""
-#: zrcolagui.cpp:540
+#: zrcolagui.cpp:549
msgid "List of recently inserted characters"
msgstr ""
-#: zrcolagui.cpp:554
+#: zrcolagui.cpp:563
msgid "Preview"
msgstr ""
-#: zrcolagui.cpp:559
+#: zrcolagui.cpp:568
msgid "U+"
msgstr ""
-#: zrcolagui.cpp:564
+#: zrcolagui.cpp:573
msgid "Unicode hexadecimal code"
msgstr ""
-#: zrcolagui.cpp:569
+#: zrcolagui.cpp:578
msgid "Keyboard shortcut in Composer window"
msgstr ""
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:613
#, fuzzy
msgid "Character preview"
msgstr "Skupine &znakov"
-#: zrcolagui.cpp:609
+#: zrcolagui.cpp:618
msgid "Unicode character description"
msgstr ""
-#: zrcolagui.cpp:614
+#: zrcolagui.cpp:623
msgid "Unicode character category"
msgstr ""
-#: zrcolagui.cpp:621
+#: zrcolagui.cpp:630
msgid "« Back"
msgstr ""
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:632
msgid "To previously viewed character"
msgstr ""
-#: zrcolagui.cpp:627
+#: zrcolagui.cpp:636
msgid "Forward »"
msgstr ""
-#: zrcolagui.cpp:629
+#: zrcolagui.cpp:638
msgid "To following viewed character"
msgstr ""
-#: zrcolagui.cpp:640
+#: zrcolagui.cpp:649
msgid "Re&lated"
msgstr ""
-#: zrcolagui.cpp:667
+#: zrcolagui.cpp:676
msgid "List of related characters"
msgstr ""
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:765
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:760
+#: zrcolagui.cpp:769
msgid "Select language &automatically according to selected keyboard"
msgstr ""
-#: zrcolagui.cpp:763
+#: zrcolagui.cpp:772
msgid "&Manually select the language from the list below:"
msgstr ""
-#: zrcolagui.cpp:775
+#: zrcolagui.cpp:784
msgid "Text Language"
msgstr ""
-#: zrcolagui.cpp:780
+#: zrcolagui.cpp:789
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:784
+#: zrcolagui.cpp:793
msgid "Start ZRCola &automatically on logon"
msgstr ""
-#: zrcolagui.cpp:791
+#: zrcolagui.cpp:800
msgid "Startup"
msgstr ""
-#: zrcolagui.cpp:870
+#: zrcolagui.cpp:879
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:878
+#: zrcolagui.cpp:887
msgid "zrcola.zrc-sazu.si"
msgstr ""
-#: zrcolagui.cpp:884
+#: zrcolagui.cpp:893
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:888
+#: zrcolagui.cpp:897
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:929
+#: zrcolagui.cpp:938
msgid "Log"
msgstr ""
-#: zrcolagui.cpp:945
+#: zrcolagui.cpp:954
msgid "Quit and &Update..."
msgstr ""
-#: zrcolagui.cpp:947
+#: zrcolagui.cpp:956
msgid "Exit this program and launch product update"
msgstr ""
-#: zrcolagui.cpp:951
+#: zrcolagui.cpp:960
msgid "&Close"
msgstr ""
-#: zrcolagui.cpp:952
+#: zrcolagui.cpp:961
msgid "Close this window"
msgstr ""
-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:1000
msgid "Enter the &character you would like to request:"
msgstr ""
-#: zrcolagui.cpp:998
+#: zrcolagui.cpp:1007
msgid "Decomposed character to request"
msgstr ""
-#: zrcolagui.cpp:1002
+#: zrcolagui.cpp:1011
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:1012
+#: zrcolagui.cpp:1021
msgid ""
"The &context, examples or short description why and where the character is "
"required:"
msgstr ""
-#: zrcolagui.cpp:1018
+#: zrcolagui.cpp:1027
msgid "Additional notes for character request"
msgstr ""
-#: zrcolagui.cpp:1025
+#: zrcolagui.cpp:1034
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
@@ -528,69 +536,51 @@ msgid ""
"Are you sure?"
msgstr ""
-#: zrcolaupdater.cpp:94 zrcolagui.h:331
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
msgid "Product Update"
msgstr ""
-#: zrcolagui.h:243
+#: zrcolagui.h:245
#, fuzzy
msgid "Character Search"
msgstr "Skupine &znakov"
-#: zrcolagui.h:280
+#: zrcolagui.h:282
msgid "Settings"
msgstr ""
-#: zrcolagui.h:306
+#: zrcolagui.h:308
msgid "About ZRCola"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
#: MSIBuild/En.Win32.Release.Control-2.idtx:14
#: MSIBuild/En.Win32.Release.Control-2.idtx:19
#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Debug.Control-2.idtx:14
-#: MSIBuild/En.x64.Debug.Control-2.idtx:19
-#: MSIBuild/En.x64.Debug.Control-2.idtx:9
#: MSIBuild/En.x64.Release.Control-2.idtx:14
#: MSIBuild/En.x64.Release.Control-2.idtx:19
#: MSIBuild/En.x64.Release.Control-2.idtx:9
msgid "&Continue"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Debug.Control-2.idtx:11
#: MSIBuild/En.x64.Release.Control-2.idtx:11
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Debug.Control-2.idtx:16
#: MSIBuild/En.x64.Release.Control-2.idtx:16
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Debug.Control-2.idtx:5
#: MSIBuild/En.x64.Release.Control-2.idtx:5
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
msgstr ""
# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.Win32.Release.Control-2.idtx:3
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Debug.Control-2.idtx:3
-#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
-#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.x64.Release.Control-2.idtx:3
#: MSIBuild/En.x64.Release.Feature-2.idtx:3
#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
@@ -598,36 +588,24 @@ msgstr ""
msgid "1252"
msgstr "1251"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:6
#: MSIBuild/En.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Debug.Control-2.idtx:6
#: MSIBuild/En.x64.Release.Control-2.idtx:6
msgid "bintutorial1.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Debug.Control-2.idtx:12
#: MSIBuild/En.x64.Release.Control-2.idtx:12
msgid "bintutorial2.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Debug.Control-2.idtx:17
#: MSIBuild/En.x64.Release.Control-2.idtx:17
msgid "bintutorial3.bmp"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
#: MSIBuild/En.Win32.Release.Control-2.idtx:10
#: MSIBuild/En.Win32.Release.Control-2.idtx:15
#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Debug.Control-2.idtx:10
-#: MSIBuild/En.x64.Debug.Control-2.idtx:15
-#: MSIBuild/En.x64.Debug.Control-2.idtx:4
#: MSIBuild/En.x64.Release.Control-2.idtx:10
#: MSIBuild/En.x64.Release.Control-2.idtx:15
#: MSIBuild/En.x64.Release.Control-2.idtx:4
@@ -635,18 +613,14 @@ msgstr ""
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
#: MSIBuild/En.Win32.Release.Control-2.idtx:18
-#: MSIBuild/En.x64.Debug.Control-2.idtx:18
#: MSIBuild/En.x64.Release.Control-2.idtx:18
msgid ""
"Characters can be entered using keyboard shortcuts, the character catalogue "
"(F4) or the character finding tool (F8)."
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
#: MSIBuild/En.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Debug.Control-2.idtx:8
#: MSIBuild/En.x64.Release.Control-2.idtx:8
msgid ""
"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
@@ -655,20 +629,14 @@ msgid ""
"where to insert the special characters!"
msgstr ""
-#: 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"
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
#: MSIBuild/En.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Debug.Control-2.idtx:13
#: MSIBuild/En.x64.Release.Control-2.idtx:13
msgid ""
"The string of basic and substitute characters is entered into the upper "
@@ -676,9 +644,7 @@ msgid ""
"characters are displayed. To insert them in the text, the F5 key is used."
msgstr ""
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
#: MSIBuild/En.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.x64.Debug.Control-2.idtx:7
#: MSIBuild/En.x64.Release.Control-2.idtx:7
msgid ""
"When configured, ZRCola starts at system startup and runs in the background. "
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 3b21b27..9566e31 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-14 09:58+0200\n"
-"PO-Revision-Date: 2016-06-14 09:58+0200\n"
+"POT-Creation-Date: 2016-06-14 11:33+0200\n"
+"PO-Revision-Date: 2016-06-14 11:33+0200\n"
"Last-Translator: Simon Rozman \n"
"Language-Team: Amebis, d. o. o., Kamnik \n"
"Language: sl_SI\n"
@@ -21,27 +21,23 @@ msgstr ""
msgid "© 2004-%s ZRC SAZU"
msgstr "© 2004-%s ZRC SAZU"
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:860 zrcolagui.h:104
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 zrcolagui.h:104
#: 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"
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:989
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:998
msgid "Character"
msgstr "Znak"
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1010
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
msgid "Context"
msgstr "Kontekst"
-#: zrcolachrreq.cpp:64 zrcolagui.h:360
+#: zrcolachrreq.cpp:64 zrcolagui.h:362
msgid "Request a New Character"
msgstr "Zahtevaj nov znak"
@@ -281,118 +277,130 @@ msgstr "Sestavljeno besedilo"
msgid "Composed Unicode Dump"
msgstr "Unicode sestavljenega"
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr "Izberi kategorijo za prikaz"
+
+#: zrcolagui.cpp:389
+msgid "Show &All"
+msgstr "Prik&aži vse"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr "Prikaži/skrij manj pogoste znake"
+
+#: zrcolagui.cpp:430
msgid "&Browse"
msgstr "Pre&brskaj"
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
msgid ""
"Full or partial terms from Unicode character description (in English) to "
"search for"
msgstr ""
"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
-#: zrcolagui.cpp:432
+#: zrcolagui.cpp:441
msgid "Search Options"
msgstr "Možnosti iskanja"
-#: zrcolagui.cpp:433
+#: zrcolagui.cpp:442
msgid "Shows/hides additional search options"
msgstr "Prikaže/skrije dodatne možnosti iskanja"
-#: zrcolagui.cpp:445
+#: zrcolagui.cpp:454
msgid "List of Unicode character categories to search in"
msgstr "Seznam kategorij znaka Unicode za iskanje"
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:461
msgid "All"
msgstr "Vse"
-#: zrcolagui.cpp:453
+#: zrcolagui.cpp:462
msgid "Select all categories"
msgstr "Izberi vse kategorije"
-#: zrcolagui.cpp:457
+#: zrcolagui.cpp:466
msgid "None"
msgstr "Nič"
-#: zrcolagui.cpp:458
+#: zrcolagui.cpp:467
msgid "Clear category selection"
msgstr "Počisti izbor kategorij"
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:471
msgid "Invert"
msgstr "Obrni"
-#: zrcolagui.cpp:463
+#: zrcolagui.cpp:472
msgid "Invert category selection"
msgstr "Obrni izbor kategorij"
-#: zrcolagui.cpp:502
+#: zrcolagui.cpp:511
msgid "Character search results"
msgstr "Rezultati iskanja znakov"
-#: zrcolagui.cpp:512
+#: zrcolagui.cpp:521
msgid "Re¢ly Used"
msgstr "Nedavno &uporabljeni"
-#: zrcolagui.cpp:540
+#: zrcolagui.cpp:549
msgid "List of recently inserted characters"
msgstr "Seznam nedavno vstavljenih znakov"
-#: zrcolagui.cpp:554
+#: zrcolagui.cpp:563
msgid "Preview"
msgstr "Predogled"
-#: zrcolagui.cpp:559
+#: zrcolagui.cpp:568
msgid "U+"
msgstr "U+"
-#: zrcolagui.cpp:564
+#: zrcolagui.cpp:573
msgid "Unicode hexadecimal code"
msgstr "Šestnajstiška koda Unicode"
-#: zrcolagui.cpp:569
+#: zrcolagui.cpp:578
msgid "Keyboard shortcut in Composer window"
msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:613
msgid "Character preview"
msgstr "Predogled znaka"
-#: zrcolagui.cpp:609
+#: zrcolagui.cpp:618
msgid "Unicode character description"
msgstr "Opis znaka Unicode"
-#: zrcolagui.cpp:614
+#: zrcolagui.cpp:623
msgid "Unicode character category"
msgstr "Kategorija znaka Unicode"
-#: zrcolagui.cpp:621
+#: zrcolagui.cpp:630
msgid "« Back"
msgstr "« Nazaj"
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:632
msgid "To previously viewed character"
msgstr "Na prejšnji prikazan znak"
-#: zrcolagui.cpp:627
+#: zrcolagui.cpp:636
msgid "Forward »"
msgstr "Naprej »"
-#: zrcolagui.cpp:629
+#: zrcolagui.cpp:638
msgid "To following viewed character"
msgstr "Na naslednji prikazan znak"
-#: zrcolagui.cpp:640
+#: zrcolagui.cpp:649
msgid "Re&lated"
msgstr "&Sorodni"
-#: zrcolagui.cpp:667
+#: zrcolagui.cpp:676
msgid "List of related characters"
msgstr "Seznam sorodnih znakov"
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:765
msgid ""
"Some character native to specific language you are working with should not "
"decompose to primitives.\n"
@@ -402,19 +410,19 @@ msgstr ""
"razstaviti v dele.\n"
"Za optimalno razstavljanje izberite pravilni jezik."
-#: zrcolagui.cpp:760
+#: zrcolagui.cpp:769
msgid "Select language &automatically according to selected keyboard"
msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
-#: zrcolagui.cpp:763
+#: zrcolagui.cpp:772
msgid "&Manually select the language from the list below:"
msgstr "Ročno izberi jezik na spodnje&m spisku:"
-#: zrcolagui.cpp:775
+#: zrcolagui.cpp:784
msgid "Text Language"
msgstr "Jezik besedila"
-#: zrcolagui.cpp:780
+#: zrcolagui.cpp:789
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 "
@@ -424,15 +432,15 @@ msgstr ""
"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
"bližnjic Win+F5 in Win+F6."
-#: zrcolagui.cpp:784
+#: zrcolagui.cpp:793
msgid "Start ZRCola &automatically on logon"
msgstr "S&amodejno zaženi ZRColo ob prijavi"
-#: zrcolagui.cpp:791
+#: zrcolagui.cpp:800
msgid "Startup"
msgstr "Zagon"
-#: zrcolagui.cpp:870
+#: zrcolagui.cpp:879
msgid ""
"Program and Website Editor: Janoš Ježovnik\n"
"Development: Amebis, d. o. o., Kamnik\n"
@@ -442,11 +450,11 @@ msgstr ""
"Razvoj: Amebis, d. o. o., Kamnik\n"
"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
-#: zrcolagui.cpp:878
+#: zrcolagui.cpp:887
msgid "zrcola.zrc-sazu.si"
msgstr "zrcola.zrc-sazu.si"
-#: zrcolagui.cpp:884
+#: zrcolagui.cpp:893
msgid ""
"Texts made using ZRCola have to include in the colophon, foreword, footnote "
"or some other appropriate part of the publication the note below:"
@@ -455,7 +463,7 @@ msgstr ""
"opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
"zapisom:"
-#: zrcolagui.cpp:888
+#: zrcolagui.cpp:897
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 "
@@ -465,36 +473,36 @@ msgstr ""
"sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
"(http://www.zrc-sazu.si) razvil dr. Peter Weiss."
-#: zrcolagui.cpp:929
+#: zrcolagui.cpp:938
msgid "Log"
msgstr "Dnevnik"
-#: zrcolagui.cpp:945
+#: zrcolagui.cpp:954
msgid "Quit and &Update..."
msgstr "Za&ustavi in posodobi ..."
-#: zrcolagui.cpp:947
+#: zrcolagui.cpp:956
msgid "Exit this program and launch product update"
msgstr "Zaustavi ta program in zaženi posodobitev izdelka"
-#: zrcolagui.cpp:951
+#: zrcolagui.cpp:960
msgid "&Close"
msgstr "&Zapri"
-#: zrcolagui.cpp:952
+#: zrcolagui.cpp:961
msgid "Close this window"
msgstr "Zapri to okno"
-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:1000
msgid "Enter the &character you would like to request:"
msgstr "Vpišite &znak, ki ga želite zahtevati:"
-#: zrcolagui.cpp:998
+#: zrcolagui.cpp:1007
msgid "Decomposed character to request"
msgstr "Razstavljen znak, ki ga zahtevate"
# Please use a double && for final "&" character
-#: zrcolagui.cpp:1002
+#: zrcolagui.cpp:1011
msgid ""
"Please, use the decomposed form.\n"
"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
@@ -504,17 +512,17 @@ msgstr ""
"Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali kopirate "
"in prilepite iz okna z razstavljenim besedilom."
-#: zrcolagui.cpp:1012
+#: zrcolagui.cpp:1021
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:1018
+#: zrcolagui.cpp:1027
msgid "Additional notes for character request"
msgstr "Dodatne opombe za zahtevo znaka"
-#: zrcolagui.cpp:1025
+#: zrcolagui.cpp:1034
msgid ""
"After clicking OK button, your e-mail application should open allowing you "
"to submit the new character request to ZRCola Editor.\n"
@@ -548,113 +556,81 @@ msgstr ""
"Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
"Ali ste prepričani?"
-#: zrcolaupdater.cpp:94 zrcolagui.h:331
+#: zrcolaupdater.cpp:94 zrcolagui.h:333
msgid "Product Update"
msgstr "Posodabljanje izdelka"
-#: zrcolagui.h:243
+#: zrcolagui.h:245
msgid "Character Search"
msgstr "Poišči znak"
-#: zrcolagui.h:280
+#: zrcolagui.h:282
msgid "Settings"
msgstr "Nastavitve"
-#: zrcolagui.h:306
+#: zrcolagui.h:308
msgid "About ZRCola"
msgstr "O ZRColi"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:19
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:9
#: MSIBuild/En.Win32.Release.Control-2.idtx:14
#: MSIBuild/En.Win32.Release.Control-2.idtx:19
#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Debug.Control-2.idtx:14
-#: MSIBuild/En.x64.Debug.Control-2.idtx:19
-#: MSIBuild/En.x64.Debug.Control-2.idtx:9
#: MSIBuild/En.x64.Release.Control-2.idtx:14
#: MSIBuild/En.x64.Release.Control-2.idtx:19
#: MSIBuild/En.x64.Release.Control-2.idtx:9
msgid "&Continue"
msgstr "&Nadaljuj"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:11
#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Debug.Control-2.idtx:11
#: MSIBuild/En.x64.Release.Control-2.idtx:11
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:16
#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Debug.Control-2.idtx:16
#: MSIBuild/En.x64.Release.Control-2.idtx:16
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:5
#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Debug.Control-2.idtx:5
#: MSIBuild/En.x64.Release.Control-2.idtx:5
msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.Win32.Release.Control-2.idtx:3
#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Debug.Control-2.idtx:3
-#: MSIBuild/En.x64.Debug.Feature-2.idtx:3
-#: MSIBuild/En.x64.Debug.Shortcut-2.idtx:3
#: MSIBuild/En.x64.Release.Control-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.Control-2.idtx:6
#: MSIBuild/En.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Debug.Control-2.idtx:6
#: MSIBuild/En.x64.Release.Control-2.idtx:6
msgid "bintutorial1.bmp"
msgstr "bintutorial1.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:12
#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Debug.Control-2.idtx:12
#: MSIBuild/En.x64.Release.Control-2.idtx:12
msgid "bintutorial2.bmp"
msgstr "bintutorial2.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:17
#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Debug.Control-2.idtx:17
#: MSIBuild/En.x64.Release.Control-2.idtx:17
msgid "bintutorial3.bmp"
msgstr "bintutorial3.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:15
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:4
#: MSIBuild/En.Win32.Release.Control-2.idtx:10
#: MSIBuild/En.Win32.Release.Control-2.idtx:15
#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Debug.Control-2.idtx:10
-#: MSIBuild/En.x64.Debug.Control-2.idtx:15
-#: MSIBuild/En.x64.Debug.Control-2.idtx:4
#: MSIBuild/En.x64.Release.Control-2.idtx:10
#: MSIBuild/En.x64.Release.Control-2.idtx:15
#: MSIBuild/En.x64.Release.Control-2.idtx:4
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:18
#: MSIBuild/En.Win32.Release.Control-2.idtx:18
-#: MSIBuild/En.x64.Debug.Control-2.idtx:18
#: MSIBuild/En.x64.Release.Control-2.idtx:18
msgid ""
"Characters can be entered using keyboard shortcuts, the character catalogue "
@@ -663,9 +639,7 @@ msgstr ""
"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:8
#: MSIBuild/En.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Debug.Control-2.idtx:8
#: MSIBuild/En.x64.Release.Control-2.idtx:8
msgid ""
"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
@@ -677,20 +651,14 @@ msgstr ""
"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
"vedel, kam vstaviti želene znake!"
-#: 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"
msgstr "Vnašalni sistem za jezikoslovno rabo"
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:13
#: MSIBuild/En.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Debug.Control-2.idtx:13
#: MSIBuild/En.x64.Release.Control-2.idtx:13
msgid ""
"The string of basic and substitute characters is entered into the upper "
@@ -701,9 +669,7 @@ msgstr ""
"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
"vnesemo s pritiskom na tipko F5."
-#: MSIBuild/En.Win32.Debug.Control-2.idtx:7
#: MSIBuild/En.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.x64.Debug.Control-2.idtx:7
#: MSIBuild/En.x64.Release.Control-2.idtx:7
msgid ""
"When configured, ZRCola starts at system startup and runs in the background. "
diff --git a/ZRCola/zrcolachrcatpnl.cpp b/ZRCola/zrcolachrcatpnl.cpp
index aec74b5..680ef74 100644
--- a/ZRCola/zrcolachrcatpnl.cpp
+++ b/ZRCola/zrcolachrcatpnl.cpp
@@ -64,10 +64,7 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
m_cg_id = m_cg_db.idxRnk[0].id;
m_choice->Select(0);
- // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
- wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, m_grid->GetId());
- e.SetInt(0);
- OnChoice(e);
+ Update();
}
// Register frame specific hotkey(s).
@@ -86,13 +83,12 @@ wxZRColaCharacterCatalogPanel::~wxZRColaCharacterCatalogPanel()
void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
{
- ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
+ const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
- m_cg_id = cg.id;
- m_grid->SetCharacters(wxString(cg.data + cg.name_len, cg.char_len));
-
- // As size of the grid might have changed, relayout the panel.
- Layout();
+ if (m_cg_id != cg.id) {
+ m_cg_id = cg.id;
+ Update();
+ }
event.Skip();
}
@@ -129,6 +125,16 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
}
+void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
+{
+ UNREFERENCED_PARAMETER(event);
+
+ Update();
+
+ event.Skip();
+}
+
+
void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
{
ZRColaApp *app = (ZRColaApp*)wxTheApp;
@@ -143,6 +149,33 @@ void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
}
+void wxZRColaCharacterCatalogPanel::Update()
+{
+ const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[m_choice->GetSelection()];
+
+ if (m_show_all->GetValue()) {
+ m_grid->SetCharacters(
+ wxString(cg.get_chars(), cg.char_len),
+ wxArrayShort((const short*)cg.get_char_shown(), (const short*)cg.get_char_shown() + (cg.char_len + 15)/16));
+ } else {
+ // Select frequently used characters only.
+ const wchar_t *src = cg.get_chars();
+ const unsigned __int16 *shown = cg.get_char_shown();
+ wxString chars;
+ for (unsigned __int16 i = 0, j = 0; i < cg.char_len; j++) {
+ for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < cg.char_len; k++, mask >>= 1, i++) {
+ if (mask & 1)
+ chars += src[i];
+ }
+ }
+ m_grid->SetCharacters(chars);
+ }
+
+ // As size of the grid might have changed, relayout the panel.
+ Layout();
+}
+
+
//////////////////////////////////////////////////////////////////////////
// wxPersistentZRColaCharacterCatalogPanel
//////////////////////////////////////////////////////////////////////////
@@ -163,6 +196,7 @@ void wxPersistentZRColaCharacterCatalogPanel::Save() const
const wxZRColaCharacterCatalogPanel * const wnd = static_cast(GetWindow());
SaveValue(wxT("charGroup"), wnd->m_cg_id);
+ SaveValue(wxT("showAll" ), wnd->m_show_all->GetValue());
}
@@ -170,24 +204,35 @@ bool wxPersistentZRColaCharacterCatalogPanel::Restore()
{
wxZRColaCharacterCatalogPanel * const wnd = static_cast(GetWindow());
+ bool update = false;
+
// Restore selected character group.
int cg_id;
if (RestoreValue(wxT("charGroup"), &cg_id)) {
for (size_t i = 0, n = wnd->m_cg_db.idxRnk.size(); i < n; i++) {
const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRnk[i];
if (cg.id == cg_id) {
- wnd->m_cg_id = cg.id;
- wnd->m_choice->Select(i);
-
- // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
- wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, wnd->m_grid->GetId());
- e.SetInt(i);
- wnd->OnChoice(e);
+ if (wnd->m_cg_id != cg.id) {
+ wnd->m_cg_id = cg.id;
+ wnd->m_choice->Select(i);
+ update = true;
+ }
break;
}
}
}
+ bool show_all;
+ if (RestoreValue(wxT("showAll"), &show_all)) {
+ if (wnd->m_show_all->GetValue() != show_all) {
+ wnd->m_show_all->SetValue(show_all);
+ update = true;
+ }
+ }
+
+ if (update)
+ wnd->Update();
+
return true;
}
diff --git a/ZRCola/zrcolachrcatpnl.h b/ZRCola/zrcolachrcatpnl.h
index 791c855..c3ad67e 100644
--- a/ZRCola/zrcolachrcatpnl.h
+++ b/ZRCola/zrcolachrcatpnl.h
@@ -50,9 +50,12 @@ protected:
virtual void OnChoice(wxCommandEvent& event);
virtual void OnGridClick(wxGridEvent& event);
virtual void OnGridKeyDown(wxKeyEvent& event);
+ virtual void OnShowAll(wxCommandEvent& event);
void OnFocusDecomposed(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
+ void Update();
+
protected:
ZRCola::chrgrp_db m_cg_db; ///< Character group database
int m_cg_id; ///< Selected character group ID
diff --git a/ZRCola/zrcolachrgrid.cpp b/ZRCola/zrcolachrgrid.cpp
index 5a46f72..116c043 100644
--- a/ZRCola/zrcolachrgrid.cpp
+++ b/ZRCola/zrcolachrgrid.cpp
@@ -68,8 +68,22 @@ void wxZRColaCharGrid::Init()
void wxZRColaCharGrid::SetCharacters(const wxString &chars)
+{
+ m_chars = chars;
+ m_relevance.Clear();
+ m_regenerate = true;
+
+ // Invoke OnSize(), which will populate the grid.
+ wxSizeEvent e(GetSize(), m_windowId);
+ e.SetEventObject(this);
+ HandleWindowEvent(e);
+}
+
+
+void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &relevance)
{
m_chars = chars;
+ m_relevance = relevance;
m_regenerate = true;
// Invoke OnSize(), which will populate the grid.
@@ -137,6 +151,17 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
for (int c = 0; c < cols; c++, i++)
table->SetValue(r, c, i < (int)char_len ? wxString(1, m_chars[i]) : wxEmptyString);
SetTable(table, true);
+ if (!m_relevance.IsEmpty()) {
+ const wxColour colour_def;
+ const wxColour colour_irr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT);
+ for (int r = 0, i = 0; r < rows; r++)
+ for (int c = 0; c < cols; c++, i++)
+ SetCellBackgroundColour(r, c, i >= (int)char_len || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
+ } else {
+ for (int r = 0, i = 0; r < rows; r++)
+ for (int c = 0; c < cols; c++, i++)
+ SetAttr(r, c, NULL);
+ }
m_regenerate = false;
}
diff --git a/ZRCola/zrcolachrgrid.h b/ZRCola/zrcolachrgrid.h
index 31ee4e3..533542c 100644
--- a/ZRCola/zrcolachrgrid.h
+++ b/ZRCola/zrcolachrgrid.h
@@ -58,6 +58,14 @@ public:
///
void SetCharacters(const wxString &chars);
+ ///
+ /// Sets new array of characters to display
+ ///
+ /// \param[in] chars The string containing characters to display
+ /// \param[in] relevance Bit-array of \p chars relevance (1=more relevant, 0=less relevant)
+ ///
+ void SetCharacters(const wxString &chars, const wxArrayShort &relevance);
+
///
/// Returns displayed characters
///
@@ -91,14 +99,15 @@ protected:
DECLARE_EVENT_TABLE()
private:
- void Init(); // common part of all ctors
+ void Init(); // common part of all ctors
protected:
- wxString m_chars; ///< Array of Unicode characters to display in the grid
+ wxString m_chars; ///< Array of Unicode characters to display in the grid
+ wxArrayShort m_relevance; ///< Bit-array of `m_chars` relevance
private:
- bool m_regenerate; ///< Force regenerate grid table
- bool m_isResizing; ///< Prevents nesting of OnSize() method.
- wxTimer m_timerToolTip; ///< Timer for displaying tooltip
- size_t m_toolTipIdx; ///< Index of cell for tooltip display
+ bool m_regenerate; ///< Force regenerate grid table
+ bool m_isResizing; ///< Prevents nesting of OnSize() method.
+ wxTimer m_timerToolTip; ///< Timer for displaying tooltip
+ size_t m_toolTipIdx; ///< Index of cell for tooltip display
};
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index fa80d18..26332a3 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -352,6 +352,8 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
wxArrayString m_choiceChoices;
m_choice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceChoices, 0 );
m_choice->SetSelection( 0 );
+ m_choice->SetToolTip( _("Select category to display") );
+
bSizer->Add( m_choice, 0, wxALL|wxEXPAND, 5 );
m_grid = new wxZRColaCharGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
@@ -384,6 +386,11 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
bSizer->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
+ m_show_all = new wxCheckBox( this, wxID_ANY, _("Show &All"), wxDefaultPosition, wxDefaultSize, 0 );
+ m_show_all->SetToolTip( _("Toggle display of less frequent characters") );
+
+ bSizer->Add( m_show_all, 0, wxALL|wxEXPAND, 5 );
+
this->SetSizer( bSizer );
this->Layout();
@@ -393,6 +400,7 @@ wxZRColaCharacterCatalogPanelBase::wxZRColaCharacterCatalogPanelBase( wxWindow*
m_choice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this );
m_grid->Connect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this );
m_grid->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this );
+ m_show_all->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this );
}
wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase()
@@ -401,6 +409,7 @@ wxZRColaCharacterCatalogPanelBase::~wxZRColaCharacterCatalogPanelBase()
m_choice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnChoice ), NULL, this );
m_grid->Disconnect( wxEVT_GRID_CELL_LEFT_CLICK, wxGridEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridClick ), NULL, this );
m_grid->Disconnect( wxEVT_KEY_DOWN, wxKeyEventHandler( wxZRColaCharacterCatalogPanelBase::OnGridKeyDown ), NULL, this );
+ m_show_all->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxZRColaCharacterCatalogPanelBase::OnShowAll ), NULL, this );
}
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index 5383de6..7ca7079 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -37,6 +37,7 @@ class wxZRColaComposerPanel;
#include
#include
#include
+#include
#include
#include
#include
@@ -45,7 +46,6 @@ class wxZRColaComposerPanel;
#include
#include
#include
-#include
#include
#include
#include
@@ -172,11 +172,13 @@ class wxZRColaCharacterCatalogPanelBase : public wxPanel
protected:
wxChoice* m_choice;
wxZRColaCharGrid* m_grid;
+ wxCheckBox* m_show_all;
// Virtual event handlers, overide them in your derived class
virtual void OnChoice( wxCommandEvent& event ) { event.Skip(); }
virtual void OnGridClick( wxGridEvent& event ) { event.Skip(); }
virtual void OnGridKeyDown( wxKeyEvent& event ) { event.Skip(); }
+ virtual void OnShowAll( wxCommandEvent& event ) { event.Skip(); }
public:
diff --git a/ZRColaCompile/dbsource.cpp b/ZRColaCompile/dbsource.cpp
index f1e2354..3c47436 100644
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -300,7 +300,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comCharacterGroup)));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_ActiveConnection(ATL::CComVariant(m_db))));
wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandType(adCmdText)));
- wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
+ wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak], [VRS_SkupineZnakov].[pogost] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
{
// Create and add command parameters.
ATL::CComPtr params;
@@ -844,12 +844,20 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr& rs, c
cg.chars.clear();
ATL::CComPtr flds;
wxVERIFY(SUCCEEDED(rs_chars->get_Fields(&flds)));
- ATL::CComPtr f;
- wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak"), &f)));
+ ATL::CComPtr f_char, f_show;
+ wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak" ), &f_char)));
+ wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"pogost"), &f_show)));
for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext()) {
wchar_t c;
- wxCHECK(GetUnicodeCharacter(f, c), false);
+ wxCHECK(GetUnicodeCharacter(f_char, c), false);
+ size_t n = cg.chars.length();
cg.chars += c;
+ bool show;
+ wxCHECK(GetValue(f_show, show), false);
+ if ((n % 16) == 0)
+ cg.show.push_back(show ? 1 : 0);
+ else if (show)
+ cg.show[n / 16] |= 1 << (n % 16);
}
}
diff --git a/ZRColaCompile/dbsource.h b/ZRColaCompile/dbsource.h
index e913ae6..ccf0da3 100644
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -109,10 +109,11 @@ namespace ZRCola {
///
class chrgrp {
public:
- int id; ///< Character group ID
- int rank; ///< Character group rank
- std::wstring name; ///< Character group name
- std::wstring chars; ///< Character group characters
+ int id; ///< Character group ID
+ int rank; ///< Character group rank
+ std::wstring name; ///< Character group name
+ std::wstring chars; ///< Character group characters
+ std::vector show; ///< Bit vector if particular character is displayed initially
};
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index 5ec05c7..6fb1d58 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -363,6 +363,8 @@ int _tmain(int argc, _TCHAR *argv[])
db.data.push_back(cg.name[i]);
for (wstring::size_type i = 0; i < n_char; i++)
db.data.push_back(cg.chars[i]);
+ for (std::vector::size_type i = 0, n = cg.show.size(); i < n; i++)
+ db.data.push_back(cg.show[i]);
db.idxRnk.push_back(idx);
} else
has_errors = true;
diff --git a/lib/libZRColaUI/include/zrcolaui/chargroup.h b/lib/libZRColaUI/include/zrcolaui/chargroup.h
index 3713d27..5976437 100644
--- a/lib/libZRColaUI/include/zrcolaui/chargroup.h
+++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
#include
@@ -50,6 +51,28 @@ namespace ZRCola {
unsigned __int16 name_len; ///< Character group name length in \c data
unsigned __int16 char_len; ///< Character list length in \c data
wchar_t data[]; ///< Character group name and character list
+
+ inline const wchar_t* get_chars() const
+ {
+ return data + name_len;
+ }
+
+ inline wchar_t get_char(size_t index) const
+ {
+ assert(index < char_len);
+ return data[name_len + index];
+ }
+
+ inline const unsigned __int16* get_char_shown() const
+ {
+ return (const unsigned __int16*)(data + name_len + char_len);
+ }
+
+ inline bool is_char_shown(size_t index) const
+ {
+ assert(index < char_len);
+ return (data[name_len + char_len + index / 16] & (1 << (index % 16))) ? true : false;
+ }
};
#pragma pack(pop)
diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb
index 44130ae..5473875 100644
Binary files a/output/data/ZRCola.zrcdb and b/output/data/ZRCola.zrcdb differ