diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index 78b6fa6..08fbd3e 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: 2021-12-10 14:57+0100\n"
+"POT-Creation-Date: 2021-12-20 20:17+0100\n"
 "PO-Revision-Date: 2019-04-01 19:38+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -47,8 +47,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:224 zrcolagui.cpp:84
+#: zrcolagui.cpp:224
 #, fuzzy
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
@@ -58,8 +58,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:226 zrcolagui.cpp:90
+#: zrcolagui.cpp:226
 #, fuzzy
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
@@ -79,8 +79,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:228 zrcolagui.cpp:108
+#: zrcolagui.cpp:228
 #, fuzzy
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
@@ -105,439 +105,214 @@ msgstr "Prekini raz/sestavljanje"
 msgid "Abort composition and return focus to source window"
 msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
-#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
+#: res/zrcolagui.cpp:138 zrcolagui.cpp:138
 #, fuzzy
-msgid "&ZRCola (De)composition"
-msgstr "(Raz-)Sestavljanje &ZRCola"
-
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
-#, fuzzy
-msgid "Toggle ZRCola character (De)composition"
+msgid "(De)&composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+#, fuzzy
+msgid "&None"
+msgstr "(brez)"
+
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+#, fuzzy
+msgid "No character (De)composition"
+msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+#, fuzzy
+msgid "&ZRCola"
+msgstr "ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+#, fuzzy
+msgid "ZRCola character (De)composition"
+msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#, fuzzy
+msgid "&Unicode"
+msgstr "Unicode"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+msgid "Unicode character (De)composition"
+msgstr ""
+
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 #, fuzzy
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:156 zrcolagui.cpp:156
 #, fuzzy
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:156 res/zrcolagui.cpp:243 zrcolagui.cpp:156
+#: zrcolagui.cpp:243
 #, fuzzy
 msgid "Highlight Private Use Area Characters"
 msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 #, fuzzy
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:165 zrcolagui.cpp:165
 #, fuzzy
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 #, fuzzy
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 #, fuzzy
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 #, fuzzy
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 #, fuzzy
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 #, fuzzy
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 #, fuzzy
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:182 zrcolagui.cpp:182
 #, fuzzy
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 #, fuzzy
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 #, fuzzy
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 #, fuzzy
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 #, fuzzy
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 #, fuzzy
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 #, fuzzy
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 #, fuzzy
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 #, fuzzy
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 #, fuzzy
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:209 zrcolagui.cpp:209
 #, fuzzy
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 #, fuzzy
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 #, fuzzy
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 #, fuzzy
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 #, fuzzy
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 #, fuzzy
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 #, fuzzy
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 #, fuzzy
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:224 zrcolagui.cpp:224
 #, fuzzy
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:226 zrcolagui.cpp:226
 #, fuzzy
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:228 zrcolagui.cpp:228
 #, fuzzy
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
-#, fuzzy
-msgid "ZRCola (De)composition"
-msgstr "(Raz-)Sestavljanje ZRCola"
-
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-#, fuzzy
-msgid "PUA Warning"
-msgstr "Opozorilo OZU"
-
 #: res/zrcolagui.cpp:232 zrcolagui.cpp:232
 #, fuzzy
-msgid "Compose"
-msgstr "Sestavljanje"
+msgid "No (De)composition"
+msgstr "Prekini raz/sestavljanje"
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
-#, fuzzy
-msgid "Character Catalog"
-msgstr "Katalog znakov"
-
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
-#, fuzzy
-msgid "(De)Composer"
-msgstr "Razstavljalnik/Sestavljalnik"
-
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
-#, fuzzy
-msgid "Decomposed Text"
-msgstr "Razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
-#, fuzzy
-msgid "Decomposed Unicode Dump"
-msgstr "Unicode razstavljenega"
-
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
-#, fuzzy
-msgid "Composed Text"
-msgstr "Sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
-#, fuzzy
-msgid "Composed Unicode Dump"
-msgstr "Unicode sestavljenega"
-
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
-#, fuzzy
-msgid "Select category to display"
-msgstr "Izberi kategorijo za prikaz"
-
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
-#, fuzzy
-msgid "Show &All"
-msgstr "Prik&aži vse"
-
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
-#, fuzzy
-msgid "Toggle display of less frequent characters"
-msgstr "Prikaži/skrij manj pogoste znake"
-
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
-#, fuzzy
-msgid "&Browse"
-msgstr "Pre&brskaj"
-
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
-#, fuzzy
-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"
-
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
-#, fuzzy
-msgid "Search Options"
-msgstr "Možnosti iskanja"
-
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
-#, fuzzy
-msgid "Shows/hides additional search options"
-msgstr "Prikaže/skrije dodatne možnosti iskanja"
-
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
-#, fuzzy
-msgid "List of Unicode character categories to search in"
-msgstr "Seznam kategorij znaka Unicode za iskanje"
-
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
-#, fuzzy
-msgid "All"
-msgstr "Vse"
-
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
-#, fuzzy
-msgid "Select all categories"
-msgstr "Izberi vse kategorije"
-
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
-#, fuzzy
-msgid "None"
-msgstr "Nič"
-
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
-#, fuzzy
-msgid "Clear category selection"
-msgstr "Počisti izbor kategorij"
-
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
-#, fuzzy
-msgid "Invert"
-msgstr "Obrni"
-
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
-#, fuzzy
-msgid "Invert category selection"
-msgstr "Obrni izbor kategorij"
-
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
-#, fuzzy
-msgid "Character search results"
-msgstr "Rezultati iskanja znakov"
-
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
-#, fuzzy
-msgid "Re&cently Used"
-msgstr "Nedavno &uporabljeni"
-
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
-#, fuzzy
-msgid "List of recently inserted characters"
-msgstr "Seznam nedavno vstavljenih znakov"
-
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
-#, fuzzy
-msgid "Preview"
-msgstr "Predogled"
-
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
-#, fuzzy
-msgid "U+"
-msgstr "U+"
-
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
-#, fuzzy
-msgid "Unicode hexadecimal code"
-msgstr "Šestnajstiška koda Unicode"
-
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
-#, fuzzy
-msgid "Keyboard shortcut in Composer window"
-msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
-
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
-#, fuzzy
-msgid "Character preview"
-msgstr "Predogled znaka"
-
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
-#, fuzzy
-msgid "Unicode character description"
-msgstr "Opis znaka Unicode"
-
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
-#, fuzzy
-msgid "Character tags"
-msgstr "Oznake znaka"
-
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
-#, fuzzy
-msgid "Unicode character category"
-msgstr "Kategorija znaka Unicode"
-
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
-#, fuzzy
-msgid "« Back"
-msgstr "« Nazaj"
-
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
-#, fuzzy
-msgid "To previously viewed character"
-msgstr "Na prejšnji prikazan znak"
-
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
-#, fuzzy
-msgid "Forward »"
-msgstr "Naprej »"
-
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
-#, fuzzy
-msgid "To following viewed character"
-msgstr "Na naslednji prikazan znak"
-
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
-#, fuzzy
-msgid "Re&lated"
-msgstr "&Sorodni"
-
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
-#, fuzzy
-msgid "List of related characters"
-msgstr "Seznam sorodnih znakov"
-
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
-#, fuzzy
-msgid "&Insert"
-msgstr "Vstav&i"
-
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
-#, fuzzy
-msgid "Insert character into decomposed text"
-msgstr "Vstavi znak v razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
-#, fuzzy
-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 ""
-"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
-"Za optimalno razstavljanje izberite pravilni jezik."
-
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
-#, fuzzy
-msgid "Select language &automatically according to selected keyboard"
-msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
-
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
-#, fuzzy
-msgid "&Manually select the language from the list below:"
-msgstr "&Ročno izberi jezik s seznama spodaj:"
-
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
-#, fuzzy
-msgid "Text Language"
-msgstr "Jezik besedila"
-
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
-#, fuzzy
-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 ""
-"ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
-"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
-
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
-#, fuzzy
-msgid "Start ZRCola &automatically on logon"
-msgstr "S&amodejno zaženi ZRColo ob prijavi"
-
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
-#, fuzzy
-msgid "Startup"
-msgstr "Zagon"
-
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:60 zrcolafrm.cpp:115
-#: zrcolagui.cpp:927 zrcolagui.h:114
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: res/zrcolagui.cpp:232 res/zrcolagui.cpp:940 res/zrcolagui.h:119
+#: zrcolaapp.cpp:60 zrcolafrm.cpp:118 zrcolagui.cpp:232 zrcolagui.cpp:943
+#: zrcolagui.h:119 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -547,7 +322,260 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#, fuzzy
+msgid "Unicode"
+msgstr "Unicode"
+
+#: res/zrcolagui.cpp:243 zrcolagui.cpp:243
+#, fuzzy
+msgid "PUA Warning"
+msgstr "Opozorilo OZU"
+
+#: res/zrcolagui.cpp:246 zrcolagui.cpp:246
+#, fuzzy
+msgid "Compose"
+msgstr "Sestavljanje"
+
+#: res/zrcolagui.cpp:250 zrcolagui.cpp:250
+#, fuzzy
+msgid "Character Catalog"
+msgstr "Katalog znakov"
+
+#: res/zrcolagui.cpp:254 zrcolagui.cpp:254
+#, fuzzy
+msgid "(De)Composer"
+msgstr "Razstavljalnik/Sestavljalnik"
+
+#: res/zrcolagui.cpp:297 zrcolagui.cpp:297
+#, fuzzy
+msgid "Decomposed Text"
+msgstr "Razstavljeno besedilo"
+
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:317
+#, fuzzy
+msgid "Decomposed Unicode Dump"
+msgstr "Unicode razstavljenega"
+
+#: res/zrcolagui.cpp:344 zrcolagui.cpp:344
+#, fuzzy
+msgid "Composed Text"
+msgstr "Sestavljeno besedilo"
+
+#: res/zrcolagui.cpp:364 zrcolagui.cpp:364
+#, fuzzy
+msgid "Composed Unicode Dump"
+msgstr "Unicode sestavljenega"
+
+#: res/zrcolagui.cpp:418 zrcolagui.cpp:418
+#, fuzzy
+msgid "Select category to display"
+msgstr "Izberi kategorijo za prikaz"
+
+#: res/zrcolagui.cpp:452 zrcolagui.cpp:452
+#, fuzzy
+msgid "Show &All"
+msgstr "Prik&aži vse"
+
+#: res/zrcolagui.cpp:453 zrcolagui.cpp:453
+#, fuzzy
+msgid "Toggle display of less frequent characters"
+msgstr "Prikaži/skrij manj pogoste znake"
+
+#: res/zrcolagui.cpp:493 zrcolagui.cpp:493
+#, fuzzy
+msgid "&Browse"
+msgstr "Pre&brskaj"
+
+#: res/zrcolagui.cpp:500 zrcolagui.cpp:500
+#, fuzzy
+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"
+
+#: res/zrcolagui.cpp:504 zrcolagui.cpp:504
+#, fuzzy
+msgid "Search Options"
+msgstr "Možnosti iskanja"
+
+#: res/zrcolagui.cpp:505 zrcolagui.cpp:505
+#, fuzzy
+msgid "Shows/hides additional search options"
+msgstr "Prikaže/skrije dodatne možnosti iskanja"
+
+#: res/zrcolagui.cpp:517 zrcolagui.cpp:517
+#, fuzzy
+msgid "List of Unicode character categories to search in"
+msgstr "Seznam kategorij znaka Unicode za iskanje"
+
+#: res/zrcolagui.cpp:524 zrcolagui.cpp:524
+#, fuzzy
+msgid "All"
+msgstr "Vse"
+
+#: res/zrcolagui.cpp:525 zrcolagui.cpp:525
+#, fuzzy
+msgid "Select all categories"
+msgstr "Izberi vse kategorije"
+
+#: res/zrcolagui.cpp:529 zrcolagui.cpp:529
+#, fuzzy
+msgid "None"
+msgstr "Nič"
+
+#: res/zrcolagui.cpp:530 zrcolagui.cpp:530
+#, fuzzy
+msgid "Clear category selection"
+msgstr "Počisti izbor kategorij"
+
+#: res/zrcolagui.cpp:534 zrcolagui.cpp:534
+#, fuzzy
+msgid "Invert"
+msgstr "Obrni"
+
+#: res/zrcolagui.cpp:535 zrcolagui.cpp:535
+#, fuzzy
+msgid "Invert category selection"
+msgstr "Obrni izbor kategorij"
+
+#: res/zrcolagui.cpp:574 zrcolagui.cpp:574
+#, fuzzy
+msgid "Character search results"
+msgstr "Rezultati iskanja znakov"
+
+#: res/zrcolagui.cpp:584 zrcolagui.cpp:584
+#, fuzzy
+msgid "Re&cently Used"
+msgstr "Nedavno &uporabljeni"
+
+#: res/zrcolagui.cpp:612 zrcolagui.cpp:612
+#, fuzzy
+msgid "List of recently inserted characters"
+msgstr "Seznam nedavno vstavljenih znakov"
+
+#: res/zrcolagui.cpp:626 zrcolagui.cpp:626
+#, fuzzy
+msgid "Preview"
+msgstr "Predogled"
+
+#: res/zrcolagui.cpp:631 zrcolagui.cpp:631
+#, fuzzy
+msgid "U+"
+msgstr "U+"
+
+#: res/zrcolagui.cpp:636 zrcolagui.cpp:636
+#, fuzzy
+msgid "Unicode hexadecimal code"
+msgstr "Šestnajstiška koda Unicode"
+
+#: res/zrcolagui.cpp:641 zrcolagui.cpp:641
+#, fuzzy
+msgid "Keyboard shortcut in Composer window"
+msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
+
+#: res/zrcolagui.cpp:676 zrcolagui.cpp:676
+#, fuzzy
+msgid "Character preview"
+msgstr "Predogled znaka"
+
+#: res/zrcolagui.cpp:681 zrcolagui.cpp:681
+#, fuzzy
+msgid "Unicode character description"
+msgstr "Opis znaka Unicode"
+
+#: res/zrcolagui.cpp:686 zrcolagui.cpp:686
+#, fuzzy
+msgid "Character tags"
+msgstr "Oznake znaka"
+
+#: res/zrcolagui.cpp:691 zrcolagui.cpp:691
+#, fuzzy
+msgid "Unicode character category"
+msgstr "Kategorija znaka Unicode"
+
+#: res/zrcolagui.cpp:698 zrcolagui.cpp:698
+#, fuzzy
+msgid "« Back"
+msgstr "« Nazaj"
+
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+#, fuzzy
+msgid "To previously viewed character"
+msgstr "Na prejšnji prikazan znak"
+
+#: res/zrcolagui.cpp:704 zrcolagui.cpp:704
+#, fuzzy
+msgid "Forward »"
+msgstr "Naprej »"
+
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+#, fuzzy
+msgid "To following viewed character"
+msgstr "Na naslednji prikazan znak"
+
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:717
+#, fuzzy
+msgid "Re&lated"
+msgstr "&Sorodni"
+
+#: res/zrcolagui.cpp:744 zrcolagui.cpp:744
+#, fuzzy
+msgid "List of related characters"
+msgstr "Seznam sorodnih znakov"
+
+#: res/zrcolagui.cpp:763 zrcolagui.cpp:763
+#, fuzzy
+msgid "&Insert"
+msgstr "Vstav&i"
+
+#: res/zrcolagui.cpp:767 zrcolagui.cpp:767
+#, fuzzy
+msgid "Insert character into decomposed text"
+msgstr "Vstavi znak v razstavljeno besedilo"
+
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:843
+#, fuzzy
+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 ""
+"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
+"Za optimalno razstavljanje izberite pravilni jezik."
+
+#: res/zrcolagui.cpp:844 zrcolagui.cpp:847
+#, fuzzy
+msgid "Select language &automatically according to selected keyboard"
+msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
+
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+#, fuzzy
+msgid "&Manually select the language from the list below:"
+msgstr "&Ročno izberi jezik s seznama spodaj:"
+
+#: res/zrcolagui.cpp:858 zrcolagui.cpp:861
+#, fuzzy
+msgid "Text Language"
+msgstr "Jezik besedila"
+
+#: res/zrcolagui.cpp:863 zrcolagui.cpp:866
+#, fuzzy
+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 ""
+"ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
+"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
+
+#: res/zrcolagui.cpp:867 zrcolagui.cpp:870
+#, fuzzy
+msgid "Start ZRCola &automatically on logon"
+msgstr "S&amodejno zaženi ZRColo ob prijavi"
+
+#: res/zrcolagui.cpp:873 zrcolagui.cpp:876
+#, fuzzy
+msgid "Startup"
+msgstr "Zagon"
+
+#: res/zrcolagui.cpp:951 zrcolagui.cpp:954
 #, fuzzy
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
@@ -562,62 +590,62 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:959 zrcolagui.cpp:962
 #, fuzzy
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:965 zrcolagui.cpp:968
 #, fuzzy
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:969 zrcolagui.cpp:972
 #, fuzzy
 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 Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 #, fuzzy
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1026 zrcolagui.cpp:1029
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 #, fuzzy
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1032 zrcolagui.cpp:1035
 #, fuzzy
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1033 zrcolagui.cpp:1036
 #, fuzzy
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:35 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1070 zrcolachrreq.cpp:35 zrcolagui.cpp:1073
 #, fuzzy
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1072 zrcolagui.cpp:1075
 #, fuzzy
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1089
 #, fuzzy
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 #, fuzzy
 msgid ""
 "Please, use the decomposed form.\n"
@@ -626,22 +654,22 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:44 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1098 zrcolachrreq.cpp:44 zrcolagui.cpp:1101
 #, fuzzy
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1100 zrcolagui.cpp:1103
 #, fuzzy
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1106 zrcolagui.cpp:1109
 #, fuzzy
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1113 zrcolagui.cpp:1116
 #, fuzzy
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
@@ -650,12 +678,12 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1158
 #, fuzzy
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 #, fuzzy
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
@@ -664,58 +692,58 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1170
 #, fuzzy
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1182 zrcolagui.cpp:1185
 msgid "→"
 msgstr ""
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1188
 msgid "←"
 msgstr ""
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1194 zrcolagui.cpp:1197
 #, fuzzy
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1212 zrcolagui.cpp:1215
 msgid "↑"
 msgstr ""
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1215 zrcolagui.cpp:1218
 msgid "↓"
 msgstr ""
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:260 zrcolagui.h:260
 #, fuzzy
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:296 zrcolagui.h:296
 #, fuzzy
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:322 zrcolagui.h:322
 #, fuzzy
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:81
+#: res/zrcolagui.h:347 zrcolagui.h:347 zrcolaupdater.cpp:81
 #, fuzzy
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:50 zrcolagui.h:371
+#: res/zrcolagui.h:376 zrcolachrreq.cpp:50 zrcolagui.h:376
 #, fuzzy
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:418 zrcolagui.h:418
 #, fuzzy
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
@@ -754,37 +782,37 @@ msgstr ""
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:81
+#: zrcolafrm.cpp:84
 #, fuzzy
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:94
+#: zrcolafrm.cpp:97
 #, fuzzy
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:211
+#: zrcolafrm.cpp:217
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:211 zrcolafrm.cpp:213
+#: zrcolafrm.cpp:217 zrcolafrm.cpp:219
 #, fuzzy
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:213
+#: zrcolafrm.cpp:219
 #, fuzzy
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:485
+#: zrcolafrm.cpp:508
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:510
+#: zrcolafrm.cpp:533
 #, fuzzy
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po
index f6dae15..7397bce 100644
--- a/ZRCola/locale/de_DE.po
+++ b/ZRCola/locale/de_DE.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-19 14:27+0100\n"
-"PO-Revision-Date: 2021-11-19 14:28+0100\n"
+"POT-Creation-Date: 2021-12-20 20:18+0100\n"
+"PO-Revision-Date: 2021-12-20 20:18+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: German (Germany) (https://www.transifex.com/amebis/teams/91592/de_DE/)\n"
 "Language: de_DE\n"
@@ -43,8 +43,8 @@ msgstr ""
 msgid "Find C&haracter..."
 msgstr ""
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:224 zrcolagui.cpp:84
+#: zrcolagui.cpp:224
 msgid "Toggle character search to select character to insert into text"
 msgstr ""
 
@@ -52,8 +52,8 @@ msgstr ""
 msgid "&Send Composed"
 msgstr ""
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:226 zrcolagui.cpp:90
+#: zrcolagui.cpp:226
 msgid "Send composed text to source window"
 msgstr ""
 
@@ -69,8 +69,8 @@ msgstr ""
 msgid "Send &Decomposed"
 msgstr ""
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:228 zrcolagui.cpp:108
+#: zrcolagui.cpp:228
 msgid "Send decomposed text to source window"
 msgstr ""
 
@@ -90,351 +90,177 @@ msgstr ""
 msgid "Abort composition and return focus to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
-msgid "&ZRCola (De)composition"
+#: res/zrcolagui.cpp:138 zrcolagui.cpp:138
+msgid "(De)&composition"
 msgstr ""
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
-msgid "Toggle ZRCola character (De)composition"
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+msgid "&None"
 msgstr ""
 
-#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
-msgid "Tra&nslation"
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+msgid "No character (De)composition"
+msgstr ""
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+#, fuzzy
+#| msgid "ZRCola"
+msgid "&ZRCola"
+msgstr "ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+msgid "ZRCola character (De)composition"
 msgstr ""
 
 #: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#, fuzzy
+msgid "&Unicode"
+msgstr "Unicode"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+msgid "Unicode character (De)composition"
+msgstr ""
+
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+msgid "Tra&nslation"
+msgstr ""
+
+#: res/zrcolagui.cpp:156 zrcolagui.cpp:156
 msgid "&PUA Warning"
 msgstr ""
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:156 res/zrcolagui.cpp:243 zrcolagui.cpp:156
+#: zrcolagui.cpp:243
 msgid "Highlight Private Use Area Characters"
 msgstr ""
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Settings..."
 msgstr ""
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Open program configuration dialog"
 msgstr ""
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:165 zrcolagui.cpp:165
 msgid "&Edit"
 msgstr ""
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "&Edit Toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "Toggle edit toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "&Compose Toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "Toggle compose toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Character Catalo&g"
 msgstr ""
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Toggle character catalog panel"
 msgstr ""
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:182 zrcolagui.cpp:182
 msgid "&View"
 msgstr ""
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "&Instructions..."
 msgstr ""
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "Open a web site with product instructions"
 msgstr ""
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Keyboard &Shortcuts..."
 msgstr ""
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Open a list of keyboard shortcuts"
 msgstr ""
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "&Request a new character..."
 msgstr ""
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "Submit a request to ZRC to add a new character"
 msgstr ""
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check for &Updates..."
 msgstr ""
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check online for product update"
 msgstr ""
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 msgid "&About..."
 msgstr ""
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:209 zrcolagui.cpp:209
 msgid "&Help"
 msgstr ""
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut"
 msgstr ""
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut selection"
 msgstr ""
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy"
 msgstr ""
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy selection"
 msgstr ""
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste"
 msgstr ""
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste selection"
 msgstr ""
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "Edit"
 msgstr ""
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:224 zrcolagui.cpp:224
 msgid "Find Character"
 msgstr ""
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:226 zrcolagui.cpp:226
 msgid "Send Composed"
 msgstr ""
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:228 zrcolagui.cpp:228
 msgid "Send Decomposed"
 msgstr ""
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
-msgid "ZRCola (De)composition"
-msgstr ""
-
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-msgid "PUA Warning"
-msgstr ""
-
 #: res/zrcolagui.cpp:232 zrcolagui.cpp:232
-msgid "Compose"
+msgid "No (De)composition"
 msgstr ""
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
-msgid "Character Catalog"
-msgstr ""
-
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
-msgid "(De)Composer"
-msgstr ""
-
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
-msgid "Decomposed Text"
-msgstr ""
-
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
-msgid "Decomposed Unicode Dump"
-msgstr ""
-
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
-msgid "Composed Text"
-msgstr ""
-
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
-msgid "Composed Unicode Dump"
-msgstr ""
-
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
-msgid "Select category to display"
-msgstr ""
-
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
-msgid "Show &All"
-msgstr ""
-
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
-msgid "Toggle display of less frequent characters"
-msgstr ""
-
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
-msgid "&Browse"
-msgstr ""
-
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
-msgid "Full or partial terms from Unicode character description (in English) to search for"
-msgstr ""
-
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
-msgid "Search Options"
-msgstr ""
-
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
-msgid "Shows/hides additional search options"
-msgstr ""
-
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
-msgid "List of Unicode character categories to search in"
-msgstr ""
-
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
-msgid "All"
-msgstr ""
-
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
-msgid "Select all categories"
-msgstr ""
-
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
-msgid "None"
-msgstr ""
-
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
-msgid "Clear category selection"
-msgstr ""
-
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
-msgid "Invert"
-msgstr ""
-
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
-msgid "Invert category selection"
-msgstr ""
-
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
-msgid "Character search results"
-msgstr ""
-
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
-msgid "Re&cently Used"
-msgstr ""
-
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
-msgid "List of recently inserted characters"
-msgstr ""
-
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
-msgid "Preview"
-msgstr ""
-
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
-msgid "U+"
-msgstr "U+"
-
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
-msgid "Unicode hexadecimal code"
-msgstr ""
-
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
-msgid "Keyboard shortcut in Composer window"
-msgstr ""
-
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
-msgid "Character preview"
-msgstr ""
-
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
-msgid "Unicode character description"
-msgstr ""
-
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
-msgid "Character tags"
-msgstr ""
-
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
-msgid "Unicode character category"
-msgstr ""
-
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
-msgid "« Back"
-msgstr ""
-
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
-msgid "To previously viewed character"
-msgstr ""
-
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
-msgid "Forward »"
-msgstr ""
-
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
-msgid "To following viewed character"
-msgstr ""
-
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
-msgid "Re&lated"
-msgstr ""
-
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
-msgid "List of related characters"
-msgstr ""
-
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
-msgid "&Insert"
-msgstr ""
-
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
-msgid "Insert character into decomposed text"
-msgstr ""
-
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
-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 ""
-
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
-msgid "Select language &automatically according to selected keyboard"
-msgstr ""
-
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
-msgid "&Manually select the language from the list below:"
-msgstr ""
-
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
-msgid "Text Language"
-msgstr ""
-
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
-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 ""
-
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
-msgid "Start ZRCola &automatically on logon"
-msgstr ""
-
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
-msgid "Startup"
-msgstr ""
-
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:74 zrcolafrm.cpp:129
-#: zrcolagui.cpp:927 zrcolagui.h:114
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: res/zrcolagui.cpp:232 res/zrcolagui.cpp:940 res/zrcolagui.h:119
+#: zrcolaapp.cpp:60 zrcolafrm.cpp:118 zrcolagui.cpp:232 zrcolagui.cpp:943
+#: zrcolagui.h:119 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -443,7 +269,208 @@ msgstr ""
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#, fuzzy
+msgid "Unicode"
+msgstr "Unicode"
+
+#: res/zrcolagui.cpp:243 zrcolagui.cpp:243
+msgid "PUA Warning"
+msgstr ""
+
+#: res/zrcolagui.cpp:246 zrcolagui.cpp:246
+msgid "Compose"
+msgstr ""
+
+#: res/zrcolagui.cpp:250 zrcolagui.cpp:250
+msgid "Character Catalog"
+msgstr ""
+
+#: res/zrcolagui.cpp:254 zrcolagui.cpp:254
+msgid "(De)Composer"
+msgstr ""
+
+#: res/zrcolagui.cpp:297 zrcolagui.cpp:297
+msgid "Decomposed Text"
+msgstr ""
+
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:317
+msgid "Decomposed Unicode Dump"
+msgstr ""
+
+#: res/zrcolagui.cpp:344 zrcolagui.cpp:344
+msgid "Composed Text"
+msgstr ""
+
+#: res/zrcolagui.cpp:364 zrcolagui.cpp:364
+msgid "Composed Unicode Dump"
+msgstr ""
+
+#: res/zrcolagui.cpp:418 zrcolagui.cpp:418
+msgid "Select category to display"
+msgstr ""
+
+#: res/zrcolagui.cpp:452 zrcolagui.cpp:452
+msgid "Show &All"
+msgstr ""
+
+#: res/zrcolagui.cpp:453 zrcolagui.cpp:453
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: res/zrcolagui.cpp:493 zrcolagui.cpp:493
+msgid "&Browse"
+msgstr ""
+
+#: res/zrcolagui.cpp:500 zrcolagui.cpp:500
+msgid "Full or partial terms from Unicode character description (in English) to search for"
+msgstr ""
+
+#: res/zrcolagui.cpp:504 zrcolagui.cpp:504
+msgid "Search Options"
+msgstr ""
+
+#: res/zrcolagui.cpp:505 zrcolagui.cpp:505
+msgid "Shows/hides additional search options"
+msgstr ""
+
+#: res/zrcolagui.cpp:517 zrcolagui.cpp:517
+msgid "List of Unicode character categories to search in"
+msgstr ""
+
+#: res/zrcolagui.cpp:524 zrcolagui.cpp:524
+msgid "All"
+msgstr ""
+
+#: res/zrcolagui.cpp:525 zrcolagui.cpp:525
+msgid "Select all categories"
+msgstr ""
+
+#: res/zrcolagui.cpp:529 zrcolagui.cpp:529
+msgid "None"
+msgstr ""
+
+#: res/zrcolagui.cpp:530 zrcolagui.cpp:530
+msgid "Clear category selection"
+msgstr ""
+
+#: res/zrcolagui.cpp:534 zrcolagui.cpp:534
+msgid "Invert"
+msgstr ""
+
+#: res/zrcolagui.cpp:535 zrcolagui.cpp:535
+msgid "Invert category selection"
+msgstr ""
+
+#: res/zrcolagui.cpp:574 zrcolagui.cpp:574
+msgid "Character search results"
+msgstr ""
+
+#: res/zrcolagui.cpp:584 zrcolagui.cpp:584
+msgid "Re&cently Used"
+msgstr ""
+
+#: res/zrcolagui.cpp:612 zrcolagui.cpp:612
+msgid "List of recently inserted characters"
+msgstr ""
+
+#: res/zrcolagui.cpp:626 zrcolagui.cpp:626
+msgid "Preview"
+msgstr ""
+
+#: res/zrcolagui.cpp:631 zrcolagui.cpp:631
+msgid "U+"
+msgstr "U+"
+
+#: res/zrcolagui.cpp:636 zrcolagui.cpp:636
+msgid "Unicode hexadecimal code"
+msgstr ""
+
+#: res/zrcolagui.cpp:641 zrcolagui.cpp:641
+msgid "Keyboard shortcut in Composer window"
+msgstr ""
+
+#: res/zrcolagui.cpp:676 zrcolagui.cpp:676
+msgid "Character preview"
+msgstr ""
+
+#: res/zrcolagui.cpp:681 zrcolagui.cpp:681
+msgid "Unicode character description"
+msgstr ""
+
+#: res/zrcolagui.cpp:686 zrcolagui.cpp:686
+msgid "Character tags"
+msgstr ""
+
+#: res/zrcolagui.cpp:691 zrcolagui.cpp:691
+msgid "Unicode character category"
+msgstr ""
+
+#: res/zrcolagui.cpp:698 zrcolagui.cpp:698
+msgid "« Back"
+msgstr ""
+
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+msgid "To previously viewed character"
+msgstr ""
+
+#: res/zrcolagui.cpp:704 zrcolagui.cpp:704
+msgid "Forward »"
+msgstr ""
+
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+msgid "To following viewed character"
+msgstr ""
+
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:717
+msgid "Re&lated"
+msgstr ""
+
+#: res/zrcolagui.cpp:744 zrcolagui.cpp:744
+msgid "List of related characters"
+msgstr ""
+
+#: res/zrcolagui.cpp:763 zrcolagui.cpp:763
+msgid "&Insert"
+msgstr ""
+
+#: res/zrcolagui.cpp:767 zrcolagui.cpp:767
+msgid "Insert character into decomposed text"
+msgstr ""
+
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:843
+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 ""
+
+#: res/zrcolagui.cpp:844 zrcolagui.cpp:847
+msgid "Select language &automatically according to selected keyboard"
+msgstr ""
+
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+msgid "&Manually select the language from the list below:"
+msgstr ""
+
+#: res/zrcolagui.cpp:858 zrcolagui.cpp:861
+msgid "Text Language"
+msgstr ""
+
+#: res/zrcolagui.cpp:863 zrcolagui.cpp:866
+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 ""
+
+#: res/zrcolagui.cpp:867 zrcolagui.cpp:870
+msgid "Start ZRCola &automatically on logon"
+msgstr ""
+
+#: res/zrcolagui.cpp:873 zrcolagui.cpp:876
+msgid "Startup"
+msgstr ""
+
+#: res/zrcolagui.cpp:951 zrcolagui.cpp:954
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -452,204 +479,204 @@ msgid ""
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:959 zrcolagui.cpp:962
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:965 zrcolagui.cpp:968
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr ""
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:969 zrcolagui.cpp:972
 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 Peter Weiss."
 msgstr ""
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 msgid "Log"
 msgstr ""
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1026 zrcolagui.cpp:1029
 msgid "Quit and &Update..."
 msgstr ""
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 msgid "Exit this program and launch product update"
 msgstr ""
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1032 zrcolagui.cpp:1035
 msgid "&Close"
 msgstr ""
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1033 zrcolagui.cpp:1036
 msgid "Close this window"
 msgstr ""
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:49 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1070 zrcolachrreq.cpp:35 zrcolagui.cpp:1073
 msgid "Character"
 msgstr ""
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1072 zrcolagui.cpp:1075
 msgid "Enter the &character you would like to request:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1089
 msgid "Decomposed character to request"
 msgstr ""
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 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 ""
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:58 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1098 zrcolachrreq.cpp:44 zrcolagui.cpp:1101
 msgid "Context"
 msgstr ""
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1100 zrcolagui.cpp:1103
 msgid "The &context, examples or description why and where the character is required:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1106 zrcolagui.cpp:1109
 msgid "Additional notes for character request"
 msgstr ""
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1113 zrcolagui.cpp:1116
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
 msgstr ""
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1158
 msgid "Translation"
 msgstr ""
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
 msgstr ""
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1170
 msgid "A&vailable:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1182 zrcolagui.cpp:1185
 msgid "→"
 msgstr "→"
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1188
 msgid "←"
 msgstr "←"
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1194 zrcolagui.cpp:1197
 msgid "&Selected:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1212 zrcolagui.cpp:1215
 msgid "↑"
 msgstr "↑"
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1215 zrcolagui.cpp:1218
 msgid "↓"
 msgstr "↓"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:260 zrcolagui.h:260
 msgid "Character Search"
 msgstr ""
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:296 zrcolagui.h:296
 msgid "Settings"
 msgstr ""
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:322 zrcolagui.h:322
 msgid "About ZRCola"
 msgstr ""
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:347 zrcolagui.h:347 zrcolaupdater.cpp:81
 msgid "Product Update"
 msgstr ""
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:376 zrcolachrreq.cpp:50 zrcolagui.h:376
 msgid "Request a New Character"
 msgstr ""
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:418 zrcolagui.h:418
 msgid "Custom Translation Sequence"
 msgstr ""
 
-#: zrcolaabout.cpp:31
+#: zrcolaabout.cpp:17
 #, c-format
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolachrslct.cpp:89
+#: zrcolachrslct.cpp:75
 msgid "Too many digits in Unicode."
 msgstr ""
 
-#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:75 zrcolachrslct.cpp:93
 msgid "Validation conflict"
 msgstr "Fehler bei der Validierung"
 
-#: zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:93
 #, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr ""
 
-#: zrcolachrslct.cpp:215 zrcolachrslct.cpp:391 zrcolachrslct.cpp:888
+#: zrcolachrslct.cpp:201 zrcolachrslct.cpp:377 zrcolachrslct.cpp:874
 msgid "▸ Search Options"
 msgstr ""
 
-#: zrcolachrslct.cpp:329
+#: zrcolachrslct.cpp:315
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:394 zrcolachrslct.cpp:885
+#: zrcolachrslct.cpp:380 zrcolachrslct.cpp:871
 msgid "▾ Search Options"
 msgstr ""
 
-#: zrcolafrm.cpp:95
+#: zrcolafrm.cpp:84
 msgid "No Translation"
 msgstr ""
 
-#: zrcolafrm.cpp:108
+#: zrcolafrm.cpp:97
 msgid "Custom Translation..."
 msgstr ""
 
-#: zrcolafrm.cpp:225
+#: zrcolafrm.cpp:217
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:225 zrcolafrm.cpp:227
+#: zrcolafrm.cpp:217 zrcolafrm.cpp:219
 msgid "Warning"
 msgstr ""
 
-#: zrcolafrm.cpp:227
+#: zrcolafrm.cpp:219
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:499
+#: zrcolafrm.cpp:508
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
 
-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:533
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
-#: zrcolakeyhndlr.cpp:44
+#: zrcolakeyhndlr.cpp:30
 msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr ""
 
-#: zrcolasettings.cpp:87
+#: zrcolasettings.cpp:73
 msgid "Start ZRCola automatically on logon"
 msgstr ""
 
-#: zrcolatranseq.cpp:63
+#: zrcolatranseq.cpp:49
 #, c-format
 msgid "Unknown translation (%u)"
 msgstr ""
 
-#: zrcolaupdater.cpp:95
+#: zrcolaupdater.cpp:81
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po
index a008832..b0bb8ae 100644
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-11-19 14:27+0100\n"
-"PO-Revision-Date: 2021-11-19 14:27+0100\n"
+"POT-Creation-Date: 2021-12-20 20:18+0100\n"
+"PO-Revision-Date: 2021-12-20 20:18+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91592/ru_RU/)\n"
 "Language: ru_RU\n"
@@ -44,8 +44,8 @@ msgstr "Выделить весь текст"
 msgid "Find C&haracter..."
 msgstr "Поиск &знака ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:224 zrcolagui.cpp:84
+#: zrcolagui.cpp:224
 msgid "Toggle character search to select character to insert into text"
 msgstr "Переключить поиск знаков для вставки выбранного знака в текст"
 
@@ -53,8 +53,8 @@ msgstr "Переключить поиск знаков для вставки в
 msgid "&Send Composed"
 msgstr "&Послать составленное"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:226 zrcolagui.cpp:90
+#: zrcolagui.cpp:226
 msgid "Send composed text to source window"
 msgstr "Послать составленный текст в исходное окно"
 
@@ -70,8 +70,8 @@ msgstr "Копировать составленный текст в буфер 
 msgid "Send &Decomposed"
 msgstr "Послать &разобранное"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:228 zrcolagui.cpp:108
+#: zrcolagui.cpp:228
 msgid "Send decomposed text to source window"
 msgstr "Послать разобранный текст в исходное окно"
 
@@ -91,359 +91,191 @@ msgstr "Прервать составление/разборку"
 msgid "Abort composition and return focus to source window"
 msgstr "Прервать составление и возвратить фокус в исходное окно"
 
-#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
-msgid "&ZRCola (De)composition"
-msgstr "Составление/разборка &ZRCola "
-
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
-msgid "Toggle ZRCola character (De)composition"
+#: res/zrcolagui.cpp:138 zrcolagui.cpp:138
+#, fuzzy
+#| msgid "Abort (De)composition"
+msgid "(De)&composition"
 msgstr "Переключить составление/разборку ZRCola"
 
-#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+#, fuzzy
+#| msgid "None"
+msgid "&None"
+msgstr "Ничего"
+
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+#, fuzzy
+#| msgid "Toggle ZRCola character (De)composition"
+msgid "No character (De)composition"
+msgstr "Переключить составление/разборку ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+#, fuzzy
+#| msgid "ZRCola"
+msgid "&ZRCola"
+msgstr "ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+#, fuzzy
+#| msgid "Toggle ZRCola character (De)composition"
+msgid "ZRCola character (De)composition"
+msgstr "Переключить составление/разборку ZRCola"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#, fuzzy
+msgid "&Unicode"
+msgstr "Юникод"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#, fuzzy
+#| msgid "Unicode character description"
+msgid "Unicode character (De)composition"
+msgstr "Описание знака Юникод"
+
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 msgid "Tra&nslation"
 msgstr "Тра&нслитерация"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:156 zrcolagui.cpp:156
 #, fuzzy
 #| msgid "Warning"
 msgid "&PUA Warning"
 msgstr "Предупреждение"
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:156 res/zrcolagui.cpp:243 zrcolagui.cpp:156
+#: zrcolagui.cpp:243
 msgid "Highlight Private Use Area Characters"
 msgstr ""
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Settings..."
 msgstr "&Настройки ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Open program configuration dialog"
 msgstr "Открыть диалог конфигурации программы"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:165 zrcolagui.cpp:165
 msgid "&Edit"
 msgstr "&Правка"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "&Edit Toolbar"
 msgstr "Панель инструментов для &правки"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "Toggle edit toolbar"
 msgstr "Переключить панель инструментов для правки"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "&Compose Toolbar"
 msgstr "Панель инструментов для &составления"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "Toggle compose toolbar"
 msgstr "Переключить панель инструментов для составления"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Character Catalo&g"
 msgstr "Список &знаков"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Toggle character catalog panel"
 msgstr "Переключить список знаков"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:182 zrcolagui.cpp:182
 msgid "&View"
 msgstr "&Вид"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "&Instructions..."
 msgstr "&Инструкции ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "Open a web site with product instructions"
 msgstr "Открыть сайт с инструкциями по продукту"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Keyboard &Shortcuts..."
 msgstr "Сочетания &клавиш ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Open a list of keyboard shortcuts"
 msgstr "Открыть список сочетаний клавиш"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "&Request a new character..."
 msgstr "&Запрос нового знака ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Отправить запрос нового знака"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check for &Updates..."
 msgstr "Проверить наличие &обновлений ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check online for product update"
 msgstr "Проверить наличие обновлений онлайн"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 msgid "&About..."
 msgstr "О прогр&амме ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:209 zrcolagui.cpp:209
 msgid "&Help"
 msgstr "&Справка"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut"
 msgstr "Вырезать"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut selection"
 msgstr "Вырезать выбор"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy"
 msgstr "Копировать"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy selection"
 msgstr "Копировать выбор"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste"
 msgstr "Вставить"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste selection"
 msgstr "Вставить выбор"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "Edit"
 msgstr "Правка"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:224 zrcolagui.cpp:224
 msgid "Find Character"
 msgstr "Поиск знака"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:226 zrcolagui.cpp:226
 msgid "Send Composed"
 msgstr "Послать составленное (F5)"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:228 zrcolagui.cpp:228
 msgid "Send Decomposed"
 msgstr "Послать разобранное (F6)"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
-msgid "ZRCola (De)composition"
-msgstr "ZRCola составление/разборка"
-
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-#, fuzzy
-#| msgid "Warning"
-msgid "PUA Warning"
-msgstr "Предупреждение"
-
 #: res/zrcolagui.cpp:232 zrcolagui.cpp:232
-msgid "Compose"
-msgstr "Составить"
+#, fuzzy
+#| msgid "Abort (De)composition"
+msgid "No (De)composition"
+msgstr "Прервать составление/разборку"
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
-msgid "Character Catalog"
-msgstr "Список знаков"
-
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
-msgid "(De)Composer"
-msgstr "(Де)Композитор"
-
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
-msgid "Decomposed Text"
-msgstr "Разобранний текст"
-
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
-msgid "Decomposed Unicode Dump"
-msgstr "Дамп разобранного Юнукода"
-
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
-msgid "Composed Text"
-msgstr "Составленный текст"
-
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
-msgid "Composed Unicode Dump"
-msgstr "Дамп составленного Юникода"
-
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
-msgid "Select category to display"
-msgstr "Выделить категории для отображения"
-
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
-msgid "Show &All"
-msgstr "Показать &все"
-
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
-msgid "Toggle display of less frequent characters"
-msgstr "Переключить отображение редко использованных знаков"
-
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
-msgid "&Browse"
-msgstr "&Обзор"
-
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
-msgid "Full or partial terms from Unicode character description (in English) to search for"
-msgstr "Полное либо частичное описание знака Юникод (на английском) для поиска"
-
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
-msgid "Search Options"
-msgstr "Опции поиска"
-
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
-msgid "Shows/hides additional search options"
-msgstr "Показать/скрыть дополнительные опции поиска"
-
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
-msgid "List of Unicode character categories to search in"
-msgstr "Список категории Юникод для проведения поиска"
-
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
-msgid "All"
-msgstr "Все"
-
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
-msgid "Select all categories"
-msgstr "Выбрать все категории"
-
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
-msgid "None"
-msgstr "Ничего"
-
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
-msgid "Clear category selection"
-msgstr "Очистить выбор категории"
-
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
-msgid "Invert"
-msgstr "Обратить"
-
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
-msgid "Invert category selection"
-msgstr "Обратить выбор категории"
-
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
-msgid "Character search results"
-msgstr "Результаты поиска знаков"
-
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
-msgid "Re&cently Used"
-msgstr "&Недавно использованное"
-
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
-msgid "List of recently inserted characters"
-msgstr "Список недавно вставленных знаков"
-
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
-msgid "Preview"
-msgstr "Просмотр"
-
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
-msgid "U+"
-msgstr "U+"
-
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
-msgid "Unicode hexadecimal code"
-msgstr "Шестнадцатеричный код Юникод"
-
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
-msgid "Keyboard shortcut in Composer window"
-msgstr "Сочетание клавиш в окне композитора"
-
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
-msgid "Character preview"
-msgstr "Просмотр знака"
-
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
-msgid "Unicode character description"
-msgstr "Описание знака Юникод"
-
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
-msgid "Character tags"
-msgstr "Ключевые слова"
-
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
-msgid "Unicode character category"
-msgstr "Категория знака Юникод"
-
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
-msgid "« Back"
-msgstr "« Назад"
-
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
-msgid "To previously viewed character"
-msgstr "К предыдущему знаку"
-
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
-msgid "Forward »"
-msgstr "Далее »"
-
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
-msgid "To following viewed character"
-msgstr "К следующему знаку"
-
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
-msgid "Re&lated"
-msgstr "&Связанное"
-
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
-msgid "List of related characters"
-msgstr "Список связанных знаков"
-
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
-msgid "&Insert"
-msgstr "&Вставить"
-
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
-msgid "Insert character into decomposed text"
-msgstr "Вставка знака в разобранный текст"
-
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
-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 ""
-"Некоторые знаки использованного языка нельзя разбирать.\n"
-"Для оптимальной разборки вы должны настроить правильный язык."
-
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
-msgid "Select language &automatically according to selected keyboard"
-msgstr "&Автоматически установить язык на основе выбранной клавиатуры"
-
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
-msgid "&Manually select the language from the list below:"
-msgstr "&Вручную выбрать язык со списка:"
-
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
-msgid "Text Language"
-msgstr "Язык текста"
-
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
-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 ""
-"Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
-"После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."
-
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
-msgid "Start ZRCola &automatically on logon"
-msgstr "&Автоматически запустить систему ZRCola при запуске компьютера"
-
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
-msgid "Startup"
-msgstr "Запуск"
-
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:74 zrcolafrm.cpp:129
-#: zrcolagui.cpp:927 zrcolagui.h:114
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: res/zrcolagui.cpp:232 res/zrcolagui.cpp:940 res/zrcolagui.h:119
+#: zrcolaapp.cpp:60 zrcolafrm.cpp:118 zrcolagui.cpp:232 zrcolagui.cpp:943
+#: zrcolagui.h:119 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -452,7 +284,214 @@ msgstr "Запуск"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+#, fuzzy
+msgid "Unicode"
+msgstr "Юникод"
+
+#: res/zrcolagui.cpp:243 zrcolagui.cpp:243
+#, fuzzy
+#| msgid "Warning"
+msgid "PUA Warning"
+msgstr "Предупреждение"
+
+#: res/zrcolagui.cpp:246 zrcolagui.cpp:246
+msgid "Compose"
+msgstr "Составить"
+
+#: res/zrcolagui.cpp:250 zrcolagui.cpp:250
+msgid "Character Catalog"
+msgstr "Список знаков"
+
+#: res/zrcolagui.cpp:254 zrcolagui.cpp:254
+msgid "(De)Composer"
+msgstr "(Де)Композитор"
+
+#: res/zrcolagui.cpp:297 zrcolagui.cpp:297
+msgid "Decomposed Text"
+msgstr "Разобранний текст"
+
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:317
+msgid "Decomposed Unicode Dump"
+msgstr "Дамп разобранного Юнукода"
+
+#: res/zrcolagui.cpp:344 zrcolagui.cpp:344
+msgid "Composed Text"
+msgstr "Составленный текст"
+
+#: res/zrcolagui.cpp:364 zrcolagui.cpp:364
+msgid "Composed Unicode Dump"
+msgstr "Дамп составленного Юникода"
+
+#: res/zrcolagui.cpp:418 zrcolagui.cpp:418
+msgid "Select category to display"
+msgstr "Выделить категории для отображения"
+
+#: res/zrcolagui.cpp:452 zrcolagui.cpp:452
+msgid "Show &All"
+msgstr "Показать &все"
+
+#: res/zrcolagui.cpp:453 zrcolagui.cpp:453
+msgid "Toggle display of less frequent characters"
+msgstr "Переключить отображение редко использованных знаков"
+
+#: res/zrcolagui.cpp:493 zrcolagui.cpp:493
+msgid "&Browse"
+msgstr "&Обзор"
+
+#: res/zrcolagui.cpp:500 zrcolagui.cpp:500
+msgid "Full or partial terms from Unicode character description (in English) to search for"
+msgstr "Полное либо частичное описание знака Юникод (на английском) для поиска"
+
+#: res/zrcolagui.cpp:504 zrcolagui.cpp:504
+msgid "Search Options"
+msgstr "Опции поиска"
+
+#: res/zrcolagui.cpp:505 zrcolagui.cpp:505
+msgid "Shows/hides additional search options"
+msgstr "Показать/скрыть дополнительные опции поиска"
+
+#: res/zrcolagui.cpp:517 zrcolagui.cpp:517
+msgid "List of Unicode character categories to search in"
+msgstr "Список категории Юникод для проведения поиска"
+
+#: res/zrcolagui.cpp:524 zrcolagui.cpp:524
+msgid "All"
+msgstr "Все"
+
+#: res/zrcolagui.cpp:525 zrcolagui.cpp:525
+msgid "Select all categories"
+msgstr "Выбрать все категории"
+
+#: res/zrcolagui.cpp:529 zrcolagui.cpp:529
+msgid "None"
+msgstr "Ничего"
+
+#: res/zrcolagui.cpp:530 zrcolagui.cpp:530
+msgid "Clear category selection"
+msgstr "Очистить выбор категории"
+
+#: res/zrcolagui.cpp:534 zrcolagui.cpp:534
+msgid "Invert"
+msgstr "Обратить"
+
+#: res/zrcolagui.cpp:535 zrcolagui.cpp:535
+msgid "Invert category selection"
+msgstr "Обратить выбор категории"
+
+#: res/zrcolagui.cpp:574 zrcolagui.cpp:574
+msgid "Character search results"
+msgstr "Результаты поиска знаков"
+
+#: res/zrcolagui.cpp:584 zrcolagui.cpp:584
+msgid "Re&cently Used"
+msgstr "&Недавно использованное"
+
+#: res/zrcolagui.cpp:612 zrcolagui.cpp:612
+msgid "List of recently inserted characters"
+msgstr "Список недавно вставленных знаков"
+
+#: res/zrcolagui.cpp:626 zrcolagui.cpp:626
+msgid "Preview"
+msgstr "Просмотр"
+
+#: res/zrcolagui.cpp:631 zrcolagui.cpp:631
+msgid "U+"
+msgstr "U+"
+
+#: res/zrcolagui.cpp:636 zrcolagui.cpp:636
+msgid "Unicode hexadecimal code"
+msgstr "Шестнадцатеричный код Юникод"
+
+#: res/zrcolagui.cpp:641 zrcolagui.cpp:641
+msgid "Keyboard shortcut in Composer window"
+msgstr "Сочетание клавиш в окне композитора"
+
+#: res/zrcolagui.cpp:676 zrcolagui.cpp:676
+msgid "Character preview"
+msgstr "Просмотр знака"
+
+#: res/zrcolagui.cpp:681 zrcolagui.cpp:681
+msgid "Unicode character description"
+msgstr "Описание знака Юникод"
+
+#: res/zrcolagui.cpp:686 zrcolagui.cpp:686
+msgid "Character tags"
+msgstr "Ключевые слова"
+
+#: res/zrcolagui.cpp:691 zrcolagui.cpp:691
+msgid "Unicode character category"
+msgstr "Категория знака Юникод"
+
+#: res/zrcolagui.cpp:698 zrcolagui.cpp:698
+msgid "« Back"
+msgstr "« Назад"
+
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+msgid "To previously viewed character"
+msgstr "К предыдущему знаку"
+
+#: res/zrcolagui.cpp:704 zrcolagui.cpp:704
+msgid "Forward »"
+msgstr "Далее »"
+
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+msgid "To following viewed character"
+msgstr "К следующему знаку"
+
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:717
+msgid "Re&lated"
+msgstr "&Связанное"
+
+#: res/zrcolagui.cpp:744 zrcolagui.cpp:744
+msgid "List of related characters"
+msgstr "Список связанных знаков"
+
+#: res/zrcolagui.cpp:763 zrcolagui.cpp:763
+msgid "&Insert"
+msgstr "&Вставить"
+
+#: res/zrcolagui.cpp:767 zrcolagui.cpp:767
+msgid "Insert character into decomposed text"
+msgstr "Вставка знака в разобранный текст"
+
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:843
+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 ""
+"Некоторые знаки использованного языка нельзя разбирать.\n"
+"Для оптимальной разборки вы должны настроить правильный язык."
+
+#: res/zrcolagui.cpp:844 zrcolagui.cpp:847
+msgid "Select language &automatically according to selected keyboard"
+msgstr "&Автоматически установить язык на основе выбранной клавиатуры"
+
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+msgid "&Manually select the language from the list below:"
+msgstr "&Вручную выбрать язык со списка:"
+
+#: res/zrcolagui.cpp:858 zrcolagui.cpp:861
+msgid "Text Language"
+msgstr "Язык текста"
+
+#: res/zrcolagui.cpp:863 zrcolagui.cpp:866
+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 ""
+"Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
+"После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."
+
+#: res/zrcolagui.cpp:867 zrcolagui.cpp:870
+msgid "Start ZRCola &automatically on logon"
+msgstr "&Автоматически запустить систему ZRCola при запуске компьютера"
+
+#: res/zrcolagui.cpp:873 zrcolagui.cpp:876
+msgid "Startup"
+msgstr "Запуск"
+
+#: res/zrcolagui.cpp:951 zrcolagui.cpp:954
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -466,51 +505,51 @@ msgstr ""
 "Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo Torkar), Анастасия Плотникова\n"
 "Разработка in техническая поддержка первоначальной программы (2004–2015): Петер Вейсс (Peter Weiss)"
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:959 zrcolagui.cpp:962
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:965 zrcolagui.cpp:968
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Текст, созданный с помощью системы ZRCola, должен в примечании или другом соответствующем месте в публикации сопровождаться следующей записью:"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:969 zrcolagui.cpp:972
 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 Peter Weiss."
 msgstr "Текст подготовлен с помощью системы ввода ZRCola (http://zrcola.zrc-sazu.si), разработанной в Научно-исследовательском центре Словенской академии наук и искусств в Любляне (http://www.zrc-sazu.si) Петром Вейссoм."
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 msgid "Log"
 msgstr "Журнал"
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1026 zrcolagui.cpp:1029
 msgid "Quit and &Update..."
 msgstr "Выйти и &обновить ..."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 msgid "Exit this program and launch product update"
 msgstr "Выйти из программы и запустить обновление"
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1032 zrcolagui.cpp:1035
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1033 zrcolagui.cpp:1036
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:49 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1070 zrcolachrreq.cpp:35 zrcolagui.cpp:1073
 msgid "Character"
 msgstr "Знак"
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1072 zrcolagui.cpp:1075
 msgid "Enter the &character you would like to request:"
 msgstr "Ввести запрашиваемый &знак:"
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1089
 msgid "Decomposed character to request"
 msgstr "Запрашиваемый разобранный знак"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 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."
@@ -518,19 +557,19 @@ msgstr ""
 "Пожалуйста, используйте разобранный формат.\n"
 "Для ввода запрашиваемого знака можно использовать сочетания клавиш системы ZRCola либо копировать и вставить знаки из окна для разборки."
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:58 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1098 zrcolachrreq.cpp:44 zrcolagui.cpp:1101
 msgid "Context"
 msgstr "Контекст"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1100 zrcolagui.cpp:1103
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем он нужен:"
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1106 zrcolagui.cpp:1109
 msgid "Additional notes for character request"
 msgstr "Дополнительные примечания"
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1113 zrcolagui.cpp:1116
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
@@ -538,11 +577,11 @@ msgstr ""
 "После нажатия на кнопку «OK» ваша почтовая программа должна открытся для отправки запроса нового знака администратору системы ZRCola.\n"
 "Возможно, не все знаки будут отображены правильно, но все информации будут закодированны таким образом, что администратор сможет их правильно прочитать."
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1158
 msgid "Translation"
 msgstr "Преобразование"
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -550,126 +589,126 @@ msgstr ""
 "ZRCola предоставляет различные преобразования текста, последовательность которых можно свободно изменять.\n"
 "Пожалуйста, выбрать желаемые преобразования и порядок их применения."
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1170
 msgid "A&vailable:"
 msgstr "&Доступное:"
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1182 zrcolagui.cpp:1185
 msgid "→"
 msgstr "→"
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1188
 msgid "←"
 msgstr "←"
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1194 zrcolagui.cpp:1197
 msgid "&Selected:"
 msgstr "&Выбранное:"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1212 zrcolagui.cpp:1215
 msgid "↑"
 msgstr "↑"
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1215 zrcolagui.cpp:1218
 msgid "↓"
 msgstr "↓"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:260 zrcolagui.h:260
 msgid "Character Search"
 msgstr "Поиск знака"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:296 zrcolagui.h:296
 msgid "Settings"
 msgstr "Настройки"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:322 zrcolagui.h:322
 msgid "About ZRCola"
 msgstr "О системе ZRCola"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:347 zrcolagui.h:347 zrcolaupdater.cpp:81
 msgid "Product Update"
 msgstr "Обновление продукта"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:376 zrcolachrreq.cpp:50 zrcolagui.h:376
 msgid "Request a New Character"
 msgstr "Запрос нового знака"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:418 zrcolagui.h:418
 msgid "Custom Translation Sequence"
 msgstr "Настраиваемая последовательность преобразований"
 
-#: zrcolaabout.cpp:31
+#: zrcolaabout.cpp:17
 #, c-format
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004–%s ZRC SAZU"
 
-#: zrcolachrslct.cpp:89
+#: zrcolachrslct.cpp:75
 msgid "Too many digits in Unicode."
 msgstr "Слишком много цифр в записи Unicode."
 
-#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:75 zrcolachrslct.cpp:93
 msgid "Validation conflict"
 msgstr "Конфликт проверки"
 
-#: zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:93
 #, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr "Недействительный знак в записи Unicode: %c"
 
-#: zrcolachrslct.cpp:215 zrcolachrslct.cpp:391 zrcolachrslct.cpp:888
+#: zrcolachrslct.cpp:201 zrcolachrslct.cpp:377 zrcolachrslct.cpp:874
 msgid "▸ Search Options"
 msgstr "▸ Опции поиска"
 
-#: zrcolachrslct.cpp:329
+#: zrcolachrslct.cpp:315
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:394 zrcolachrslct.cpp:885
+#: zrcolachrslct.cpp:380 zrcolachrslct.cpp:871
 msgid "▾ Search Options"
 msgstr "▾ Опции поиска"
 
-#: zrcolafrm.cpp:95
+#: zrcolafrm.cpp:84
 msgid "No Translation"
 msgstr "Без транслитерации"
 
-#: zrcolafrm.cpp:108
+#: zrcolafrm.cpp:97
 msgid "Custom Translation..."
 msgstr "Настраиваемое  преобразование ..."
 
-#: zrcolafrm.cpp:225
+#: zrcolafrm.cpp:217
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "Сочетание клавиш Win+F5 регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:225 zrcolafrm.cpp:227
+#: zrcolafrm.cpp:217 zrcolafrm.cpp:219
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: zrcolafrm.cpp:227
+#: zrcolafrm.cpp:219
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:499
+#: zrcolafrm.cpp:508
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"
 
-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:533
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
-#: zrcolakeyhndlr.cpp:44
+#: zrcolakeyhndlr.cpp:30
 msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr "Нажата клавиша INS. Введите код Юникод желаемого знака (максимум четыре шестнадцатеричныe цифры: 0-9, A-F), затем отпустите клавишу INS."
 
-#: zrcolasettings.cpp:87
+#: zrcolasettings.cpp:73
 msgid "Start ZRCola automatically on logon"
 msgstr "Автоматически запустить систему ZRCola при запуске компьютера"
 
-#: zrcolatranseq.cpp:63
+#: zrcolatranseq.cpp:49
 #, c-format
 msgid "Unknown translation (%u)"
 msgstr "Неизвестное преобразование (%u)"
 
-#: zrcolaupdater.cpp:95
+#: zrcolaupdater.cpp:81
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
@@ -770,6 +809,12 @@ msgstr "Знак можно ввести, употребляя сочетани
 msgid "Input system for linguistic use"
 msgstr "Система ввода ZRCola для лингвистического применения"
 
+#~ msgid "&ZRCola (De)composition"
+#~ msgstr "Составление/разборка &ZRCola "
+
+#~ msgid "ZRCola (De)composition"
+#~ msgstr "ZRCola составление/разборка"
+
 #~ msgid ">"
 #~ msgstr ">"
 
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 3291b01..08ec7fe 100644
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2021-12-10 14:58+0100\n"
-"PO-Revision-Date: 2021-12-10 14:58+0100\n"
+"POT-Creation-Date: 2021-12-20 20:18+0100\n"
+"PO-Revision-Date: 2021-12-20 20:20+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/amebis/teams/91592/sl_SI/)\n"
 "Language: sl_SI\n"
@@ -43,8 +43,8 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:224 zrcolagui.cpp:84
+#: zrcolagui.cpp:224
 msgid "Toggle character search to select character to insert into text"
 msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 
@@ -52,8 +52,8 @@ msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:215 zrcolagui.cpp:90
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:226 zrcolagui.cpp:90
+#: zrcolagui.cpp:226
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
@@ -69,8 +69,8 @@ msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvorne
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:217 zrcolagui.cpp:108
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:228 zrcolagui.cpp:108
+#: zrcolagui.cpp:228
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
@@ -90,355 +90,174 @@ msgstr "Prekini raz/sestavljanje"
 msgid "Abort composition and return focus to source window"
 msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
-#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
-msgid "&ZRCola (De)composition"
-msgstr "(Raz-)Sestavljanje &ZRCola"
+#: res/zrcolagui.cpp:138 zrcolagui.cpp:138
+msgid "(De)&composition"
+msgstr "(&Raz-)sestavljanje"
 
-#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:221 zrcolagui.cpp:136
-#: zrcolagui.cpp:221
-msgid "Toggle ZRCola character (De)composition"
-msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+msgid "&None"
+msgstr "&Brez"
 
-#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
+#: res/zrcolagui.cpp:139 zrcolagui.cpp:139
+msgid "No character (De)composition"
+msgstr "Brez (raz-)sestavljanja znakov"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+msgid "&ZRCola"
+msgstr "&ZRCola"
+
+#: res/zrcolagui.cpp:142 zrcolagui.cpp:142
+msgid "ZRCola character (De)composition"
+msgstr "(Raz-)sestavljanje znakov ZRCola"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+msgid "&Unicode"
+msgstr "&Unicode"
+
+#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+msgid "Unicode character (De)composition"
+msgstr "(Raz-)sestavljanje znakov Unicode"
+
+#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:156 zrcolagui.cpp:156
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"
 
-#: res/zrcolagui.cpp:145 res/zrcolagui.cpp:229 zrcolagui.cpp:145
-#: zrcolagui.cpp:229
+#: res/zrcolagui.cpp:156 res/zrcolagui.cpp:243 zrcolagui.cpp:156
+#: zrcolagui.cpp:243
 msgid "Highlight Private Use Area Characters"
 msgstr "Obarvaj znake iz območja zasebne uporabe"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:165 zrcolagui.cpp:165
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:182 zrcolagui.cpp:182
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:209 zrcolagui.cpp:209
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:224 zrcolagui.cpp:224
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:226 zrcolagui.cpp:226
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:228 zrcolagui.cpp:228
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
-msgid "ZRCola (De)composition"
-msgstr "(Raz-)Sestavljanje ZRCola"
-
-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-msgid "PUA Warning"
-msgstr "Opozorilo OZU"
-
 #: res/zrcolagui.cpp:232 zrcolagui.cpp:232
-msgid "Compose"
-msgstr "Sestavljanje"
+msgid "No (De)composition"
+msgstr "Brez (raz-)sestavljanja"
 
-#: res/zrcolagui.cpp:236 zrcolagui.cpp:236
-msgid "Character Catalog"
-msgstr "Katalog znakov"
-
-#: res/zrcolagui.cpp:240 zrcolagui.cpp:240
-msgid "(De)Composer"
-msgstr "Razstavljalnik/Sestavljalnik"
-
-#: res/zrcolagui.cpp:281 zrcolagui.cpp:281
-msgid "Decomposed Text"
-msgstr "Razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:301 zrcolagui.cpp:301
-msgid "Decomposed Unicode Dump"
-msgstr "Unicode razstavljenega"
-
-#: res/zrcolagui.cpp:328 zrcolagui.cpp:328
-msgid "Composed Text"
-msgstr "Sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:348 zrcolagui.cpp:348
-msgid "Composed Unicode Dump"
-msgstr "Unicode sestavljenega"
-
-#: res/zrcolagui.cpp:402 zrcolagui.cpp:402
-msgid "Select category to display"
-msgstr "Izberi kategorijo za prikaz"
-
-#: res/zrcolagui.cpp:436 zrcolagui.cpp:436
-msgid "Show &All"
-msgstr "Prik&aži vse"
-
-#: res/zrcolagui.cpp:437 zrcolagui.cpp:437
-msgid "Toggle display of less frequent characters"
-msgstr "Prikaži/skrij manj pogoste znake"
-
-#: res/zrcolagui.cpp:477 zrcolagui.cpp:477
-msgid "&Browse"
-msgstr "Pre&brskaj"
-
-#: res/zrcolagui.cpp:484 zrcolagui.cpp:484
-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"
-
-#: res/zrcolagui.cpp:488 zrcolagui.cpp:488
-msgid "Search Options"
-msgstr "Možnosti iskanja"
-
-#: res/zrcolagui.cpp:489 zrcolagui.cpp:489
-msgid "Shows/hides additional search options"
-msgstr "Prikaže/skrije dodatne možnosti iskanja"
-
-#: res/zrcolagui.cpp:501 zrcolagui.cpp:501
-msgid "List of Unicode character categories to search in"
-msgstr "Seznam kategorij znaka Unicode za iskanje"
-
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:508
-msgid "All"
-msgstr "Vse"
-
-#: res/zrcolagui.cpp:509 zrcolagui.cpp:509
-msgid "Select all categories"
-msgstr "Izberi vse kategorije"
-
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:513
-msgid "None"
-msgstr "Nič"
-
-#: res/zrcolagui.cpp:514 zrcolagui.cpp:514
-msgid "Clear category selection"
-msgstr "Počisti izbor kategorij"
-
-#: res/zrcolagui.cpp:518 zrcolagui.cpp:518
-msgid "Invert"
-msgstr "Obrni"
-
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
-msgid "Invert category selection"
-msgstr "Obrni izbor kategorij"
-
-#: res/zrcolagui.cpp:558 zrcolagui.cpp:558
-msgid "Character search results"
-msgstr "Rezultati iskanja znakov"
-
-#: res/zrcolagui.cpp:568 zrcolagui.cpp:568
-msgid "Re&cently Used"
-msgstr "Nedavno &uporabljeni"
-
-#: res/zrcolagui.cpp:596 zrcolagui.cpp:596
-msgid "List of recently inserted characters"
-msgstr "Seznam nedavno vstavljenih znakov"
-
-#: res/zrcolagui.cpp:610 zrcolagui.cpp:610
-msgid "Preview"
-msgstr "Predogled"
-
-#: res/zrcolagui.cpp:615 zrcolagui.cpp:615
-msgid "U+"
-msgstr "U+"
-
-#: res/zrcolagui.cpp:620 zrcolagui.cpp:620
-msgid "Unicode hexadecimal code"
-msgstr "Šestnajstiška koda Unicode"
-
-#: res/zrcolagui.cpp:625 zrcolagui.cpp:625
-msgid "Keyboard shortcut in Composer window"
-msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
-
-#: res/zrcolagui.cpp:660 zrcolagui.cpp:660
-msgid "Character preview"
-msgstr "Predogled znaka"
-
-#: res/zrcolagui.cpp:665 zrcolagui.cpp:665
-msgid "Unicode character description"
-msgstr "Opis znaka Unicode"
-
-#: res/zrcolagui.cpp:670 zrcolagui.cpp:670
-msgid "Character tags"
-msgstr "Oznake znaka"
-
-#: res/zrcolagui.cpp:675 zrcolagui.cpp:675
-msgid "Unicode character category"
-msgstr "Kategorija znaka Unicode"
-
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:682
-msgid "« Back"
-msgstr "« Nazaj"
-
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:684
-msgid "To previously viewed character"
-msgstr "Na prejšnji prikazan znak"
-
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
-msgid "Forward »"
-msgstr "Naprej »"
-
-#: res/zrcolagui.cpp:690 zrcolagui.cpp:690
-msgid "To following viewed character"
-msgstr "Na naslednji prikazan znak"
-
-#: res/zrcolagui.cpp:701 zrcolagui.cpp:701
-msgid "Re&lated"
-msgstr "&Sorodni"
-
-#: res/zrcolagui.cpp:728 zrcolagui.cpp:728
-msgid "List of related characters"
-msgstr "Seznam sorodnih znakov"
-
-#: res/zrcolagui.cpp:747 zrcolagui.cpp:747
-msgid "&Insert"
-msgstr "Vstav&i"
-
-#: res/zrcolagui.cpp:751 zrcolagui.cpp:751
-msgid "Insert character into decomposed text"
-msgstr "Vstavi znak v razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:824 zrcolagui.cpp:827
-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 ""
-"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
-"Za optimalno razstavljanje izberite pravilni jezik."
-
-#: res/zrcolagui.cpp:828 zrcolagui.cpp:831
-msgid "Select language &automatically according to selected keyboard"
-msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
-
-#: res/zrcolagui.cpp:831 zrcolagui.cpp:834
-msgid "&Manually select the language from the list below:"
-msgstr "&Ročno izberi jezik s seznama spodaj:"
-
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
-msgid "Text Language"
-msgstr "Jezik besedila"
-
-#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
-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 ""
-"ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
-"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
-
-#: res/zrcolagui.cpp:851 zrcolagui.cpp:854
-msgid "Start ZRCola &automatically on logon"
-msgstr "S&amodejno zaženi ZRColo ob prijavi"
-
-#: res/zrcolagui.cpp:857 zrcolagui.cpp:860
-msgid "Startup"
-msgstr "Zagon"
-
-#: res/zrcolagui.cpp:924 res/zrcolagui.h:114 zrcolaapp.cpp:60 zrcolafrm.cpp:115
-#: zrcolagui.cpp:927 zrcolagui.h:114
-#: MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
+#: res/zrcolagui.cpp:232 res/zrcolagui.cpp:940 res/zrcolagui.h:119
+#: zrcolaapp.cpp:60 zrcolafrm.cpp:118 zrcolagui.cpp:232 zrcolagui.cpp:943
+#: zrcolagui.h:119 MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.ARM64.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
@@ -447,7 +266,211 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:935 zrcolagui.cpp:938
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+msgid "Unicode"
+msgstr "Unicode"
+
+#: res/zrcolagui.cpp:243 zrcolagui.cpp:243
+msgid "PUA Warning"
+msgstr "Opozorilo OZU"
+
+#: res/zrcolagui.cpp:246 zrcolagui.cpp:246
+msgid "Compose"
+msgstr "Sestavljanje"
+
+#: res/zrcolagui.cpp:250 zrcolagui.cpp:250
+msgid "Character Catalog"
+msgstr "Katalog znakov"
+
+#: res/zrcolagui.cpp:254 zrcolagui.cpp:254
+msgid "(De)Composer"
+msgstr "Razstavljalnik/Sestavljalnik"
+
+#: res/zrcolagui.cpp:297 zrcolagui.cpp:297
+msgid "Decomposed Text"
+msgstr "Razstavljeno besedilo"
+
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:317
+msgid "Decomposed Unicode Dump"
+msgstr "Unicode razstavljenega"
+
+#: res/zrcolagui.cpp:344 zrcolagui.cpp:344
+msgid "Composed Text"
+msgstr "Sestavljeno besedilo"
+
+#: res/zrcolagui.cpp:364 zrcolagui.cpp:364
+msgid "Composed Unicode Dump"
+msgstr "Unicode sestavljenega"
+
+#: res/zrcolagui.cpp:418 zrcolagui.cpp:418
+msgid "Select category to display"
+msgstr "Izberi kategorijo za prikaz"
+
+#: res/zrcolagui.cpp:452 zrcolagui.cpp:452
+msgid "Show &All"
+msgstr "Prik&aži vse"
+
+#: res/zrcolagui.cpp:453 zrcolagui.cpp:453
+msgid "Toggle display of less frequent characters"
+msgstr "Prikaži/skrij manj pogoste znake"
+
+#: res/zrcolagui.cpp:493 zrcolagui.cpp:493
+msgid "&Browse"
+msgstr "Pre&brskaj"
+
+#: res/zrcolagui.cpp:500 zrcolagui.cpp:500
+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"
+
+#: res/zrcolagui.cpp:504 zrcolagui.cpp:504
+msgid "Search Options"
+msgstr "Možnosti iskanja"
+
+#: res/zrcolagui.cpp:505 zrcolagui.cpp:505
+msgid "Shows/hides additional search options"
+msgstr "Prikaže/skrije dodatne možnosti iskanja"
+
+#: res/zrcolagui.cpp:517 zrcolagui.cpp:517
+msgid "List of Unicode character categories to search in"
+msgstr "Seznam kategorij znaka Unicode za iskanje"
+
+#: res/zrcolagui.cpp:524 zrcolagui.cpp:524
+msgid "All"
+msgstr "Vse"
+
+#: res/zrcolagui.cpp:525 zrcolagui.cpp:525
+msgid "Select all categories"
+msgstr "Izberi vse kategorije"
+
+#: res/zrcolagui.cpp:529 zrcolagui.cpp:529
+msgid "None"
+msgstr "Nič"
+
+#: res/zrcolagui.cpp:530 zrcolagui.cpp:530
+msgid "Clear category selection"
+msgstr "Počisti izbor kategorij"
+
+#: res/zrcolagui.cpp:534 zrcolagui.cpp:534
+msgid "Invert"
+msgstr "Obrni"
+
+#: res/zrcolagui.cpp:535 zrcolagui.cpp:535
+msgid "Invert category selection"
+msgstr "Obrni izbor kategorij"
+
+#: res/zrcolagui.cpp:574 zrcolagui.cpp:574
+msgid "Character search results"
+msgstr "Rezultati iskanja znakov"
+
+#: res/zrcolagui.cpp:584 zrcolagui.cpp:584
+msgid "Re&cently Used"
+msgstr "Nedavno &uporabljeni"
+
+#: res/zrcolagui.cpp:612 zrcolagui.cpp:612
+msgid "List of recently inserted characters"
+msgstr "Seznam nedavno vstavljenih znakov"
+
+#: res/zrcolagui.cpp:626 zrcolagui.cpp:626
+msgid "Preview"
+msgstr "Predogled"
+
+#: res/zrcolagui.cpp:631 zrcolagui.cpp:631
+msgid "U+"
+msgstr "U+"
+
+#: res/zrcolagui.cpp:636 zrcolagui.cpp:636
+msgid "Unicode hexadecimal code"
+msgstr "Šestnajstiška koda Unicode"
+
+#: res/zrcolagui.cpp:641 zrcolagui.cpp:641
+msgid "Keyboard shortcut in Composer window"
+msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
+
+#: res/zrcolagui.cpp:676 zrcolagui.cpp:676
+msgid "Character preview"
+msgstr "Predogled znaka"
+
+#: res/zrcolagui.cpp:681 zrcolagui.cpp:681
+msgid "Unicode character description"
+msgstr "Opis znaka Unicode"
+
+#: res/zrcolagui.cpp:686 zrcolagui.cpp:686
+msgid "Character tags"
+msgstr "Oznake znaka"
+
+#: res/zrcolagui.cpp:691 zrcolagui.cpp:691
+msgid "Unicode character category"
+msgstr "Kategorija znaka Unicode"
+
+#: res/zrcolagui.cpp:698 zrcolagui.cpp:698
+msgid "« Back"
+msgstr "« Nazaj"
+
+#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
+msgid "To previously viewed character"
+msgstr "Na prejšnji prikazan znak"
+
+#: res/zrcolagui.cpp:704 zrcolagui.cpp:704
+msgid "Forward »"
+msgstr "Naprej »"
+
+#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
+msgid "To following viewed character"
+msgstr "Na naslednji prikazan znak"
+
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:717
+msgid "Re&lated"
+msgstr "&Sorodni"
+
+#: res/zrcolagui.cpp:744 zrcolagui.cpp:744
+msgid "List of related characters"
+msgstr "Seznam sorodnih znakov"
+
+#: res/zrcolagui.cpp:763 zrcolagui.cpp:763
+msgid "&Insert"
+msgstr "Vstav&i"
+
+#: res/zrcolagui.cpp:767 zrcolagui.cpp:767
+msgid "Insert character into decomposed text"
+msgstr "Vstavi znak v razstavljeno besedilo"
+
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:843
+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 ""
+"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
+"Za optimalno razstavljanje izberite pravilni jezik."
+
+#: res/zrcolagui.cpp:844 zrcolagui.cpp:847
+msgid "Select language &automatically according to selected keyboard"
+msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
+
+#: res/zrcolagui.cpp:847 zrcolagui.cpp:850
+msgid "&Manually select the language from the list below:"
+msgstr "&Ročno izberi jezik s seznama spodaj:"
+
+#: res/zrcolagui.cpp:858 zrcolagui.cpp:861
+msgid "Text Language"
+msgstr "Jezik besedila"
+
+#: res/zrcolagui.cpp:863 zrcolagui.cpp:866
+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 ""
+"ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
+"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
+
+#: res/zrcolagui.cpp:867 zrcolagui.cpp:870
+msgid "Start ZRCola &automatically on logon"
+msgstr "S&amodejno zaženi ZRColo ob prijavi"
+
+#: res/zrcolagui.cpp:873 zrcolagui.cpp:876
+msgid "Startup"
+msgstr "Zagon"
+
+#: res/zrcolagui.cpp:951 zrcolagui.cpp:954
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -461,51 +484,51 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: res/zrcolagui.cpp:943 zrcolagui.cpp:946
+#: res/zrcolagui.cpp:959 zrcolagui.cpp:962
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:949 zrcolagui.cpp:952
+#: res/zrcolagui.cpp:965 zrcolagui.cpp:968
 msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: res/zrcolagui.cpp:969 zrcolagui.cpp:972
 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 Peter Weiss."
 msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: res/zrcolagui.cpp:994 zrcolagui.cpp:997
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
+#: res/zrcolagui.cpp:1026 zrcolagui.cpp:1029
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1016 zrcolagui.cpp:1019
+#: res/zrcolagui.cpp:1032 zrcolagui.cpp:1035
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1017 zrcolagui.cpp:1020
+#: res/zrcolagui.cpp:1033 zrcolagui.cpp:1036
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1054 zrcolachrreq.cpp:35 zrcolagui.cpp:1057
+#: res/zrcolagui.cpp:1070 zrcolachrreq.cpp:35 zrcolagui.cpp:1073
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1056 zrcolagui.cpp:1059
+#: res/zrcolagui.cpp:1072 zrcolagui.cpp:1075
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1070 zrcolagui.cpp:1073
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1089
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
 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."
@@ -513,19 +536,19 @@ msgstr ""
 "Uporabite razstavljeno obliko.\n"
 "Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: res/zrcolagui.cpp:1082 zrcolachrreq.cpp:44 zrcolagui.cpp:1085
+#: res/zrcolagui.cpp:1098 zrcolachrreq.cpp:44 zrcolagui.cpp:1101
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1087
+#: res/zrcolagui.cpp:1100 zrcolagui.cpp:1103
 msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: res/zrcolagui.cpp:1090 zrcolagui.cpp:1093
+#: res/zrcolagui.cpp:1106 zrcolagui.cpp:1109
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1097 zrcolagui.cpp:1100
+#: res/zrcolagui.cpp:1113 zrcolagui.cpp:1116
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
@@ -533,11 +556,11 @@ msgstr ""
 "Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
 "Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
 
-#: res/zrcolagui.cpp:1139 zrcolagui.cpp:1142
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1158
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1141 zrcolagui.cpp:1144
+#: res/zrcolagui.cpp:1157 zrcolagui.cpp:1160
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -545,51 +568,51 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1151 zrcolagui.cpp:1154
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1170
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1166 zrcolagui.cpp:1169
+#: res/zrcolagui.cpp:1182 zrcolagui.cpp:1185
 msgid "→"
 msgstr "→"
 
-#: res/zrcolagui.cpp:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1188
 msgid "←"
 msgstr "←"
 
-#: res/zrcolagui.cpp:1178 zrcolagui.cpp:1181
+#: res/zrcolagui.cpp:1194 zrcolagui.cpp:1197
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1212 zrcolagui.cpp:1215
 msgid "↑"
 msgstr "↑"
 
-#: res/zrcolagui.cpp:1199 zrcolagui.cpp:1202
+#: res/zrcolagui.cpp:1215 zrcolagui.cpp:1218
 msgid "↓"
 msgstr "↓"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:260 zrcolagui.h:260
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:296 zrcolagui.h:296
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:322 zrcolagui.h:322
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:81
+#: res/zrcolagui.h:347 zrcolagui.h:347 zrcolaupdater.cpp:81
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:50 zrcolagui.h:371
+#: res/zrcolagui.h:376 zrcolachrreq.cpp:50 zrcolagui.h:376
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:418 zrcolagui.h:418
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
 
@@ -623,31 +646,31 @@ msgstr ", "
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:81
+#: zrcolafrm.cpp:84
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:94
+#: zrcolafrm.cpp:97
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:211
+#: zrcolafrm.cpp:217
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:211 zrcolafrm.cpp:213
+#: zrcolafrm.cpp:217 zrcolafrm.cpp:219
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:213
+#: zrcolafrm.cpp:219
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:485
+#: zrcolafrm.cpp:508
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:510
+#: zrcolafrm.cpp:533
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
@@ -765,6 +788,12 @@ msgstr "Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovni
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
 
+#~ msgid "&ZRCola (De)composition"
+#~ msgstr "(Raz-)Sestavljanje &ZRCola"
+
+#~ msgid "ZRCola (De)composition"
+#~ msgstr "(Raz-)Sestavljanje ZRCola"
+
 #~ msgid "Composed Text &Font..."
 #~ msgstr "&Pisava sestavljenega besedila ..."
 
diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp
index 608460a..a999fa0 100644
--- a/ZRCola/res/ZRCola.fbp
+++ b/ZRCola/res/ZRCola.fbp
@@ -247,18 +247,50 @@
                         <property name="name">separator4</property>
                         <property name="permission">none</property>
                     </object>
-                    <object class="wxMenuItem" expanded="0">
+                    <object class="submenu" expanded="0">
                         <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help">Toggle ZRCola character (De)composition</property>
-                        <property name="id">wxID_COMPOSITION</property>
-                        <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">&amp;ZRCola (De)composition</property>
-                        <property name="name">m_menuItemComposition</property>
-                        <property name="permission">protected</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
+                        <property name="label">(De)&amp;composition</property>
+                        <property name="name">m_menuComposition</property>
+                        <property name="permission">none</property>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">No character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_NONE</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;None</property>
+                            <property name="name">m_menuItemCompositionNone</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">ZRCola character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_ZRCOLA</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;ZRCola</property>
+                            <property name="name">m_menuItemCompositionZRCola</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
+                        <object class="wxMenuItem" expanded="0">
+                            <property name="bitmap"></property>
+                            <property name="checked">0</property>
+                            <property name="enabled">1</property>
+                            <property name="help">Unicode character (De)composition</property>
+                            <property name="id">wxID_COMPOSITION_UNICODE</property>
+                            <property name="kind">wxITEM_RADIO</property>
+                            <property name="label">&amp;Unicode</property>
+                            <property name="name">m_menuItemCompositionUnicode</property>
+                            <property name="permission">protected</property>
+                            <property name="shortcut"></property>
+                            <property name="unchecked_bitmap"></property>
+                        </object>
                     </object>
                     <object class="submenu" expanded="0">
                         <property name="bitmap"></property>
@@ -616,16 +648,65 @@
                 <object class="toolSeparator" expanded="0">
                     <property name="permission">protected</property>
                 </object>
-                <object class="tool" expanded="0">
-                    <property name="bitmap">Load From Icon Resource; composition.ico; [24; 24]</property>
-                    <property name="context_menu">0</property>
-                    <property name="id">wxID_COMPOSITION</property>
-                    <property name="kind">wxITEM_CHECK</property>
-                    <property name="label">ZRCola (De)composition</property>
+                <object class="wxChoice" expanded="0">
+                    <property name="BottomDockable">1</property>
+                    <property name="LeftDockable">1</property>
+                    <property name="RightDockable">1</property>
+                    <property name="TopDockable">1</property>
+                    <property name="aui_layer"></property>
+                    <property name="aui_name"></property>
+                    <property name="aui_position"></property>
+                    <property name="aui_row"></property>
+                    <property name="best_size"></property>
+                    <property name="bg"></property>
+                    <property name="caption"></property>
+                    <property name="caption_visible">1</property>
+                    <property name="center_pane">0</property>
+                    <property name="choices">&quot;None&quot; &quot;ZRCola&quot; &quot;Unicode&quot;</property>
+                    <property name="close_button">1</property>
+                    <property name="context_help"></property>
+                    <property name="context_menu">1</property>
+                    <property name="default_pane">0</property>
+                    <property name="dock">Dock</property>
+                    <property name="dock_fixed">0</property>
+                    <property name="docking">Left</property>
+                    <property name="enabled">1</property>
+                    <property name="fg"></property>
+                    <property name="floatable">1</property>
+                    <property name="font"></property>
+                    <property name="gripper">0</property>
+                    <property name="hidden">0</property>
+                    <property name="id">wxID_ANY</property>
+                    <property name="max_size"></property>
+                    <property name="maximize_button">0</property>
+                    <property name="maximum_size"></property>
+                    <property name="min_size"></property>
+                    <property name="minimize_button">0</property>
+                    <property name="minimum_size">-1,-1</property>
+                    <property name="moveable">1</property>
                     <property name="name">m_toolComposition</property>
+                    <property name="pane_border">1</property>
+                    <property name="pane_position"></property>
+                    <property name="pane_size"></property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Toggle ZRCola character (De)composition</property>
-                    <property name="tooltip">ZRCola (De)composition</property>
+                    <property name="pin_button">1</property>
+                    <property name="pos"></property>
+                    <property name="resize">Resizable</property>
+                    <property name="selection">0</property>
+                    <property name="show">1</property>
+                    <property name="size">120,-1</property>
+                    <property name="style"></property>
+                    <property name="subclass"></property>
+                    <property name="toolbar_pane">0</property>
+                    <property name="tooltip"></property>
+                    <property name="validator_data_type"></property>
+                    <property name="validator_style">wxFILTER_NONE</property>
+                    <property name="validator_type">wxDefaultValidator</property>
+                    <property name="validator_variable"></property>
+                    <property name="window_extra_style"></property>
+                    <property name="window_name"></property>
+                    <property name="window_style"></property>
+                    <event name="OnChoice">OnCompositionChoice</event>
                 </object>
                 <object class="wxChoice" expanded="0">
                     <property name="BottomDockable">1</property>
@@ -673,7 +754,7 @@
                     <property name="resize">Resizable</property>
                     <property name="selection">0</property>
                     <property name="show">1</property>
-                    <property name="size">240,-1</property>
+                    <property name="size">180,-1</property>
                     <property name="style"></property>
                     <property name="subclass"></property>
                     <property name="toolbar_pane">0</property>
diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp
index cfbd0cc..673ed25 100644
--- a/ZRCola/res/zrcolagui.cpp
+++ b/ZRCola/res/zrcolagui.cpp
@@ -133,8 +133,19 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
-	m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK );
-	m_menuEdit->Append( m_menuItemComposition );
+	wxMenu* m_menuComposition;
+	m_menuComposition = new wxMenu();
+	wxMenuItem* m_menuCompositionItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("(De)&composition"), wxEmptyString, wxITEM_NORMAL, m_menuComposition );
+	m_menuItemCompositionNone = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_NONE, wxString( _("&None") ) , _("No character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionNone );
+
+	m_menuItemCompositionZRCola = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_ZRCOLA, wxString( _("&ZRCola") ) , _("ZRCola character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionZRCola );
+
+	m_menuItemCompositionUnicode = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_UNICODE, wxString( _("&Unicode") ) , _("Unicode character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionUnicode );
+
+	m_menuEdit->Append( m_menuCompositionItem );
 
 	m_menuTranslationSeq = new wxMenu();
 	wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq );
@@ -218,10 +229,13 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_toolbarTranslate->AddSeparator();
 
-	m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL );
-
+	wxString m_toolCompositionChoices[] = { _("No (De)composition"), _("ZRCola"), _("Unicode") };
+	int m_toolCompositionNChoices = sizeof( m_toolCompositionChoices ) / sizeof( wxString );
+	m_toolComposition = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 120,-1 ), m_toolCompositionNChoices, m_toolCompositionChoices, 0 );
+	m_toolComposition->SetSelection( 0 );
+	m_toolbarTranslate->AddControl( m_toolComposition );
 	wxArrayString m_toolTranslationSeqChoices;
-	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 240,-1 ), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 180,-1 ), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
 	m_toolbarTranslate->AddSeparator();
@@ -248,6 +262,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 }
 
@@ -257,6 +272,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 
 	m_mgr.UnInit();
diff --git a/ZRCola/res/zrcolagui.h b/ZRCola/res/zrcolagui.h
index c4a3782..356d093 100644
--- a/ZRCola/res/zrcolagui.h
+++ b/ZRCola/res/zrcolagui.h
@@ -67,7 +67,9 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
@@ -82,7 +84,9 @@ class wxZRColaFrameBase : public wxFrame
 		wxMenuBar* m_menubar;
 		wxMenu* m_menuProgram;
 		wxMenu* m_menuEdit;
-		wxMenuItem* m_menuItemComposition;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
 		wxMenu* m_menuTranslationSeq;
 		wxMenuItem* m_menuItemWarnPUA;
 		wxMenu* m_menuView;
@@ -95,7 +99,7 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
-		wxAuiToolBarItem* m_toolComposition;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
@@ -105,6 +109,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
 
 
diff --git a/ZRCola/zrcolacomppnl.cpp b/ZRCola/zrcolacomppnl.cpp
index 4dae299..8049357 100644
--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -95,10 +95,10 @@ void wxZRColaComposerPanel::SynchronizePanels()
 
         if (app->m_mainWnd->m_composition) {
             // ZRCola decompose first, then re-compose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSETID_DEFAULT, dst.data(), dst.size(), dst2, &map);
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), dst2, &map);
             m_mapping.push_back(std::move(map));
 
-            app->m_t_db.Translate(ZRCOLA_TRANSETID_DEFAULT, dst2.data(), dst2.size(), dst, &map);
+            app->m_t_db.Translate(app->m_mainWnd->m_composition_id, dst2.data(), dst2.size(), dst, &map);
             m_mapping.push_back(std::move(map));
         }
 
@@ -150,7 +150,7 @@ void wxZRColaComposerPanel::SynchronizePanels()
 
         if (app->m_mainWnd->m_composition) {
             // ZRCola decompose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSETID_DEFAULT, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
+            app->m_t_db.TranslateInv(app->m_mainWnd->m_composition_id, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
             dst = std::move(dst2);
 
             map.invert();
diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp
index d089cc6..7b57bd5 100644
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -28,7 +28,9 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_MENU           (wxID_SEND_SOURCE                                      , wxZRColaFrame::OnSendSource                 )
     EVT_MENU           (wxID_SEND_ABORT                                       , wxZRColaFrame::OnSendAbort                  )
 
-    EVT_MENU           (wxID_COMPOSITION                                      , wxZRColaFrame::OnComposition                )
+    EVT_MENU           (wxID_COMPOSITION_NONE                                 , wxZRColaFrame::OnCompositionNone            )
+    EVT_MENU           (wxID_COMPOSITION_ZRCOLA                               , wxZRColaFrame::OnCompositionZRCola          )
+    EVT_MENU           (wxID_COMPOSITION_UNICODE                              , wxZRColaFrame::OnCompositionUnicode         )
     EVT_MENU           (wxID_WARN_PUA                                         , wxZRColaFrame::OnWarnPUA                    )
     EVT_MENU_RANGE     (wxID_TRANSLATION_SEQ_DEFAULT, wxID_TRANSLATION_SEQ_END, wxZRColaFrame::OnTranslationSeqMenu         )
 
@@ -61,6 +63,7 @@ wxZRColaFrame::wxZRColaFrame() :
     m_settings(NULL),
     m_chrReq(NULL),
     m_composition(true),
+    m_composition_id(ZRCOLA_TRANSETID_DEFAULT),
     m_warnPUA(false),
     m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
     m_transeq(NULL),
@@ -174,12 +177,15 @@ wxZRColaFrame::wxZRColaFrame() :
     persist_mgr.RegisterAndRestore(this, new wxPersistentZRColaFrame(this));
 
     // Update (de)composition selection.
-    if (m_composition) {
-        m_menuItemComposition->Check(true);
-        m_toolComposition->SetState(m_toolComposition->GetState() | wxAUI_BUTTON_STATE_CHECKED);
+    if (m_composition && m_composition_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (m_composition && m_composition_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
     } else {
-        m_menuItemComposition->Check(false);
-        m_toolComposition->SetState(m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED);
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
     }
 
     if (m_warnPUA) {
@@ -338,21 +344,43 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
 }
 
 
-void wxZRColaFrame::OnComposition(wxCommandEvent& event)
+void wxZRColaFrame::OnCompositionNone(wxCommandEvent& event)
 {
-    m_composition = !m_composition;
-    m_menuItemComposition->Check(m_composition);
-    m_toolComposition->SetState((m_toolComposition->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_composition ? wxAUI_BUTTON_STATE_CHECKED : 0));
+    DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT);
     m_toolbarTranslate->Refresh();
 
-    // Notify source text something changed and should re-translate.
-    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
-    m_panel->m_source->ProcessWindowEvent(event2);
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionZRCola(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT);
+    m_toolbarTranslate->Refresh();
 
     event.Skip();
 }
 
 
+void wxZRColaFrame::OnCompositionUnicode(wxCommandEvent& event)
+{
+    DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE);
+    m_toolbarTranslate->Refresh();
+
+    event.Skip();
+}
+
+
+void wxZRColaFrame::OnCompositionChoice(wxCommandEvent& event)
+{
+    switch (event.GetSelection()) {
+    case 0: DoSetComposition(false, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 1: DoSetComposition(true, ZRCOLA_TRANSETID_DEFAULT); break;
+    case 2: DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE); break;
+    }
+}
+
+
 void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
 {
     m_warnPUA = !m_warnPUA;
@@ -644,6 +672,30 @@ void wxZRColaFrame::DoCopyAndReturn(const wxString& str)
 }
 
 
+void wxZRColaFrame::DoSetComposition(bool enable, ZRCola::transetid_t transet_id)
+{
+    if (enable && transet_id == ZRCOLA_TRANSETID_DEFAULT) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_DEFAULT;
+        m_menuItemCompositionZRCola->Check(true);
+        m_toolComposition->Select(1);
+    } else if (enable && transet_id == ZRCOLA_TRANSETID_UNICODE) {
+        m_composition = true;
+        m_composition_id = ZRCOLA_TRANSETID_UNICODE;
+        m_menuItemCompositionUnicode->Check(true);
+        m_toolComposition->Select(2);
+    } else {
+        m_composition = false;
+        m_menuItemCompositionNone->Check(true);
+        m_toolComposition->Select(0);
+    }
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_source->ProcessWindowEvent(event2);
+}
+
+
 void wxZRColaFrame::DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id)
 {
     if (transeq_id == ZRCOLA_TRANSEQID_CUSTOM) {
@@ -744,6 +796,7 @@ void wxPersistentZRColaFrame::Save() const
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("composition"), wnd->m_composition);
+    SaveValue(wxT("compositionId"), static_cast<int>(wnd->m_composition_id));
     SaveValue(wxT("warnPUA"), wnd->m_warnPUA);
     SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
 
@@ -768,6 +821,8 @@ bool wxPersistentZRColaFrame::Restore()
         wnd->m_composition = b;
     else
         wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
+    if (RestoreValue(wxT("compositionId"), &num))
+        wnd->m_composition_id = (ZRCola::transetid_t)num;
     if (RestoreValue(wxT("warnPUA"), &b))
         wnd->m_warnPUA = b;
     else
diff --git a/ZRCola/zrcolafrm.h b/ZRCola/zrcolafrm.h
index 602489b..ba5d99c 100644
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -76,7 +76,10 @@ protected:
     void OnSendSource(wxCommandEvent& event);
     void OnCopySourceAndReturn(wxCommandEvent& event);
     void OnSendAbort(wxCommandEvent& event);
-    void OnComposition(wxCommandEvent& event);
+    void OnCompositionNone(wxCommandEvent& event);
+    void OnCompositionZRCola(wxCommandEvent& event);
+    void OnCompositionUnicode(wxCommandEvent& event);
+    virtual void OnCompositionChoice(wxCommandEvent& event);
     void OnWarnPUA(wxCommandEvent& event);
     void OnSettings(wxCommandEvent& event);
     virtual void OnIdle(wxIdleEvent& event);
@@ -117,6 +120,7 @@ protected:
 private:
     void DoSend(const wxString& str);
     void DoCopyAndReturn(const wxString& str);
+    void DoSetComposition(bool enable, ZRCola::transetid_t transet_id);
     void DoSetTranslationSeq(int idx, ZRCola::transeqid_t transeq_id);
 
 protected:
@@ -128,16 +132,17 @@ protected:
     static const int s_guiLevel;        ///< Persisted placements/sizing are considered incompatible between different GUI levels
 
 protected:
-    WXHWND m_hWndSource;                ///< Handle of the active window, when the ZRCola hotkey was pressed
-    bool m_wasIconised;                 ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
-    wxTaskBarIcon *m_taskBarIcon;       ///< Taskbar icon
-    wxZRColaCharSelect *m_chrSelect;    ///< Character selection dialog
-    wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
-    wxZRColaSettings *m_settings;       ///< Configuration dialog
-    bool m_composition;                 ///< Is (de)composition enabled?
-    bool m_warnPUA;                     ///< Mark Private-Use-Area characters in destination text
-    ZRCola::transeqid_t m_transeq_id;   ///< Translation sequence ID
-    wxZRColaTranslationSeq *m_transeq;  ///< Custom translation sequence dialog
+    WXHWND m_hWndSource;                    ///< Handle of the active window, when the ZRCola hotkey was pressed
+    bool m_wasIconised;                     ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
+    wxTaskBarIcon *m_taskBarIcon;           ///< Taskbar icon
+    wxZRColaCharSelect *m_chrSelect;        ///< Character selection dialog
+    wxZRColaCharRequest *m_chrReq;          ///< Request a New Character dialog
+    wxZRColaSettings *m_settings;           ///< Configuration dialog
+    bool m_composition;                     ///< Is (de)composition enabled?
+    ZRCola::transetid_t m_composition_id;   ///< Which (de)composition is enabled
+    bool m_warnPUA;                         ///< Mark Private-Use-Area characters in destination text
+    ZRCola::transeqid_t m_transeq_id;       ///< Translation sequence ID
+    wxZRColaTranslationSeq *m_transeq;      ///< Custom translation sequence dialog
 };
 
 
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index 8609b8b..b4dad76 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -133,8 +133,19 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_menuEdit->AppendSeparator();
 
-	m_menuItemComposition = new wxMenuItem( m_menuEdit, wxID_COMPOSITION, wxString( _("&ZRCola (De)composition") ) , _("Toggle ZRCola character (De)composition"), wxITEM_CHECK );
-	m_menuEdit->Append( m_menuItemComposition );
+	wxMenu* m_menuComposition;
+	m_menuComposition = new wxMenu();
+	wxMenuItem* m_menuCompositionItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("(De)&composition"), wxEmptyString, wxITEM_NORMAL, m_menuComposition );
+	m_menuItemCompositionNone = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_NONE, wxString( _("&None") ) , _("No character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionNone );
+
+	m_menuItemCompositionZRCola = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_ZRCOLA, wxString( _("&ZRCola") ) , _("ZRCola character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionZRCola );
+
+	m_menuItemCompositionUnicode = new wxMenuItem( m_menuComposition, wxID_COMPOSITION_UNICODE, wxString( _("&Unicode") ) , _("Unicode character (De)composition"), wxITEM_RADIO );
+	m_menuComposition->Append( m_menuItemCompositionUnicode );
+
+	m_menuEdit->Append( m_menuCompositionItem );
 
 	m_menuTranslationSeq = new wxMenu();
 	wxMenuItem* m_menuTranslationSeqItem = new wxMenuItem( m_menuEdit, wxID_ANY, _("Tra&nslation"), wxEmptyString, wxITEM_NORMAL, m_menuTranslationSeq );
@@ -218,10 +229,13 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 
 	m_toolbarTranslate->AddSeparator();
 
-	m_toolComposition = m_toolbarTranslate->AddTool( wxID_COMPOSITION, _("ZRCola (De)composition"), wxIcon( wxT("composition.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("ZRCola (De)composition"), _("Toggle ZRCola character (De)composition"), NULL );
-
+	wxString m_toolCompositionChoices[] = { _("No (De)composition"), _("ZRCola"), _("Unicode") };
+	int m_toolCompositionNChoices = sizeof( m_toolCompositionChoices ) / sizeof( wxString );
+	m_toolComposition = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 120,-1 )), m_toolCompositionNChoices, m_toolCompositionChoices, 0 );
+	m_toolComposition->SetSelection( 0 );
+	m_toolbarTranslate->AddControl( m_toolComposition );
 	wxArrayString m_toolTranslationSeqChoices;
-	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 240,-1 )), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, FromDIP(wxSize( 180,-1 )), m_toolTranslationSeqChoices, 0 );
 	m_toolTranslationSeq->SetSelection( 0 );
 	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
 	m_toolbarTranslate->AddSeparator();
@@ -248,6 +262,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 }
 
@@ -257,6 +272,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolComposition->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnCompositionChoice ), NULL, this );
 	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 
 	m_mgr.UnInit();
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index 2699f64..bec64ca 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -67,7 +67,9 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
@@ -82,7 +84,9 @@ class wxZRColaFrameBase : public wxFrame
 		wxMenuBar* m_menubar;
 		wxMenu* m_menuProgram;
 		wxMenu* m_menuEdit;
-		wxMenuItem* m_menuItemComposition;
+		wxMenuItem* m_menuItemCompositionNone;
+		wxMenuItem* m_menuItemCompositionZRCola;
+		wxMenuItem* m_menuItemCompositionUnicode;
 		wxMenu* m_menuTranslationSeq;
 		wxMenuItem* m_menuItemWarnPUA;
 		wxMenu* m_menuView;
@@ -95,7 +99,7 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
-		wxAuiToolBarItem* m_toolComposition;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
@@ -105,6 +109,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnCompositionChoice( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
 
 
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index fa18694..7cd3d8b 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -413,6 +413,31 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
+    {
+        com_obj<ADORecordset> rs_tran;
+        if (src.SelectTranslations(static_cast<short>(ZRCOLA_TRANSETID_UNICODE), rs_tran)) {
+            if (src.GetRecordsetCount(rs_tran) < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                // Parse translations and build temporary database.
+                ZRCola::DBSource::translation trans;
+                trans.set = (short)ZRCOLA_TRANSETID_UNICODE;
+                for (; !ZRCola::DBSource::IsEOF(rs_tran); rs_tran->MoveNext()) {
+                    // Read translation from the database.
+                    if (src.GetTranslation(rs_tran, trans)) {
+                        // Add translation to index and data.
+                        db_trans << trans;
+                    } else
+                        has_errors = true;
+                }
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0004: Error getting Unicode translation count from database or too many translations.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0003: Error getting Unicode translations from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
     {
         // Get translation sets.
         com_obj<ADORecordset> rs;
@@ -428,7 +453,7 @@ int _tmain(int argc, _TCHAR *argv[])
                     // Read translation set from the database.
                     ZRCola::DBSource::transet ts;
                     if (src.GetTranslationSet(rs, ts)) {
-                        if (ts.set <= (short)ZRCOLA_TRANSETID_DEFAULT)
+                        if (ts.set <= (short)ZRCOLA_TRANSETID_DEFAULT || (short)ZRCOLA_TRANSETID_UNICODE <= ts.set)
                             continue;
 
                         if (build_pot) {
diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h
index 4a892e4..05210c8 100644
--- a/lib/libZRCola/include/zrcola/translate.h
+++ b/lib/libZRCola/include/zrcola/translate.h
@@ -25,6 +25,11 @@
 ///
 #define ZRCOLA_TRANSETID_DEFAULT    ((ZRCola::transetid_t)0x0000)
 
+///
+/// ZRCola to Unicode translation ID
+///
+#define ZRCOLA_TRANSETID_UNICODE    ((ZRCola::transetid_t)0x7fff)
+
 ///
 /// Translation disabled/ZRCola (De)Composition
 ///
diff --git a/output/data/ZRCola.zrcdb b/output/data/ZRCola.zrcdb
index de945f8..e5dd6ad 100644
Binary files a/output/data/ZRCola.zrcdb and b/output/data/ZRCola.zrcdb differ