Set version to 2.5.5

Signed-off-by: Simon Rozman <simon@rozman.si>
Introduce bad ZRCola Unicode Composition highlighting
2021-12-21 14:22:35 +01:00 · 2021-12-21 14:21:28 +01:00 · 2021-12-20 20:23:36 +01:00 · 2021-12-20 19:49:29 +01:00 · 2021-12-17 14:36:55 +01:00 · 2021-12-13 14:37:59 +01:00
32 changed files with 2332 additions and 1858 deletions
--- a/ZRCola/locale/ZRCola.pot
+++ b/ZRCola/locale/ZRCola.pot
--- 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-21 14:17+0100\n"
+"PO-Revision-Date: 2021-12-21 14:17+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:513
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"

-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:538
 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?"
--- 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-21 14:17+0100\n"
+"PO-Revision-Date: 2021-12-21 14:17+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:513
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"

-#: zrcolafrm.cpp:524
+#: zrcolafrm.cpp:538
 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 ">"

--- 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-11-26 16:48+0100\n"
-"PO-Revision-Date: 2021-11-26 16:49+0100\n"
+"POT-Creation-Date: 2021-12-21 14:17+0100\n"
+"PO-Revision-Date: 2021-12-21 14:17+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:221 zrcolagui.cpp:84
-#: zrcolagui.cpp:221
+#: 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:223 zrcolagui.cpp:90
-#: zrcolagui.cpp:223
+#: 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:225 zrcolagui.cpp:108
-#: zrcolagui.cpp:225
+#: 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,372 +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:229 zrcolagui.cpp:136
-#: zrcolagui.cpp:229
-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:146 zrcolagui.cpp:146
-msgid "Composed Text &Font..."
-msgstr "&Pisava sestavljenega besedila ..."
-
-#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
-msgid "Select font for composed text"
-msgstr "Izberi pisavo za sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
+#: res/zrcolagui.cpp:156 zrcolagui.cpp:156
 msgid "&PUA Warning"
 msgstr "O&pozorilo OZU"

-#: res/zrcolagui.cpp:149 res/zrcolagui.cpp:245 zrcolagui.cpp:149
-#: zrcolagui.cpp:245
+#: 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:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "&Settings..."
 msgstr "Na&stavitve ..."

-#: res/zrcolagui.cpp:155 zrcolagui.cpp:155
+#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"

-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:165 zrcolagui.cpp:165
 msgid "&Edit"
 msgstr "Ur&edi"

-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"

-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:169 zrcolagui.cpp:169
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"

-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"

-#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#: res/zrcolagui.cpp:173 zrcolagui.cpp:173
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"

-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
-msgid "Composed &Text Toolbar"
-msgstr "Orodna vrs&tica sestavljenega besedila"
-
-#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
-msgid "Toggle composed text toolbar"
-msgstr "Prikaži/skrij orodno vrstico sestavljenega besedila"
-
-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"

-#: res/zrcolagui.cpp:176 zrcolagui.cpp:176
+#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"

-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:182 zrcolagui.cpp:182
 msgid "&View"
 msgstr "Po&gled"

-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: res/zrcolagui.cpp:186 zrcolagui.cpp:186
 msgid "&Instructions..."
 msgstr "Navod&ila ..."

-#: res/zrcolagui.cpp:183 zrcolagui.cpp:183
+#: 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:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."

-#: res/zrcolagui.cpp:187 zrcolagui.cpp:187
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"

-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: res/zrcolagui.cpp:196 zrcolagui.cpp:196
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."

-#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#: 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:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."

-#: res/zrcolagui.cpp:197 zrcolagui.cpp:197
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"

-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
 msgid "&About..."
 msgstr "O progr&amu ..."

-#: res/zrcolagui.cpp:206 zrcolagui.cpp:206
+#: res/zrcolagui.cpp:209 zrcolagui.cpp:209
 msgid "&Help"
 msgstr "Po&moč"

-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut"
 msgstr "Izreži"

-#: res/zrcolagui.cpp:211 zrcolagui.cpp:211
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:214
 msgid "Cut selection"
 msgstr "Izreži izbor"

-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy"
 msgstr "Kopiraj"

-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:216 zrcolagui.cpp:216
 msgid "Copy selection"
 msgstr "Kopiraj izbor"

-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste"
 msgstr "Prilepi"

-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
 msgid "Paste selection"
 msgstr "Prilepi izbor"

-#: res/zrcolagui.cpp:218 zrcolagui.cpp:218
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
 msgid "Edit"
 msgstr "Urejanje"

-#: res/zrcolagui.cpp:221 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:224 zrcolagui.cpp:224
 msgid "Find Character"
 msgstr "Poišči znak"

-#: res/zrcolagui.cpp:223 zrcolagui.cpp:223
+#: res/zrcolagui.cpp:226 zrcolagui.cpp:226
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"

-#: res/zrcolagui.cpp:225 zrcolagui.cpp:225
+#: res/zrcolagui.cpp:228 zrcolagui.cpp:228
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"

-#: res/zrcolagui.cpp:229 zrcolagui.cpp:229
-msgid "ZRCola (De)composition"
-msgstr "(Raz-)Sestavljanje ZRCola"
+#: res/zrcolagui.cpp:232 zrcolagui.cpp:232
+msgid "No (De)composition"
+msgstr "Brez (raz-)sestavljanja"

-#: res/zrcolagui.cpp:236 res/zrcolagui.cpp:248 zrcolagui.cpp:236
-#: zrcolagui.cpp:248
-msgid "Compose"
-msgstr "Sestavljanje"
-
-#: res/zrcolagui.cpp:245 zrcolagui.cpp:245
-msgid "PUA Warning"
-msgstr "Opozorilo OZU"
-
-#: res/zrcolagui.cpp:252 zrcolagui.cpp:252
-msgid "Character Catalog"
-msgstr "Katalog znakov"
-
-#: res/zrcolagui.cpp:256 zrcolagui.cpp:256
-msgid "(De)Composer"
-msgstr "Razstavljalnik/Sestavljalnik"
-
-#: res/zrcolagui.cpp:299 zrcolagui.cpp:299
-msgid "Decomposed Text"
-msgstr "Razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:319 zrcolagui.cpp:319
-msgid "Decomposed Unicode Dump"
-msgstr "Unicode razstavljenega"
-
-#: res/zrcolagui.cpp:346 zrcolagui.cpp:346
-msgid "Composed Text"
-msgstr "Sestavljeno besedilo"
-
-#: res/zrcolagui.cpp:366 zrcolagui.cpp:366
-msgid "Composed Unicode Dump"
-msgstr "Unicode sestavljenega"
-
-#: res/zrcolagui.cpp:420 zrcolagui.cpp:420
-msgid "Select category to display"
-msgstr "Izberi kategorijo za prikaz"
-
-#: res/zrcolagui.cpp:454 zrcolagui.cpp:454
-msgid "Show &All"
-msgstr "Prik&aži vse"
-
-#: res/zrcolagui.cpp:455 zrcolagui.cpp:455
-msgid "Toggle display of less frequent characters"
-msgstr "Prikaži/skrij manj pogoste znake"
-
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:495
-msgid "&Browse"
-msgstr "Pre&brskaj"
-
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:502
-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:506 zrcolagui.cpp:506
-msgid "Search Options"
-msgstr "Možnosti iskanja"
-
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:507
-msgid "Shows/hides additional search options"
-msgstr "Prikaže/skrije dodatne možnosti iskanja"
-
-#: res/zrcolagui.cpp:519 zrcolagui.cpp:519
-msgid "List of Unicode character categories to search in"
-msgstr "Seznam kategorij znaka Unicode za iskanje"
-
-#: res/zrcolagui.cpp:526 zrcolagui.cpp:526
-msgid "All"
-msgstr "Vse"
-
-#: res/zrcolagui.cpp:527 zrcolagui.cpp:527
-msgid "Select all categories"
-msgstr "Izberi vse kategorije"
-
-#: res/zrcolagui.cpp:531 zrcolagui.cpp:531
-msgid "None"
-msgstr "Nič"
-
-#: res/zrcolagui.cpp:532 zrcolagui.cpp:532
-msgid "Clear category selection"
-msgstr "Počisti izbor kategorij"
-
-#: res/zrcolagui.cpp:536 zrcolagui.cpp:536
-msgid "Invert"
-msgstr "Obrni"
-
-#: res/zrcolagui.cpp:537 zrcolagui.cpp:537
-msgid "Invert category selection"
-msgstr "Obrni izbor kategorij"
-
-#: res/zrcolagui.cpp:576 zrcolagui.cpp:576
-msgid "Character search results"
-msgstr "Rezultati iskanja znakov"
-
-#: res/zrcolagui.cpp:586 zrcolagui.cpp:586
-msgid "Re&cently Used"
-msgstr "Nedavno &uporabljeni"
-
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:614
-msgid "List of recently inserted characters"
-msgstr "Seznam nedavno vstavljenih znakov"
-
-#: res/zrcolagui.cpp:628 zrcolagui.cpp:628
-msgid "Preview"
-msgstr "Predogled"
-
-#: res/zrcolagui.cpp:633 zrcolagui.cpp:633
-msgid "U+"
-msgstr "U+"
-
-#: res/zrcolagui.cpp:638 zrcolagui.cpp:638
-msgid "Unicode hexadecimal code"
-msgstr "Šestnajstiška koda Unicode"
-
-#: res/zrcolagui.cpp:643 zrcolagui.cpp:643
-msgid "Keyboard shortcut in Composer window"
-msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
-
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:678
-msgid "Character preview"
-msgstr "Predogled znaka"
-
-#: res/zrcolagui.cpp:683 zrcolagui.cpp:683
-msgid "Unicode character description"
-msgstr "Opis znaka Unicode"
-
-#: res/zrcolagui.cpp:688 zrcolagui.cpp:688
-msgid "Character tags"
-msgstr "Oznake znaka"
-
-#: res/zrcolagui.cpp:693 zrcolagui.cpp:693
-msgid "Unicode character category"
-msgstr "Kategorija znaka Unicode"
-
-#: res/zrcolagui.cpp:700 zrcolagui.cpp:700
-msgid "« Back"
-msgstr "« Nazaj"
-
-#: res/zrcolagui.cpp:702 zrcolagui.cpp:702
-msgid "To previously viewed character"
-msgstr "Na prejšnji prikazan znak"
-
-#: res/zrcolagui.cpp:706 zrcolagui.cpp:706
-msgid "Forward »"
-msgstr "Naprej »"
-
-#: res/zrcolagui.cpp:708 zrcolagui.cpp:708
-msgid "To following viewed character"
-msgstr "Na naslednji prikazan znak"
-
-#: res/zrcolagui.cpp:719 zrcolagui.cpp:719
-msgid "Re&lated"
-msgstr "&Sorodni"
-
-#: res/zrcolagui.cpp:746 zrcolagui.cpp:746
-msgid "List of related characters"
-msgstr "Seznam sorodnih znakov"
-
-#: res/zrcolagui.cpp:765 zrcolagui.cpp:765
-msgid "&Insert"
-msgstr "Vstav&i"
-
-#: res/zrcolagui.cpp:769 zrcolagui.cpp:769
-msgid "Insert character into decomposed text"
-msgstr "Vstavi znak v razstavljeno besedilo"
-
-#: res/zrcolagui.cpp:842 zrcolagui.cpp:845
-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:846 zrcolagui.cpp:849
-msgid "Select language &automatically according to selected keyboard"
-msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
-
-#: res/zrcolagui.cpp:849 zrcolagui.cpp:852
-msgid "&Manually select the language from the list below:"
-msgstr "&Ročno izberi jezik s seznama spodaj:"
-
-#: res/zrcolagui.cpp:860 zrcolagui.cpp:863
-msgid "Text Language"
-msgstr "Jezik besedila"
-
-#: res/zrcolagui.cpp:865 zrcolagui.cpp:868
-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:869 zrcolagui.cpp:872
-msgid "Start ZRCola &automatically on logon"
-msgstr "S&amodejno zaženi ZRColo ob prijavi"
-
-#: res/zrcolagui.cpp:875 zrcolagui.cpp:878
-msgid "Startup"
-msgstr "Zagon"
-
-#: res/zrcolagui.cpp:942 res/zrcolagui.h:120 zrcolaapp.cpp:74 zrcolafrm.cpp:133
-#: zrcolagui.cpp:945 zrcolagui.h:120
-#: 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
@@ -464,7 +266,211 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"

-#: res/zrcolagui.cpp:953 zrcolagui.cpp:956
+#: 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"
@@ -478,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:961 zrcolagui.cpp:964
+#: res/zrcolagui.cpp:959 zrcolagui.cpp:962
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"

-#: res/zrcolagui.cpp:967 zrcolagui.cpp:970
+#: 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:971 zrcolagui.cpp:974
+#: 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:1012 zrcolagui.cpp:1015
+#: res/zrcolagui.cpp:1010 zrcolagui.cpp:1013
 msgid "Log"
 msgstr "Dnevnik"

-#: res/zrcolagui.cpp:1028 zrcolagui.cpp:1031
+#: res/zrcolagui.cpp:1026 zrcolagui.cpp:1029
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."

-#: res/zrcolagui.cpp:1030 zrcolagui.cpp:1033
+#: 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:1034 zrcolagui.cpp:1037
+#: res/zrcolagui.cpp:1032 zrcolagui.cpp:1035
 msgid "&Close"
 msgstr "&Zapri"

-#: res/zrcolagui.cpp:1035 zrcolagui.cpp:1038
+#: res/zrcolagui.cpp:1033 zrcolagui.cpp:1036
 msgid "Close this window"
 msgstr "Zapri to okno"

-#: res/zrcolagui.cpp:1072 zrcolachrreq.cpp:49 zrcolagui.cpp:1075
+#: res/zrcolagui.cpp:1070 zrcolachrreq.cpp:35 zrcolagui.cpp:1073
 msgid "Character"
 msgstr "Znak"

-#: res/zrcolagui.cpp:1074 zrcolagui.cpp:1077
+#: 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:1088 zrcolagui.cpp:1091
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1089
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"

-#: res/zrcolagui.cpp:1092 zrcolagui.cpp:1095
+#: 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."
@@ -530,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:1100 zrcolachrreq.cpp:58 zrcolagui.cpp:1103
+#: res/zrcolagui.cpp:1098 zrcolachrreq.cpp:44 zrcolagui.cpp:1101
 msgid "Context"
 msgstr "Kontekst"

-#: res/zrcolagui.cpp:1102 zrcolagui.cpp:1105
+#: 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:1108 zrcolagui.cpp:1111
+#: res/zrcolagui.cpp:1106 zrcolagui.cpp:1109
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"

-#: res/zrcolagui.cpp:1115 zrcolagui.cpp:1118
+#: 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."
@@ -550,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:1157 zrcolagui.cpp:1160
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1158
 msgid "Translation"
 msgstr "Pretvorba"

-#: res/zrcolagui.cpp:1159 zrcolagui.cpp:1162
+#: 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."
@@ -562,126 +568,126 @@ 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:1169 zrcolagui.cpp:1172
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1170
 msgid "A&vailable:"
 msgstr "Na &voljo:"

-#: res/zrcolagui.cpp:1184 zrcolagui.cpp:1187
+#: res/zrcolagui.cpp:1182 zrcolagui.cpp:1185
 msgid "→"
 msgstr "→"

-#: res/zrcolagui.cpp:1187 zrcolagui.cpp:1190
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1188
 msgid "←"
 msgstr "←"

-#: res/zrcolagui.cpp:1196 zrcolagui.cpp:1199
+#: res/zrcolagui.cpp:1194 zrcolagui.cpp:1197
 msgid "&Selected:"
 msgstr "I&zbrano:"

-#: res/zrcolagui.cpp:1214 zrcolagui.cpp:1217
+#: res/zrcolagui.cpp:1212 zrcolagui.cpp:1215
 msgid "↑"
 msgstr "↑"

-#: res/zrcolagui.cpp:1217 zrcolagui.cpp:1220
+#: res/zrcolagui.cpp:1215 zrcolagui.cpp:1218
 msgid "↓"
 msgstr "↓"

-#: res/zrcolagui.h:261 zrcolagui.h:261
+#: res/zrcolagui.h:260 zrcolagui.h:260
 msgid "Character Search"
 msgstr "Poišči znak"

-#: res/zrcolagui.h:297 zrcolagui.h:297
+#: res/zrcolagui.h:296 zrcolagui.h:296
 msgid "Settings"
 msgstr "Nastavitve"

-#: res/zrcolagui.h:323 zrcolagui.h:323
+#: res/zrcolagui.h:322 zrcolagui.h:322
 msgid "About ZRCola"
 msgstr "O ZRColi"

-#: res/zrcolagui.h:348 zrcolagui.h:348 zrcolaupdater.cpp:95
+#: res/zrcolagui.h:347 zrcolagui.h:347 zrcolaupdater.cpp:81
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"

-#: res/zrcolagui.h:377 zrcolachrreq.cpp:64 zrcolagui.h:377
+#: res/zrcolagui.h:376 zrcolachrreq.cpp:50 zrcolagui.h:376
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"

-#: res/zrcolagui.h:419 zrcolagui.h:419
+#: res/zrcolagui.h:418 zrcolagui.h:418
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"

-#: 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 "Preveč števk v zapisu Unicode."

-#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:75 zrcolachrslct.cpp:93
 msgid "Validation conflict"
 msgstr "Nesoglasje pri preverjanju"

-#: zrcolachrslct.cpp:107
+#: zrcolachrslct.cpp:93
 #, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr "Napačen znak v zapisu Unicode: %c"

-#: zrcolachrslct.cpp:215 zrcolachrslct.cpp:391 zrcolachrslct.cpp:888
+#: zrcolachrslct.cpp:201 zrcolachrslct.cpp:377 zrcolachrslct.cpp:874
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"

-#: zrcolachrslct.cpp:329
+#: zrcolachrslct.cpp:315
 msgid ", "
 msgstr ", "

-#: zrcolachrslct.cpp:394 zrcolachrslct.cpp:885
+#: zrcolachrslct.cpp:380 zrcolachrslct.cpp:871
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"

-#: zrcolafrm.cpp:99
+#: zrcolafrm.cpp:84
 msgid "No Translation"
 msgstr "Brez transliteracije"

-#: zrcolafrm.cpp:112
+#: zrcolafrm.cpp:97
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."

-#: zrcolafrm.cpp:231
+#: 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:231 zrcolafrm.cpp:233
+#: zrcolafrm.cpp:217 zrcolafrm.cpp:219
 msgid "Warning"
 msgstr "Opozorilo"

-#: zrcolafrm.cpp:233
+#: 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:544
+#: zrcolafrm.cpp:513
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"

-#: zrcolafrm.cpp:569
+#: zrcolafrm.cpp:538
 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 "Pritisnili ste tipko INS. Vtipkajte kodo Unicode želenega znaka (do štiri šestnajstiške števke: 0–9, A–F), nato izpustite INS."

-#: zrcolasettings.cpp:87
+#: zrcolasettings.cpp:73
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"

-#: zrcolatranseq.cpp:63
+#: zrcolatranseq.cpp:49
 #, c-format
 msgid "Unknown translation (%u)"
 msgstr "Neznana pretvorba (%u)"

-#: zrcolaupdater.cpp:95
+#: zrcolaupdater.cpp:81
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
@@ -782,6 +788,24 @@ 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 ..."
+
+#~ msgid "Select font for composed text"
+#~ msgstr "Izberi pisavo za sestavljeno besedilo"
+
+#~ msgid "Composed &Text Toolbar"
+#~ msgstr "Orodna vrs&tica sestavljenega besedila"
+
+#~ msgid "Toggle composed text toolbar"
+#~ msgstr "Prikaži/skrij orodno vrstico sestavljenega besedila"
+
 #~ msgid ">"
 #~ msgstr ">"

--- a/ZRCola/pch.h
+++ b/ZRCola/pch.h
@@ -30,7 +30,6 @@
 #include <wx/clipbrd.h>
 #include <wx/dcclient.h>
 #include <wx/ffile.h>
-#include <wx/fontdlg.h>
 #include <wx/msgdlg.h>
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
--- a/ZRCola/res/ZRCola.fbp
+++ b/ZRCola/res/ZRCola.fbp
@@ -45,7 +45,7 @@
            <property name="minimum_size">150,150</property>
            <property name="name">wxZRColaFrameBase</property>
            <property name="pos"></property>
-            <property name="size">660,450</property>
+            <property name="size">600,400</property>
            <property name="style">wxDEFAULT_FRAME_STYLE</property>
            <property name="subclass"></property>
            <property name="title">ZRCola</property>
@@ -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>
@@ -270,19 +302,6 @@
                        <property name="name">separator5</property>
                        <property name="permission">none</property>
                    </object>
-                    <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap"></property>
-                        <property name="checked">0</property>
-                        <property name="enabled">1</property>
-                        <property name="help">Select font for composed text</property>
-                        <property name="id">wxID_FONT_DESTINATION</property>
-                        <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label">Composed Text &amp;Font...</property>
-                        <property name="name">m_menuItemFontDestination</property>
-                        <property name="permission">none</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>
@@ -344,19 +363,6 @@
                        <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">Toggle composed text toolbar</property>
-                        <property name="id">wxID_TOOLBAR_DESTINATION</property>
-                        <property name="kind">wxITEM_CHECK</property>
-                        <property name="label">Composed &amp;Text Toolbar</property>
-                        <property name="name">m_menuItemToolbarDestination</property>
-                        <property name="permission">none</property>
-                        <property name="shortcut"></property>
-                        <property name="unchecked_bitmap"></property>
-                    </object>
                    <object class="separator" expanded="0">
                        <property name="name">separator</property>
                        <property name="permission">none</property>
@@ -642,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>
@@ -699,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>
@@ -713,125 +768,8 @@
                    <property name="window_style"></property>
                    <event name="OnChoice">OnTranslationSeqChoice</event>
                </object>
-            </object>
-            <object class="wxAuiToolBar" expanded="0">
-                <property name="BottomDockable">1</property>
-                <property name="LeftDockable">0</property>
-                <property name="RightDockable">0</property>
-                <property name="TopDockable">1</property>
-                <property name="aui_layer">1</property>
-                <property name="aui_name">toolbarDestination</property>
-                <property name="aui_position"></property>
-                <property name="aui_row">0</property>
-                <property name="best_size"></property>
-                <property name="bg"></property>
-                <property name="bitmapsize">-1,-1</property>
-                <property name="caption">Compose</property>
-                <property name="caption_visible">1</property>
-                <property name="center_pane">0</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">Top</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="label_visible">0</property>
-                <property name="margins"></property>
-                <property name="max_size"></property>
-                <property name="maximize_button">0</property>
-                <property name="maximum_size"></property>
-                <property name="min_size">-1,-1</property>
-                <property name="minimize_button">0</property>
-                <property name="minimum_size"></property>
-                <property name="moveable">1</property>
-                <property name="name">m_toolbarDestination</property>
-                <property name="packing">1</property>
-                <property name="pane_border">1</property>
-                <property name="pane_position">-1,-1</property>
-                <property name="pane_size">-1,-1</property>
-                <property name="permission">protected</property>
-                <property name="pin_button">1</property>
-                <property name="pos"></property>
-                <property name="resize">Resizable</property>
-                <property name="separation">5</property>
-                <property name="show">1</property>
-                <property name="size"></property>
-                <property name="style">wxAUI_TB_HORZ_LAYOUT</property>
-                <property name="subclass"></property>
-                <property name="toolbar_label"></property>
-                <property name="toolbar_pane">1</property>
-                <property name="tooltip"></property>
-                <property name="use_explicit_ids">0</property>
-                <property name="window_extra_style"></property>
-                <property name="window_name"></property>
-                <property name="window_style"></property>
-                <object class="wxFontPickerCtrl" 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="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_FONT_DESTINATION</property>
-                    <property name="max_point_size">100</property>
-                    <property name="max_size"></property>
-                    <property name="maximize_button">0</property>
-                    <property name="maximum_size">180,-1</property>
-                    <property name="min_size"></property>
-                    <property name="minimize_button">0</property>
-                    <property name="minimum_size">120,-1</property>
-                    <property name="moveable">1</property>
-                    <property name="name">m_fontpickerDestination</property>
-                    <property name="pane_border">1</property>
-                    <property name="pane_position"></property>
-                    <property name="pane_size"></property>
+                <object class="toolSeparator" expanded="0">
                    <property name="permission">protected</property>
-                    <property name="pin_button">1</property>
-                    <property name="pos"></property>
-                    <property name="resize">Resizable</property>
-                    <property name="show">1</property>
-                    <property name="size"></property>
-                    <property name="style">wxFNTP_FONTDESC_AS_LABEL</property>
-                    <property name="subclass">; ; forward_declare</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="value">ZRCola,90,90,20,70,0</property>
-                    <property name="window_extra_style"></property>
-                    <property name="window_name"></property>
-                    <property name="window_style"></property>
-                    <event name="OnFontChanged">OnFontDestinationChanged</event>
                </object>
                <object class="tool" expanded="0">
                    <property name="bitmap">Load From Icon Resource; warn_pua.ico; [24; 24]</property>
--- 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 );
@@ -142,10 +153,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS

 	m_menuEdit->AppendSeparator();

-	wxMenuItem* m_menuItemFontDestination;
-	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
-	m_menuEdit->Append( m_menuItemFontDestination );
-
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );

@@ -166,10 +173,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );

-	wxMenuItem* m_menuItemToolbarDestination;
-	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
-	m_menuView->Append( m_menuItemToolbarDestination );
-
 	m_menuView->AppendSeparator();

 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -226,27 +229,22 @@ 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();
+
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );

-	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
-	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
-	m_fontpickerDestination->SetMaxPointSize( 100 );
-	m_fontpickerDestination->SetMinSize( wxSize( 120,-1 ) );
-	m_fontpickerDestination->SetMaxSize( wxSize( 180,-1 ) );
-
-	m_toolbarDestination->AddControl( m_fontpickerDestination );
-	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
-	m_toolbarDestination->Realize();
-	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
-
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );

 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize( wxSize( 150,200 ) ).MinSize( wxSize( 100,100 ) ).Layer( 1 ) );
@@ -264,8 +262,8 @@ 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 );
-	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }

 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -274,8 +272,8 @@ 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_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );

 	m_mgr.UnInit();

--- a/ZRCola/res/zrcolagui.h
+++ b/ZRCola/res/zrcolagui.h
@@ -25,7 +25,6 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
-#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -68,13 +67,13 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
-			wxID_FONT_DESTINATION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
-			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -85,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;
@@ -98,10 +99,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
-		wxAuiToolBarItem* m_toolComposition;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBar* m_toolbarDestination;
-		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -110,14 +109,14 @@ 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(); }
-		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }


 	public:
 		wxZRColaComposerPanel* m_panel;

-		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 660,450 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
+		wxZRColaFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("ZRCola"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("ZRCola") );
 		wxAuiManager m_mgr;

 		~wxZRColaFrameBase();
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -144,6 +144,12 @@ bool ZRColaApp::OnInit()
                            wxFAIL_MSG(wxT("Error reading tag name data from ZRCola.zrcdb."));
                            m_tn_db.clear();
                        }
+                    } else if (id == ZRCola::highlight_rec::id) {
+                        dat >> ZRCola::highlight_rec(m_h_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading highlight data from ZRCola.zrcdb."));
+                            m_h_db.clear();
+                        }
                    } else
                        stdex::idrec::ignore<ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat);
                }
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -21,6 +21,7 @@ class ZRColaApp;
 #include <wx/intl.h>
 #pragma warning(pop)
 #include <zrcola/character.h>
+#include <zrcola/highlight.h>
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
 #include <zrcola/tag.h>
@@ -72,6 +73,7 @@ public:
    ZRCola::chrcat_db m_cc_db;      ///< Characted category database
    ZRCola::chrtag_db m_ct_db;      ///< Character tag database
    ZRCola::tagname_db m_tn_db;     ///< Tag name database
+    ZRCola::highlight_db m_h_db;    ///< Highlight database

    wxZRColaFrame *m_mainWnd;       ///< Main window

--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -5,11 +5,6 @@

 #include "pch.h"

-static inline bool is_pua(_In_ wchar_t c)
-{
-    return L'\ue000' <= c && c <= L'\uf8ff';
-}
-

 //////////////////////////////////////////////////////////////////////////
 // wxZRColaComposerPanel
@@ -20,9 +15,9 @@ wxZRColaComposerPanel::wxZRColaComposerPanel(wxWindow* parent) :
    m_destinationChanged(false),
    m_sourceRestyled(false),
    m_destinationRestyled(false),
-    m_styleSource(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
-    m_styleDestination(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
-    m_styleDestinationPUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleNormal(*wxBLACK, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_stylePUA(*wxBLUE, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
+    m_styleZRColaUnicodeComposedIssues(*wxRED, *wxWHITE, wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"))),
    m_selSource(0, 0),
    m_selDestination(0, 0),
    wxZRColaComposerPanelBase(parent)
@@ -101,10 +96,10 @@ void wxZRColaComposerPanel::SynchronizePanels()

        if (app->m_mainWnd->m_composition) {
            // ZRCola decompose first, then re-compose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSEQID_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_TRANSEQID_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));
        }

@@ -156,7 +151,7 @@ void wxZRColaComposerPanel::SynchronizePanels()

        if (app->m_mainWnd->m_composition) {
            // ZRCola decompose.
-            app->m_t_db.TranslateInv(ZRCOLA_TRANSEQID_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();
@@ -184,41 +179,6 @@ void wxZRColaComposerPanel::SynchronizePanels()
 }


-void wxZRColaComposerPanel::SetDestinationFont(const wxFont& font, int flags)
-{
-    m_styleDestination.SetFont(font, flags);
-    m_styleDestinationPUA.SetFont(font, flags);
-}
-
-
-void wxZRColaComposerPanel::RestyleSource()
-{
-    m_sourceRestyled = true;
-    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleSource);
-    m_sourceRestyled = false;
-}
-
-
-void wxZRColaComposerPanel::RestyleDestination()
-{
-    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-
-    m_destinationRestyled = true;
-    if (app->m_mainWnd->m_warnPUA) {
-        wxString src = m_destination->GetValue();
-        size_t len = src.Length();
-        for (size_t i = 0, j; i < len;) {
-            bool pua_i = is_pua(src[i]);
-            for (j = i + 1; j < len && pua_i == is_pua(src[j]); j++);
-            m_destination->SetStyle((long)i, (long)j, pua_i ? m_styleDestinationPUA : m_styleDestination);
-            i = j;
-        }
-    } else
-        m_destination->SetStyle(0, GetWindowTextLength(m_destination->GetHWND()), m_styleDestination);
-    m_destinationRestyled = false;
-}
-
-
 void wxZRColaComposerPanel::OnSourcePaint(wxPaintEvent& event)
 {
    event.Skip();
@@ -285,7 +245,10 @@ void wxZRColaComposerPanel::OnSourceText(wxCommandEvent& event)

    // Set the flag the source text changed to trigger idle-time translation.
    m_sourceChanged = true;
-    RestyleSource();
+
+    m_sourceRestyled = true;
+    m_source->SetStyle(0, GetWindowTextLength(m_source->GetHWND()), m_styleNormal);
+    m_sourceRestyled = false;
 }


@@ -355,7 +318,29 @@ void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)

    // Set the flag the destination text changed to trigger idle-time inverse translation.
    m_destinationChanged = true;
-    RestyleDestination();
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_destinationRestyled = true;
+    wxString src = m_destination->GetValue();
+    app->m_h_db.Highlight(src, src.Length(), [this, app, src](ZRCola::hlghtsetid_t set, size_t start, size_t end) {
+        switch (set) {
+        case ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES:
+            m_destination->SetStyle((long)start, (long)end, m_styleZRColaUnicodeComposedIssues);
+            break;
+
+        default:
+            if (app->m_mainWnd->m_warnPUA) {
+                for (size_t i = start, j; i < end;) {
+                    bool pua_i = ZRCola::ispua(src[i]);
+                    for (j = i + 1; j < end && pua_i == ZRCola::ispua(src[j]); j++);
+                    m_destination->SetStyle((long)i, (long)j, pua_i ? m_stylePUA : m_styleNormal);
+                    i = j;
+                }
+            } else
+                m_destination->SetStyle((long)start, (long)end, m_styleNormal);
+        }
+    });
+    m_destinationRestyled = false;
 }


--- a/ZRCola/zrcolacomppnl.h
+++ b/ZRCola/zrcolacomppnl.h
@@ -37,9 +37,6 @@ public:

    void RestoreFromStateFile();
    void SynchronizePanels();
-    void SetDestinationFont(const wxFont& font, int flags = (wxTEXT_ATTR_FONT & ~wxTEXT_ATTR_FONT_PIXEL_SIZE));
-    void RestyleSource();
-    void RestyleDestination();

    friend class wxPersistentZRColaComposerPanel;   // Allow saving/restoring window state.

@@ -65,9 +62,9 @@ protected:
        m_sourceRestyled,                           ///< Boolean flag to mark source text is being restyled
        m_destinationRestyled;                      ///< Boolean flag to mark destination text is being restyled
    wxTextAttr
-        m_styleSource,                              ///< Normal source text style
-        m_styleDestination,                         ///< Normal destination text style
-        m_styleDestinationPUA;                      ///< PUA character destination text style
+        m_styleNormal,                              ///< Normal text style
+        m_stylePUA,                                 ///< PUA character text style
+        m_styleZRColaUnicodeComposedIssues;         ///< ZRCola Unicode Composed issues character text style
    std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
    std::pair<long, long>
        m_selSource,                                ///< Character index of selected text in source text control
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -28,8 +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_FONT_DESTINATION                                 , wxZRColaFrame::OnFontDestination            )
+    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         )

@@ -39,8 +40,6 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
    EVT_MENU           (wxID_TOOLBAR_EDIT                                     , wxZRColaFrame::OnToolbarEdit                )
    EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslateUpdate     )
    EVT_MENU           (wxID_TOOLBAR_TRANSLATE                                , wxZRColaFrame::OnToolbarTranslate           )
-    EVT_UPDATE_UI      (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestinationUpdate   )
-    EVT_MENU           (wxID_TOOLBAR_DESTINATION                              , wxZRColaFrame::OnToolbarDestination         )
    EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
    EVT_MENU           (wxID_PANEL_CHRGRPS                                    , wxZRColaFrame::OnPanelCharacterCatalog      )
    EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG                          , wxZRColaFrame::OnPanelCharacterCatalogFocus )
@@ -64,7 +63,7 @@ wxZRColaFrame::wxZRColaFrame() :
    m_settings(NULL),
    m_chrReq(NULL),
    m_composition(true),
-    m_fontDestination(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola")),
+    m_composition_id(ZRCOLA_TRANSETID_DEFAULT),
    m_warnPUA(false),
    m_transeq_id(ZRCOLA_TRANSEQID_DEFAULT),
    m_transeq(NULL),
@@ -178,16 +177,17 @@ 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);
    }

-    m_fontpickerDestination->SetSelectedFont(m_fontDestination);
-    m_panel->SetDestinationFont(m_fontDestination);
    if (m_warnPUA) {
        m_menuItemWarnPUA->Check(true);
        m_toolWarnPUA->SetState(m_toolWarnPUA->GetState() | wxAUI_BUTTON_STATE_CHECKED);
@@ -344,46 +344,40 @@ 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::OnFontDestinationChanged(wxFontPickerEvent& event)
+void wxZRColaFrame::OnCompositionUnicode(wxCommandEvent& event)
 {
-    m_fontDestination = event.GetFont();
-    m_panel->SetDestinationFont(m_fontDestination);
-    m_panel->RestyleDestination();
+    DoSetComposition(true, ZRCOLA_TRANSETID_UNICODE);
+    m_toolbarTranslate->Refresh();

    event.Skip();
 }


-void wxZRColaFrame::OnFontDestination(wxCommandEvent& event)
+void wxZRColaFrame::OnCompositionChoice(wxCommandEvent& event)
 {
-    wxFontData data;
-    data.SetInitialFont(m_fontDestination);
-    wxFontDialog dlg(this, data);
-    if (dlg.ShowModal() == wxID_OK)
-    {
-        data = dlg.GetFontData();
-        m_fontDestination = data.GetChosenFont();
-        m_fontpickerDestination->SetSelectedFont(m_fontDestination);
-        m_panel->SetDestinationFont(m_fontDestination);
-        m_panel->RestyleDestination();
+    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;
    }
-
-    event.Skip();
 }


@@ -392,8 +386,11 @@ void wxZRColaFrame::OnWarnPUA(wxCommandEvent& event)
    m_warnPUA = !m_warnPUA;
    m_menuItemWarnPUA->Check(m_warnPUA);
    m_toolWarnPUA->SetState((m_toolWarnPUA->GetState() & ~wxAUI_BUTTON_STATE_CHECKED) | (m_warnPUA ? wxAUI_BUTTON_STATE_CHECKED : 0));
-    m_toolbarDestination->Refresh();
-    m_panel->RestyleDestination();
+    m_toolbarTranslate->Refresh();
+
+    // Notify destination text something changed and should re-paint.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    m_panel->m_destination->ProcessWindowEvent(event2);

    event.Skip();
 }
@@ -460,20 +457,6 @@ void wxZRColaFrame::OnToolbarTranslate(wxCommandEvent& event)
 }


-void wxZRColaFrame::OnToolbarDestinationUpdate(wxUpdateUIEvent& event)
-{
-    event.Check(m_mgr.GetPane(m_toolbarDestination).IsShown());
-}
-
-
-void wxZRColaFrame::OnToolbarDestination(wxCommandEvent& event)
-{
-    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarDestination);
-    paneInfo.Show(!paneInfo.IsShown());
-    m_mgr.Update();
-}
-
-
 void wxZRColaFrame::OnTranslationSeqMenu(wxCommandEvent& event)
 {
    int idx = event.GetId() - wxID_TRANSLATION_SEQ_DEFAULT;
@@ -689,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) {
@@ -789,18 +796,9 @@ 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("transeqId"), static_cast<int>(wnd->m_transeq_id));
-
-    #pragma warning(push)
-    #pragma warning(disable: 26812) // wxWidgets font enums are unscoped.
-    SaveValue(wxT("fontDestinationSize"        ), wnd->m_fontDestination.GetPointSize());
-    SaveValue(wxT("fontDestinationFamily"      ), wnd->m_fontDestination.GetFamily());
-    SaveValue(wxT("fontDestinationStyle"       ), wnd->m_fontDestination.GetStyle());
-    SaveValue(wxT("fontDestinationWeight"      ), wnd->m_fontDestination.GetWeight());
-    SaveValue(wxT("fontDestinationIsUnderlined"), wnd->m_fontDestination.GetUnderlined());
-    SaveValue(wxT("fontDestinationFace"        ), wnd->m_fontDestination.GetFaceName());
-    #pragma warning(pop)
+    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));

    wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
    wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
@@ -823,19 +821,8 @@ bool wxPersistentZRColaFrame::Restore()
        wnd->m_composition = b;
    else
        wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
-
-    int fontSize = 20, fontFamily = wxFONTFAMILY_DEFAULT, fontStyle = wxFONTSTYLE_NORMAL, fontWeight = wxFONTWEIGHT_NORMAL;
-    bool fontIsUnderlined = false;
-    wxString fontFace(wxT("ZRCola"));
-    if (RestoreValue(wxT("fontDestinationSize"        ), &fontSize) &&
-        RestoreValue(wxT("fontDestinationFamily"      ), &fontFamily) &&
-        RestoreValue(wxT("fontDestinationStyle"       ), &fontStyle) &&
-        RestoreValue(wxT("fontDestinationWeight"      ), &fontWeight) &&
-        RestoreValue(wxT("fontDestinationIsUnderlined"), &fontIsUnderlined) &&
-        RestoreValue(wxT("fontDestinationFace"        ), &fontFace))
-        wnd->m_fontDestination = wxFont(fontSize, (wxFontFamily)fontFamily, (wxFontStyle)fontStyle, (wxFontWeight)fontWeight, fontIsUnderlined, fontFace);
-    else
-        wnd->m_fontDestination = wxFont(20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola"));
+    if (RestoreValue(wxT("compositionId"), &num))
+        wnd->m_composition_id = (ZRCola::transetid_t)num;
    if (RestoreValue(wxT("warnPUA"), &b))
        wnd->m_warnPUA = b;
    else
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -76,9 +76,10 @@ protected:
    void OnSendSource(wxCommandEvent& event);
    void OnCopySourceAndReturn(wxCommandEvent& event);
    void OnSendAbort(wxCommandEvent& event);
-    void OnComposition(wxCommandEvent& event);
-    virtual void OnFontDestinationChanged(wxFontPickerEvent& event);
-    void OnFontDestination(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);
@@ -88,8 +89,6 @@ protected:
    void OnToolbarEdit(wxCommandEvent& event);
    void OnToolbarTranslateUpdate(wxUpdateUIEvent& event);
    void OnToolbarTranslate(wxCommandEvent& event);
-    void OnToolbarDestinationUpdate(wxUpdateUIEvent& event);
-    void OnToolbarDestination(wxCommandEvent& event);
    void OnTranslationSeqMenu(wxCommandEvent& event);
    virtual void OnTranslationSeqChoice(wxCommandEvent& event);
    void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
@@ -121,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:
@@ -132,17 +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?
-    wxFont m_fontDestination;           ///< Destination window font
-    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
 };


--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -30,7 +30,7 @@ delete old;
 static wxFBContextSensitiveHelpSetter s_wxFBSetTheHelpProvider;
 ///////////////////////////////////////////////////////////////////////////

-wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize( 660,450 )), style, name )
+wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, long style, const wxString& name ) : wxFrame( parent, id, title, pos, parent->FromDIP(wxSize(600, 400)), style, name )
 {
 	this->SetSizeHints( FromDIP(wxSize( 150,150 )), wxDefaultSize );
 	m_mgr.SetManagedWindow(this);
@@ -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 );
@@ -142,10 +153,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS

 	m_menuEdit->AppendSeparator();

-	wxMenuItem* m_menuItemFontDestination;
-	m_menuItemFontDestination = new wxMenuItem( m_menuEdit, wxID_FONT_DESTINATION, wxString( _("Composed Text &Font...") ) , _("Select font for composed text"), wxITEM_NORMAL );
-	m_menuEdit->Append( m_menuItemFontDestination );
-
 	m_menuItemWarnPUA = new wxMenuItem( m_menuEdit, wxID_WARN_PUA, wxString( _("&PUA Warning") ) , _("Highlight Private Use Area Characters"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemWarnPUA );

@@ -166,10 +173,6 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );

-	wxMenuItem* m_menuItemToolbarDestination;
-	m_menuItemToolbarDestination = new wxMenuItem( m_menuView, wxID_TOOLBAR_DESTINATION, wxString( _("Composed &Text Toolbar") ) , _("Toggle composed text toolbar"), wxITEM_CHECK );
-	m_menuView->Append( m_menuItemToolbarDestination );
-
 	m_menuView->AppendSeparator();

 	wxMenuItem* m_menuItemPanelChrGrps;
@@ -226,27 +229,22 @@ 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();
+
+	m_toolWarnPUA = m_toolbarTranslate->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
+
 	m_toolbarTranslate->Realize();
 	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );

-	m_toolbarDestination = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT );
-	m_fontpickerDestination = new wxFontPickerCtrl( m_toolbarDestination, wxID_FONT_DESTINATION, wxFont( 20, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("ZRCola") ), wxDefaultPosition, wxDefaultSize, wxFNTP_FONTDESC_AS_LABEL );
-	m_fontpickerDestination->SetMaxPointSize( 100 );
-	m_fontpickerDestination->SetMinSize( FromDIP(wxSize( 120,-1 )) );
-	m_fontpickerDestination->SetMaxSize( FromDIP(wxSize( 180,-1 )) );
-
-	m_toolbarDestination->AddControl( m_fontpickerDestination );
-	m_toolWarnPUA = m_toolbarDestination->AddTool( wxID_WARN_PUA, _("PUA Warning"), wxIcon( wxT("warn_pua.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Highlight Private Use Area Characters"), _("Highlight Private Use Area Characters"), NULL );
-
-	m_toolbarDestination->Realize();
-	m_mgr.AddPane( m_toolbarDestination, wxAuiPaneInfo().Name( wxT("toolbarDestination") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
-
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );

 	m_mgr.AddPane( m_panelChrCat, wxAuiPaneInfo() .Name( wxT("panelChrGrp") ).Left() .Caption( _("Character Catalog") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).Row( 1 ).BestSize(FromDIP(wxSize( 150,200 )) ).MinSize( FromDIP(wxSize( 100,100 )) ).Layer( 1 ) );
@@ -264,8 +262,8 @@ 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 );
-	m_fontpickerDestination->Connect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );
 }

 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -274,8 +272,8 @@ 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_fontpickerDestination->Disconnect( wxEVT_COMMAND_FONTPICKER_CHANGED, wxFontPickerEventHandler( wxZRColaFrameBase::OnFontDestinationChanged ), NULL, this );

 	m_mgr.UnInit();

--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -25,7 +25,6 @@ class wxZRColaCharGrid;
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
 #include <wx/choice.h>
-#include <wx/fontpicker.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -68,13 +67,13 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_SOURCE,
 			wxID_COPY_SOURCE_AND_RETURN,
 			wxID_SEND_ABORT,
-			wxID_COMPOSITION,
-			wxID_FONT_DESTINATION,
+			wxID_COMPOSITION_NONE,
+			wxID_COMPOSITION_ZRCOLA,
+			wxID_COMPOSITION_UNICODE,
 			wxID_WARN_PUA,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
 			wxID_TOOLBAR_TRANSLATE,
-			wxID_TOOLBAR_DESTINATION,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -85,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;
@@ -98,10 +99,8 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolCharSelect;
 		wxAuiToolBarItem* m_toolSendDestination;
 		wxAuiToolBarItem* m_toolSendSource;
-		wxAuiToolBarItem* m_toolComposition;
+		wxChoice* m_toolComposition;
 		wxChoice* m_toolTranslationSeq;
-		wxAuiToolBar* m_toolbarDestination;
-		wxFontPickerCtrl* m_fontpickerDestination;
 		wxAuiToolBarItem* m_toolWarnPUA;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
@@ -110,8 +109,8 @@ 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(); }
-		virtual void OnFontDestinationChanged( wxFontPickerEvent& event ) { event.Skip(); }


 	public:
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -242,6 +242,8 @@ ZRCola::DBSource::~DBSource()
    m_comTranslation.free();
    m_pCharacterGroup1.free();
    m_comCharacterGroup.free();
+    m_pHighlight1.free();
+    m_comHighlight.free();

    if (m_db)
        m_db->Close();
@@ -305,7 +307,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
                com_obj<ADOParameters> params;
                wxVERIFY(SUCCEEDED(m_comTranslation->get_Parameters(&params)));
                wxASSERT_MSG(!m_pTranslation1, wxT("ADO command parameter already created"));
-                wxVERIFY(SUCCEEDED(m_comTranslation->CreateParameter(bstr(L"@Script"), adInteger, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslation1)));
+                wxVERIFY(SUCCEEDED(m_comTranslation->CreateParameter(bstr(L"@Script"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslation1)));
                wxVERIFY(SUCCEEDED(params->Append(m_pTranslation1)));
            }

@@ -322,10 +324,27 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
                com_obj<ADOParameters> params;
                wxVERIFY(SUCCEEDED(m_comTranslationSets->get_Parameters(&params)));
                wxASSERT_MSG(!m_pTranslationSets1, wxT("ADO command parameter already created"));
-                wxVERIFY(SUCCEEDED(m_comTranslationSets->CreateParameter(bstr(L"@ID"), adInteger, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslationSets1)));
+                wxVERIFY(SUCCEEDED(m_comTranslationSets->CreateParameter(bstr(L"@ID"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pTranslationSets1)));
                wxVERIFY(SUCCEEDED(params->Append(m_pTranslationSets1)));
            }

+            wxASSERT_MSG(!m_comHighlight, wxT("ADO command already created"));
+            wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comHighlight)));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_ActiveConnection(variant(m_db))));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_CommandType(adCmdText)));
+            wxVERIFY(SUCCEEDED(m_comHighlight->put_CommandText(bstr(L"SELECT [komb] "
+                L"FROM [VRS_HighlightChars2] "
+                L"WHERE [group]=? "
+                L"ORDER BY [komb]"))));
+            {
+                // Create and add command parameters.
+                com_obj<ADOParameters> params;
+                wxVERIFY(SUCCEEDED(m_comHighlight->get_Parameters(&params)));
+                wxASSERT_MSG(!m_pHighlight1, wxT("ADO command parameter already created"));
+                wxVERIFY(SUCCEEDED(m_comHighlight->CreateParameter(bstr(L"@group"), adSmallInt, adParamInput, 0, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pHighlight1)));
+                wxVERIFY(SUCCEEDED(params->Append(m_pHighlight1)));
+            }
+
            return true;
        } else {
            _ftprintf(stderr, wxT("%s: error ZCC0011: Could not open database (0x%x).\n"), (LPCTSTR)filename, hr);
@@ -386,15 +405,15 @@ bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, bool& val) const
 }


-bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, int& val) const
+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, short& val) const
 {
    wxASSERT_MSG(f, wxT("field is empty"));

    variant v;
    wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.change_type(VT_I4)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_I2)), false);

-    val = V_I4(&v);
+    val = V_I2(&v);

    return true;
 }
@@ -737,7 +756,7 @@ bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const
 }


-bool ZRCola::DBSource::SelectTranslations(int set, winstd::com_obj<ADORecordset>& rs) const
+bool ZRCola::DBSource::SelectTranslations(short set, winstd::com_obj<ADORecordset>& rs) const
 {
    // Create a new recordset.
    rs.free();
@@ -923,7 +942,7 @@ bool ZRCola::DBSource::GetTranslationSeq(const com_obj<ADORecordset>& rs, ZRCola
        wxVERIFY(SUCCEEDED(flds2->get_Item(variant(L"Script"), &f_set)));
        size_t n = 0;
        for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext(), n++) {
-            int set;
+            short set;
            wxCHECK(GetValue(f_set, set), false);
            ts.sets.push_back(set);
        }
@@ -967,21 +986,21 @@ bool ZRCola::DBSource::GetKeySequence(const com_obj<ADORecordset>& rs, ZRCola::D
        wxCHECK(GetUnicodeString(f, ks.chr), false);
    }

-    int modifiers;
+    short modifiers;
    {
        com_obj<ADOField> f;
        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Modifiers"), &f)));
        wxCHECK(GetValue(f, modifiers), false);
    }

-    int keycode1;
+    short keycode1;
    {
        com_obj<ADOField> f;
        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCodePre"), &f)));
        wxCHECK(GetValue(f, keycode1), false);
    }

-    int keycode;
+    short keycode;
    {
        com_obj<ADOField> f;
        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCode"), &f)));
@@ -999,18 +1018,18 @@ bool ZRCola::DBSource::GetKeySequence(const com_obj<ADORecordset>& rs, ZRCola::D
    if (keycode1) {
        // First key in the sequence is complete.
        keyseq::keycode kc1 = {
-            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode1 & 0xffff)),
+            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode1)),
            (modifiers & 0x100) != 0,
            (modifiers & 0x200) != 0,
            (modifiers & 0x400) != 0 };
        ks.seq.push_back(kc1);

-        keyseq::keycode kc2 = { keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode & 0xffff)), shift };
+        keyseq::keycode kc2 = { keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode)), shift };
        ks.seq.push_back(kc2);
    } else {
        // First key in the sequence is only modifier(s).
        keyseq::keycode kc1 = {
-            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode & 0xffff)),
+            keyseq::keycode::translate_slen(static_cast<wchar_t>(keycode)),
            shift || (modifiers & 0x100) != 0,
                     (modifiers & 0x200) != 0,
                     (modifiers & 0x400) != 0 };
@@ -1439,3 +1458,41 @@ bool ZRCola::DBSource::GetTagName(const winstd::com_obj<ADORecordset>& rs, tagna

    return true;
 }
+
+
+bool ZRCola::DBSource::SelectHighlights(short set, winstd::com_obj<ADORecordset>& rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)));
+    wxVERIFY(SUCCEEDED(rs->put_CursorLocation(adUseClient)));
+    wxVERIFY(SUCCEEDED(rs->put_CursorType(adOpenForwardOnly)));
+    wxVERIFY(SUCCEEDED(rs->put_LockType(adLockReadOnly)));
+
+    // Open it.
+    wxVERIFY(SUCCEEDED(m_pHighlight1->put_Value(variant(set))));
+    if (FAILED(rs->Open(variant(m_comHighlight), variant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
+        _ftprintf(stderr, wxT("%s: error ZCC0101: Error loading highlights from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetHighlight(const com_obj<ADORecordset>& rs, ZRCola::DBSource::highlight& h) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"komb"), &f)));
+        wxCHECK(GetUnicodeString(f, h.chr), false);
+    }
+
+    return true;
+}
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -6,7 +6,7 @@
 #pragma once

 #include <zrcola/character.h>
-#include <zrcola/common.h>
+#include <zrcola/highlight.h>
 #include <zrcola/language.h>
 #include <zrcola/tag.h>
 #include <zrcola/translate.h>
@@ -47,7 +47,7 @@ namespace ZRCola {
        ///
        class charseq {
        public:
-            int rank;         ///< Sequence rank
+            short rank;       ///< Sequence rank
            std::wstring str; ///< Sequence string

            inline charseq() :
@@ -55,19 +55,19 @@ namespace ZRCola {
            {
            }

-            inline charseq(_In_ int _rank, _In_z_ const wchar_t *_str) :
+            inline charseq(_In_ short _rank, _In_z_ const wchar_t *_str) :
                rank(_rank),
                str (_str)
            {
            }

-            inline charseq(_In_ int _rank, _In_ const std::wstring &_str) :
+            inline charseq(_In_ short _rank, _In_ const std::wstring &_str) :
                rank(_rank),
                str (_str)
            {
            }

-            inline charseq(_In_ int _rank, _Inout_ std::wstring &&_str) :
+            inline charseq(_In_ short _rank, _Inout_ std::wstring &&_str) :
                rank(_rank),
                str (std::move(_str))
            {
@@ -113,12 +113,12 @@ namespace ZRCola {
        ///
        class translation {
        public:
-            int set;            ///< Translation set ID
+            short set;          ///< Translation set ID
            charseq src;        ///< Source sequence
            std::string norm;   ///< Normalization footprint
            charseq dst;        ///< Destination sequence

-            inline translation() : set((int)ZRCOLA_TRANSEQID_DEFAULT) {}
+            inline translation() : set((short)ZRCOLA_TRANSETID_DEFAULT) {}
        };


@@ -127,11 +127,11 @@ namespace ZRCola {
        ///
        class transet {
        public:
-            int set;            ///< ID
+            short set;          ///< ID
            std::wstring src;   ///< Source name
            std::wstring dst;   ///< Destination name

-            inline transet() : set((int)ZRCOLA_TRANSEQID_DEFAULT) {}
+            inline transet() : set((short)ZRCOLA_TRANSETID_DEFAULT) {}
        };


@@ -140,10 +140,10 @@ namespace ZRCola {
        ///
        class transeq {
        public:
-            int seq;                ///< ID
-            int rank;               ///< Rank
-            std::wstring name;      ///< Name
-            std::vector<int> sets;  ///< Sets
+            short seq;                  ///< ID
+            short rank;                 ///< Rank
+            std::wstring name;          ///< Name
+            std::vector<short> sets;    ///< Sets

            inline transeq() :
                seq(0),
@@ -222,8 +222,8 @@ namespace ZRCola {
        ///
        class chrgrp {
        public:
-            int grp;                            ///< Character group ID
-            int rank;                           ///< Rank
+            short grp;                          ///< Character group ID
+            short rank;                         ///< Rank
            std::wstring name;                  ///< Name
            std::vector<wchar_t> chars;         ///< Characters (zero-delimited)
            std::vector<unsigned __int16> show; ///< Bit vector if particular character from \c chars is displayed initially
@@ -373,7 +373,7 @@ namespace ZRCola {
        class chrcat {
        public:
            ZRCola::chrcatid_t cat;     ///> Category ID
-            int rank;                   ///< Rank
+            short rank;                 ///< Rank
            std::wstring name;          ///< Name

            inline chrcat() : cat(ZRCola::chrcatid_t::blank), rank(0) {}
@@ -386,7 +386,7 @@ namespace ZRCola {
        class chrtag {
        public:
            std::wstring chr;           ///> Character
-            int tag;                    ///< Tag ID
+            short tag;                  ///< Tag ID

            inline chrtag() : tag(0) {}
        };
@@ -397,13 +397,25 @@ namespace ZRCola {
        ///
        class tagname {
        public:
-            int tag;                    ///< Tag ID
+            short tag;                  ///< Tag ID
            std::map<LCID, std::list<std::wstring> > names; ///< Names

            inline tagname() : tag(0) {}
        };


+        ///
+        /// Highlight
+        ///
+        class highlight {
+        public:
+            short set;          ///< Highlight set ID
+            std::wstring chr;   ///< Character sequence
+
+            inline highlight() : set((short)ZRCOLA_HLGHTSETID_DEFAULT) {}
+        };
+
+
    public:
        DBSource();
        virtual ~DBSource();
@@ -452,18 +464,6 @@ namespace ZRCola {
            return SUCCEEDED(rs->get_RecordCount(&count)) ? count : (size_t)-1;
        }

-        ///
-        /// Splits string to individual keywords
-        ///
-        /// \param[in ] str       String
-        /// \param[out] keywords  Array of keywords
-        ///
-        /// \returns
-        /// - true when successful
-        /// - false otherwise
-        ///
-        static bool GetKeywords(const wchar_t *str, std::vector< std::wstring > &keywords);
-
        ///
        /// Gets boolean from ZRCola.zrc database
        ///
@@ -486,7 +486,7 @@ namespace ZRCola {
        /// - true when successful
        /// - false otherwise
        ///
-        bool GetValue(const winstd::com_obj<ADOField>& f, int& val) const;
+        bool GetValue(const winstd::com_obj<ADOField>& f, short& val) const;

        ///
        /// Gets string from ZRCola.zrc database
@@ -628,7 +628,7 @@ namespace ZRCola {
        /// - true when query succeeds
        /// - false otherwise
        ///
-        bool SelectTranslations(int set, winstd::com_obj<ADORecordset>& rs) const;
+        bool SelectTranslations(short set, winstd::com_obj<ADORecordset>& rs) const;

        ///
        /// Returns translation data
@@ -872,6 +872,30 @@ namespace ZRCola {
        ///
        bool GetTagName(const winstd::com_obj<ADORecordset>& rs, tagname& tn) const;

+        ///
+        /// Returns character highlights by set
+        ///
+        /// \param[in ] set  Highlight set ID
+        /// \param[out] rs   Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectHighlights(short set, winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns highlight data
+        ///
+        /// \param[in]  rs  Recordset with results
+        /// \param[out] h   Highlight
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetHighlight(const winstd::com_obj<ADORecordset>& rs, highlight& h) const;
+
    protected:
        std::basic_string<TCHAR> m_filename;    ///< Database filename
        winstd::com_obj<ADOConnection> m_db;    ///< Database
@@ -886,6 +910,9 @@ namespace ZRCola {
        winstd::com_obj<ADOCommand> m_comTranslationSets;   ///< ADO Command for GetTranslationSeq subquery
        winstd::com_obj<ADOParameter> m_pTranslationSets1;  ///< \c m_comTranslationSets parameter

+        winstd::com_obj<ADOCommand> m_comHighlight;         ///< ADO Command for SelectHighlights subquery
+        winstd::com_obj<ADOParameter> m_pHighlight1;        ///< \c m_comHighlights parameter
+
        std::set<std::wstring> m_terms_ignore;  ///< Terms to ignore when comparing characters
    };
 };
@@ -894,11 +921,8 @@ namespace ZRCola {
 inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _In_ const ZRCola::DBSource::translation &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff0000 <= rec.set && rec.set <= (int)0x0000ffff, wxT("translation set id out of bounds"));
    db.data.push_back((unsigned __int16)rec.set);
-    wxASSERT_MSG((int)0xffff8000 <= rec.dst.rank && rec.dst.rank <= (int)0x00007fff, wxT("destination character rank out of bounds"));
    db.data.push_back((unsigned __int16)rec.dst.rank);
-    wxASSERT_MSG((int)0xffff8000 <= rec.src.rank && rec.src.rank <= (int)0x00007fff, wxT("source character rank out of bounds"));
    db.data.push_back((unsigned __int16)rec.src.rank);
    std::wstring::size_type n = rec.dst.str.length();
    wxASSERT_MSG(n <= 0xffff, wxT("destination overflow"));
@@ -918,7 +942,6 @@ inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _I
 inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const ZRCola::DBSource::transet &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff0000 <= rec.set && rec.set <= (int)0x0000ffff, wxT("translation set id out of bounds"));
    db.data.push_back((unsigned __int16)rec.set);
    std::wstring::size_type n = rec.src.length();
    wxASSERT_MSG(n <= 0xffff, wxT("translation set source name overflow"));
@@ -937,9 +960,7 @@ inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const
 inline ZRCola::transeq_db& operator<<(_Inout_ ZRCola::transeq_db &db, _In_ const ZRCola::DBSource::transeq &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.seq && rec.seq <= (int)0x00007fff, wxT("translation sequence id out of bounds"));
    db.data.push_back((unsigned __int16)rec.seq);
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("translation rank id out of bounds"));
    db.data.push_back((unsigned __int16)rec.rank);
    std::wstring::size_type n = rec.name.length();
    wxASSERT_MSG(n <= 0xffff, wxT("translation sequence name overflow"));
@@ -948,11 +969,8 @@ inline ZRCola::transeq_db& operator<<(_Inout_ ZRCola::transeq_db &db, _In_ const
    wxASSERT_MSG(n <= 0xffff, wxT("translation sequence sets overflow"));
    db.data.push_back((unsigned __int16)n);
    db.data.insert(db.data.end(), rec.name.cbegin(), rec.name.cend());
-    for (auto s = rec.sets.cbegin(), s_end = rec.sets.cend(); s != s_end; ++s) {
-        int val = *s;
-        wxASSERT_MSG(val <= 0xffff, wxT("translation sequence ID overflow"));
-        db.data.push_back((unsigned __int16)val);
-    }
+    for (auto s = rec.sets.cbegin(), s_end = rec.sets.cend(); s != s_end; ++s)
+        db.data.push_back((unsigned __int16)*s);
    db.idxTranSeq.push_back(idx);
    db.idxRank   .push_back(idx);

@@ -1018,9 +1036,7 @@ inline ZRCola::langchar_db& operator<<(_Inout_ ZRCola::langchar_db &db, _In_ con
 inline ZRCola::chrgrp_db& operator<<(_Inout_ ZRCola::chrgrp_db &db, _In_ const ZRCola::DBSource::chrgrp &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.grp && rec.grp <= (int)0x00007fff, wxT("character group ID out of bounds"));
    db.data.push_back((unsigned __int16)rec.grp);
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("character group rank out of bounds"));
    db.data.push_back((unsigned __int16)rec.rank);
    std::wstring::size_type n = rec.name.length();
    wxASSERT_MSG(n <= 0xffff, wxT("character group name overflow"));
@@ -1063,7 +1079,6 @@ inline ZRCola::chrcat_db& operator<<(_Inout_ ZRCola::chrcat_db &db, _In_ const Z
 {
    unsigned __int32 idx = db.data.size();
    db.data.insert(db.data.end(), reinterpret_cast<const unsigned __int16*>(&rec.cat), reinterpret_cast<const unsigned __int16*>(&rec.cat + 1));
-    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("character category rank out of bounds"));
    db.data.push_back((unsigned __int16)rec.rank);
    std::wstring::size_type n = rec.name.length();
    wxASSERT_MSG(n <= 0xffff, wxT("character category name overflow"));
@@ -1079,7 +1094,6 @@ inline ZRCola::chrcat_db& operator<<(_Inout_ ZRCola::chrcat_db &db, _In_ const Z
 inline ZRCola::chrtag_db& operator<<(_Inout_ ZRCola::chrtag_db &db, _In_ const ZRCola::DBSource::chrtag &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.tag && rec.tag <= (int)0x00007fff, wxT("tag out of bounds"));
    db.data.push_back((unsigned __int16)rec.tag);
    std::wstring::size_type n = rec.chr.length();
    wxASSERT_MSG(n <= 0xffff, wxT("character overflow"));
@@ -1097,7 +1111,6 @@ inline ZRCola::tagname_db& operator<<(_Inout_ ZRCola::tagname_db &db, _In_ const
    for (auto ln = rec.names.cbegin(), ln_end = rec.names.cend(); ln != ln_end; ++ln) {
        for (auto nm = ln->second.cbegin(), nm_end = ln->second.cend(); nm != nm_end; ++nm) {
            unsigned __int32 idx = db.data.size();
-            wxASSERT_MSG((int)0xffff8000 <= rec.tag && rec.tag <= (int)0x00007fff, wxT("tag out of bounds"));
            db.data.push_back((unsigned __int16)rec.tag);
            db.data.push_back(LOWORD(ln->first));
            db.data.push_back(HIWORD(ln->first));
@@ -1112,3 +1125,17 @@ inline ZRCola::tagname_db& operator<<(_Inout_ ZRCola::tagname_db &db, _In_ const

    return db;
 }
+
+
+inline ZRCola::highlight_db& operator<<(_Inout_ ZRCola::highlight_db &db, _In_ const ZRCola::DBSource::highlight &rec)
+{
+    unsigned __int32 idx = db.data.size();
+    db.data.push_back((unsigned __int16)rec.set);
+    std::wstring::size_type n = rec.chr.length();
+    wxASSERT_MSG(n <= 0xffff, wxT("character overflow"));
+    db.data.push_back((unsigned __int16)n);
+    db.data.insert(db.data.end(), rec.chr.cbegin(), rec.chr.cend());
+    db.idxChr.push_back(idx);
+
+    return db;
+}
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -16,8 +16,8 @@ using namespace winstd;
 class com_translation
 {
 public:
-    int rank_src;                   ///< Source sequence rank
-    int rank_dst;                   ///< Destination character rank
+    short rank_src;                 ///< Source sequence rank
+    short rank_dst;                 ///< Destination character rank
    string norm;                    ///< Normalization footprint

    inline com_translation() :
@@ -26,20 +26,20 @@ public:
    {
    }

-    inline com_translation(int _rank_src, int _rank_dst) :
+    inline com_translation(short _rank_src, short _rank_dst) :
        rank_src(_rank_src),
        rank_dst(_rank_dst)
    {
    }

-    inline com_translation(int _rank_src, int _rank_dst, const char *_norm) :
+    inline com_translation(short _rank_src, short _rank_dst, const char *_norm) :
        rank_src(_rank_src),
        rank_dst(_rank_dst),
        norm    (_norm    )
    {
    }

-    inline com_translation(int _rank_src, int _rank_dst, string &&_norm) :
+    inline com_translation(short _rank_src, short _rank_dst, string &&_norm) :
        rank_src(          _rank_src ),
        rank_dst(          _rank_dst ),
        norm    (std::move(_norm    ))
@@ -365,8 +365,8 @@ int _tmain(int argc, _TCHAR *argv[])
                            translation_db::mapped_type::mapped_type ct(d1->second.rank_src + r->rank, d1->second.rank_dst);
                            auto hit = t2->second.find(r->str);
                            if (hit != t2->second.end()) {
-                                hit->second.rank_src = std::min<int>(hit->second.rank_src, ct.rank_src);
-                                hit->second.rank_dst = std::max<int>(hit->second.rank_dst, ct.rank_dst);
+                                hit->second.rank_src = std::min<short>(hit->second.rank_src, ct.rank_src);
+                                hit->second.rank_dst = std::max<short>(hit->second.rank_dst, ct.rank_dst);
                            } else
                                t2->second.insert(pair<translation_db::mapped_type::key_type, translation_db::mapped_type::mapped_type>(r->str, std::move(ct)));
                        }
@@ -374,21 +374,34 @@ int _tmain(int argc, _TCHAR *argv[])
                }

                // Preallocate memory.
-                db_trans.idxSrc.reserve(count);
-                db_trans.idxDst.reserve(count);
-                db_trans.data  .reserve(count*5);
+                db_trans.idxSrc.reserve(count*2);
+                db_trans.idxDst.reserve(count*2);
+                db_trans.data  .reserve(count*2*8);

                // Parse translations and build index and data.
                ZRCola::DBSource::translation trans;
-                trans.set = 0;
                for (auto t = db_temp2.cbegin(), t_end = db_temp2.cend(); t != t_end; ++t) {
                    // Add translation to index and data.
                    trans.dst.str = t->first;
                    for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
+                        trans.set = (short)ZRCOLA_TRANSETID_DEFAULT;
                        trans.dst.rank = d->second.rank_dst;
                        trans.src.rank = d->second.rank_src;
                        trans.src.str  = d->first;
                        db_trans << trans;
+
+                        // If destination contains no PUA characters, add it to the ZRCola » Unicode transliteration too.
+                        bool has_pua = false;
+                        for (auto ch = trans.dst.str.cbegin(), ch_end = trans.dst.str.cend(); ch != ch_end; ++ch)
+                            if (ZRCola::ispua(*ch)) {
+                                has_pua = true;
+                                break;
+                            }
+                        if (!has_pua) {
+                            trans.set = (short)ZRCOLA_TRANSETID_UNICODE;
+                            trans.dst.rank += 50;
+                            db_trans << trans;
+                        }
                    }
                }
            } else {
@@ -401,6 +414,37 @@ int _tmain(int argc, _TCHAR *argv[])
        }
    }

+    {
+        com_obj<ADORecordset> rs_tran;
+        if (src.SelectTranslations(static_cast<short>(ZRCOLA_TRANSETID_UNICODE), rs_tran)) {
+            size_t count = src.GetRecordsetCount(rs_tran);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                // Preallocate memory.
+                db_trans.idxSrc.reserve(db_trans.idxSrc.size() + count);
+                db_trans.idxDst.reserve(db_trans.idxDst.size() + count);
+                db_trans.data  .reserve(db_trans.data.size()   + count*8);
+
+                // 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;
@@ -416,11 +460,8 @@ int _tmain(int argc, _TCHAR *argv[])
                    // Read translation set from the database.
                    ZRCola::DBSource::transet ts;
                    if (src.GetTranslationSet(rs, ts)) {
-                        if (ts.set <= (int)ZRCOLA_TRANSEQID_DEFAULT) {
-                            _ftprintf(stderr, wxT("%s: error ZCC0008: Translation set is using reserved ID %i.\n"), (LPCTSTR)filenameIn.c_str(), ts.set);
-                            has_errors = true;
+                        if (ts.set <= (short)ZRCOLA_TRANSETID_DEFAULT || (short)ZRCOLA_TRANSETID_UNICODE <= ts.set)
                            continue;
-                        }

                        if (build_pot) {
                            pot.insert(ts.src);
@@ -433,7 +474,13 @@ int _tmain(int argc, _TCHAR *argv[])
                        // Get translations.
                        com_obj<ADORecordset> rs_tran;
                        if (src.SelectTranslations(ts.set, rs_tran)) {
-                            if (src.GetRecordsetCount(rs_tran) < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                            count = src.GetRecordsetCount(rs_tran);
+                            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                                // Preallocate memory.
+                                db_trans.idxSrc.reserve(db_trans.idxSrc.size() + count);
+                                db_trans.idxDst.reserve(db_trans.idxDst.size() + count);
+                                db_trans.data  .reserve(db_trans.data.size()   + count*8);
+
                                // Parse translations and build temporary database.
                                ZRCola::DBSource::translation trans;
                                trans.set = ts.set;
@@ -466,17 +513,13 @@ int _tmain(int argc, _TCHAR *argv[])
        }
    }

-    // Sort indices.
-    db_transset.idxTranSet.sort();
-
    // Write translation sets to file.
+    db_transset.idxTranSet.sort();
    dst << ZRCola::transet_rec(db_transset);

-    // Sort indices.
+    // Write translations to file.
    db_trans.idxSrc.sort();
    db_trans.idxDst.sort();
-
-    // Write translations to file.
    dst << ZRCola::translation_rec(db_trans);

    {
@@ -506,11 +549,9 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
+                // Write translation sequences to file.
                db.idxTranSeq.sort();
                db.idxRank   .sort();
-
-                // Write translation sequences to file.
                dst << ZRCola::transeq_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0025: Error getting translation sequence count from database or too many translation sequences.\n"), (LPCTSTR)filenameIn.c_str());
@@ -605,10 +646,8 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
-                db.idxLang.sort();
-
                // Write languages to file.
+                db.idxLang.sort();
                dst << ZRCola::language_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0009: Error getting language count from database or too many languages.\n"), (LPCTSTR)filenameIn.c_str());
@@ -646,13 +685,11 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
+                // Write language characters to file.
                db.idxChr .sort();
 #ifdef ZRCOLA_LANGCHAR_LANG_IDX
                db.idxLang.sort();
 #endif
-
-                // Write language characters to file.
                dst << ZRCola::langchar_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0011: Error getting language characters count from database or too many langchars.\n"), (LPCTSTR)filenameIn.c_str());
@@ -695,10 +732,8 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
-                db.idxRank.sort();
-
                // Write character groups to file.
+                db.idxRank.sort();
                dst << ZRCola::chrgrp_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0015: Error getting character group count from database or too many character groups.\n"), (LPCTSTR)filenameIn.c_str());
@@ -719,7 +754,6 @@ int _tmain(int argc, _TCHAR *argv[])
            size_t count = src.GetRecordsetCount(rs);
            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
                ZRCola::DBSource::character_desc_idx idxChrDsc, idxChrDscSub;
-
                ZRCola::DBSource::character_bank chrs;

                // Phase 1: Parse characters and build indexes.
@@ -754,14 +788,10 @@ int _tmain(int argc, _TCHAR *argv[])
                    categories_used.insert(chr->second.cat);
                }

-                // Sort indices.
+                // Write characters to file.
                db.idxChr.sort();
-
-                // Save text indices.
                idxChrDsc   .save(db.idxDsc   );
                idxChrDscSub.save(db.idxDscSub);
-
-                // Write characters to file.
                dst << ZRCola::character_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0017: Error getting character count from database or too many characters.\n"), (LPCTSTR)filenameIn.c_str());
@@ -805,11 +835,9 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
+                // Write character categories to file.
                db.idxChrCat.sort();
                db.idxRank  .sort();
-
-                // Write character categories to file.
                dst << ZRCola::chrcat_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0019: Error getting character category count from database or too many character categories.\n"), (LPCTSTR)filenameIn.c_str());
@@ -845,11 +873,9 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
+                // Write characters tags to file.
                db.idxChr.sort();
                db.idxTag.sort();
-
-                // Write characters tags to file.
                dst << ZRCola::chrtag_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0021: Error getting characters tags count from database or too many character tags.\n"), (LPCTSTR)filenameIn.c_str());
@@ -885,11 +911,9 @@ int _tmain(int argc, _TCHAR *argv[])
                        has_errors = true;
                }

-                // Sort indices.
+                // Write tags to file.
                db.idxName.sort();
                db.idxTag .sort();
-
-                // Write tags to file.
                dst << ZRCola::tagname_rec(db);
            } else {
                _ftprintf(stderr, wxT("%s: error ZCC0023: Error getting tag name count from database or too many tags.\n"), (LPCTSTR)filenameIn.c_str());
@@ -901,6 +925,43 @@ int _tmain(int argc, _TCHAR *argv[])
        }
    }

+    {
+        // Get highlights.
+        com_obj<ADORecordset> rs;
+        if (src.SelectHighlights((short)ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES, rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                ZRCola::DBSource::highlight h;
+                ZRCola::highlight_db db;
+
+                // Preallocate memory.
+                db.idxChr.reserve(count);
+                db.data  .reserve(count*5);
+
+                // Parse highlights and build index and data.
+                h.set = (short)ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES;
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read tag name from the database.
+                    if (src.GetHighlight(rs, h)) {
+                        // Add highlight to index and data.
+                        db << h;
+                    } else
+                        has_errors = true;
+                }
+
+                // Write highlights to file.
+                db.idxChr.sort();
+                dst << ZRCola::highlight_rec(db);
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0027: Error getting highlight count from database or too many tags.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0026: Error getting highlights from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
    idrec::close<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dst, dst_start);

    if (dst.fail()) {
--- a/include/version.h
+++ b/include/version.h
@@ -9,7 +9,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02050400
+#define PRODUCT_VERSION          0x02050500

 //
 // Product version by components
@@ -19,26 +19,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      5
-#define PRODUCT_VERSION_REV      4
+#define PRODUCT_VERSION_REV      5
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.5.4"
+#define PRODUCT_VERSION_STR      "2.5.5"
 #define PRODUCT_BUILD_YEAR_STR   "2021"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.5.4"
+#define PRODUCT_VERSION_INST     "2.5.5"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{EBF841F9-2BFB-444C-AC5E-874586350EFD}"
+#define PRODUCT_VERSION_GUID     "{109805EF-6EB5-4F43-A05A-82B3862E16B5}"

 //
 // The product vendor and application name for configuration keeping.
--- a/lib/libZRCola/build/libZRCola.vcxproj
+++ b/lib/libZRCola/build/libZRCola.vcxproj
@@ -64,6 +64,7 @@
  <ItemGroup>
    <ClCompile Include="..\src\character.cpp" />
    <ClCompile Include="..\src\common.cpp" />
+    <ClCompile Include="..\src\highlight.cpp" />
    <ClCompile Include="..\src\language.cpp" />
    <ClCompile Include="..\src\mapping.cpp" />
    <ClCompile Include="..\src\pch.cpp">
@@ -75,6 +76,7 @@
  <ItemGroup>
    <ClInclude Include="..\include\zrcola\character.h" />
    <ClInclude Include="..\include\zrcola\common.h" />
+    <ClInclude Include="..\include\zrcola\highlight.h" />
    <ClInclude Include="..\include\zrcola\language.h" />
    <ClInclude Include="..\include\zrcola\tag.h" />
    <ClInclude Include="..\include\zrcola\translate.h" />
--- a/lib/libZRCola/build/libZRCola.vcxproj.filters
+++ b/lib/libZRCola/build/libZRCola.vcxproj.filters
@@ -32,6 +32,9 @@
    <ClCompile Include="..\src\tag.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\src\highlight.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\src\pch.h">
@@ -52,5 +55,8 @@
    <ClInclude Include="..\include\zrcola\tag.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\include\zrcola\highlight.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
 </Project>
--- a/lib/libZRCola/include/zrcola/character.h
+++ b/lib/libZRCola/include/zrcola/character.h
@@ -29,6 +29,11 @@ namespace ZRCola {
    ///
    typedef double charrank_t;

+    inline bool ispua(_In_ wchar_t c)
+    {
+        return L'\ue000' <= c && c <= L'\uf8ff';
+    }
+
 #pragma pack(push)
 #pragma pack(2)
    ///
--- a/lib/libZRCola/include/zrcola/highlight.h
+++ b/lib/libZRCola/include/zrcola/highlight.h
@@ -0,0 +1,240 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2021 Amebis
+*/
+
+#pragma once
+
+#include "common.h"
+
+#include <stdex/idrec.h>
+
+#include <functional>
+
+#pragma warning(push)
+#pragma warning(disable: 4200)
+
+///
+/// Default highlight
+///
+#define ZRCOLA_HLGHTSETID_DEFAULT                           ((ZRCola::hlghtsetid_t)0x0000)
+
+
+///
+/// ZRCola Unicode Composed Issues
+///
+#define ZRCOLA_HLGHTSETID_ZRCOLA_UNICODE_COMPOSED_ISSUES    ((ZRCola::hlghtsetid_t)0x0001)
+
+namespace ZRCola {
+    ///
+    /// Highlight set ID
+    ///
+    typedef unsigned __int16 hlghtsetid_t;
+
+    ///
+    /// Highlight database
+    ///
+    class highlight_db {
+    public:
+#pragma pack(push)
+#pragma pack(2)
+        ///
+        /// Highlight data
+        ///
+        struct highlight {
+        public:
+            hlghtsetid_t set;           ///< Highlight set ID
+
+        protected:
+            unsigned __int16 chr_to;    ///< Character end in \c data
+            wchar_t data[];             ///< Character
+
+        private:
+            inline highlight(_In_ const highlight &other);
+            inline highlight& operator=(_In_ const highlight &other);
+
+        public:
+            ///
+            /// Constructs the highlight
+            ///
+            /// \param[in] set      Highlight set ID
+            /// \param[in] chr      Character
+            /// \param[in] chr_len  Number of UTF-16 characters in \p chr
+            ///
+            inline highlight(
+                _In_opt_                        hlghtsetid_t  set     = 0,
+                _In_opt_z_count_(chr_len) const wchar_t      *chr     = NULL,
+                _In_opt_                        size_t        chr_len = 0)
+            {
+                this->set    = set;
+                this->chr_to = static_cast<unsigned __int16>(chr_len);
+                if (chr && chr_len) memcpy(this->data, chr, sizeof(wchar_t)*chr_len);
+            }
+
+            inline const wchar_t*         chr    () const { return data;          };
+            inline       wchar_t*         chr    ()       { return data;          };
+            inline const wchar_t*         chr_end() const { return data + chr_to; };
+            inline       wchar_t*         chr_end()       { return data + chr_to; };
+            inline       unsigned __int16 chr_len() const { return chr_to;        };
+
+            inline wchar_t chr_at(_In_ size_t i) const
+            {
+                return i < chr_to ? data[i] : 0;
+            }
+        };
+#pragma pack(pop)
+
+        ///
+        /// Highlight index
+        ///
+        class indexChr : public index<unsigned __int16, unsigned __int32, highlight>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h  Reference to vector holding the data
+            ///
+            indexChr(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, highlight>(h) {}
+
+            ///
+            /// Compares two highlights by string (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const highlight &a, _In_ const highlight &b) const
+            {
+                int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len());
+                if (r != 0) return r;
+
+                     if (a.set < b.set) return -1;
+                else if (a.set > b.set) return +1;
+
+                return 0;
+            }
+
+            ///
+            /// Compares two highlights by string (for sorting)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare_sort(_In_ const highlight &a, _In_ const highlight &b) const
+            {
+                // Revert to `compare()` by default.
+                return compare(a, b);
+            }
+        } idxChr;   ///< Highlight index
+
+
+        std::vector<unsigned __int16> data;         ///< Highlight data
+
+    public:
+        ///
+        /// Constructs the database
+        ///
+        inline highlight_db() : idxChr(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr.clear();
+            data  .clear();
+        }
+
+        ///
+        /// Highlights string
+        ///
+        /// \param[in] input     Input string (UTF-16)
+        /// \param[in] inputMax  Length of the input string in characters. Can be (size_t)-1 if \p input is zero terminated.
+        /// \param[in] callback  Function to be called on highlight switch
+        ///
+        void Highlight(_In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _In_ std::function<void (hlghtsetid_t set, size_t start, size_t end)> callback) const;
+    };
+
+
+    typedef stdex::idrec::record<highlight_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> highlight_rec;
+};
+
+
+const ZRCola::recordid_t ZRCola::highlight_rec::id = *(ZRCola::recordid_t*)"HGH";
+
+
+///
+/// Writes highlight database to a stream
+///
+/// \param[in] stream  Output stream
+/// \param[in] db      Highlight database
+///
+/// \returns The stream \p stream
+///
+inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::highlight_db &db)
+{
+    // Write highlight index.
+    if (stream.fail()) return stream;
+    stream << db.idxChr;
+
+    // Write data count.
+    auto data_count = db.data.size();
+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
+    // 4G check
+    if (data_count > 0xffffffff) {
+        stream.setstate(std::ios_base::failbit);
+        return stream;
+    }
+#endif
+    if (stream.fail()) return stream;
+    unsigned __int32 count = (unsigned __int32)data_count;
+    stream.write((const char*)&count, sizeof(count));
+
+    // Write data.
+    if (stream.fail()) return stream;
+    stream.write((const char*)db.data.data(), sizeof(unsigned __int16)*static_cast<std::streamsize>(count));
+
+    return stream;
+}
+
+
+///
+/// Reads highlight database from a stream
+///
+/// \param[in ] stream  Input stream
+/// \param[out] db      Highlight database
+///
+/// \returns The stream \p stream
+///
+inline std::istream& operator >>(_In_ std::istream& stream, _Out_ ZRCola::highlight_db &db)
+{
+    // Read highlight index.
+    stream >> db.idxChr;
+    if (!stream.good()) return stream;
+
+    // Read data count.
+    unsigned __int32 count;
+    stream.read((char*)&count, sizeof(count));
+    if (!stream.good()) return stream;
+
+    if (count) {
+        // Read data.
+        db.data.resize(count);
+        stream.read((char*)db.data.data(), sizeof(unsigned __int16)*static_cast<std::streamsize>(count));
+    } else
+        db.data.clear();
+
+    return stream;
+}
+
+#pragma warning(pop)
--- a/lib/libZRCola/include/zrcola/translate.h
+++ b/lib/libZRCola/include/zrcola/translate.h
@@ -20,6 +20,16 @@
 #pragma warning(disable: 4251)
 #pragma warning(disable: 4512)

+///
+/// ZRCola (De)Composition
+///
+#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
 ///
@@ -30,11 +40,6 @@
 ///
 #define ZRCOLA_TRANSEQID_CUSTOM     ((ZRCola::transeqid_t)0xffff)

-///
-/// ZRCola to Unicode translation sequence ID
-///
-#define ZRCOLA_TRANSEQID_UNICODE    ((ZRCola::transeqid_t)31)
-

 namespace ZRCola {
    ///
--- a/lib/libZRCola/src/highlight.cpp
+++ b/lib/libZRCola/src/highlight.cpp
@@ -0,0 +1,77 @@
+/*
+    SPDX-License-Identifier: GPL-3.0-or-later
+    Copyright © 2021 Amebis
+*/
+
+#include "pch.h"
+
+_Use_decl_annotations_
+void ZRCola::highlight_db::Highlight(const wchar_t* input, size_t inputMax, std::function<void (hlghtsetid_t set, size_t start, size_t end)> callback) const
+{
+    size_t start = 0;
+    hlghtsetid_t set = ZRCOLA_HLGHTSETID_DEFAULT;
+
+    for (size_t i = 0; i < inputMax;) {
+        // Find the longest matching highlight at i-th character.
+        size_t l_match = (size_t)-1;
+        for (size_t l = 0, r = idxChr.size(), ii = i, j = 0; ii < inputMax && l < r; ii++, j++) {
+            wchar_t c = input[ii];
+            while (l < r) {
+                // Test the highlight in the middle of the search area.
+                size_t m = (l + r) / 2;
+
+                // Get the j-th character of the highlight.
+                // All highlights that get short on characters are lexically ordered before.
+                // Thus the j-th character is considered 0.
+                wchar_t s = idxChr[m].chr_at(j);
+
+                // Do the bisection test.
+                     if (c < s) r = m;
+                else if (s < c) l = m + 1;
+                else {
+                    // Character found.
+
+                    // Narrow the search area on the left to start at the first highlight in the run.
+                    for (size_t r2 = m; l < r2;) {
+                        size_t m2 = (l + r2) / 2;
+                        if (c <= idxChr[m2].chr_at(j)) r2 = m2; else l = m2 + 1;
+                    }
+
+                    // Narrow the search area on the right to end at the first highlight not in the run.
+                    for (size_t l2 = m + 1; l2 < r;) {
+                        size_t m2 = (l2 + r) / 2;
+                        if (idxChr[m2].chr_at(j) <= c) l2 = m2 + 1; else r = m2;
+                    }
+
+                    if (j + 1 == idxChr[l].chr_len()) {
+                        // The first highlight of the run was a match (thus far). Save it.
+                        l_match = l;
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        if (l_match < idxChr.size()) {
+            // The saved highlight was an exact match.
+            const highlight &hghl = idxChr[l_match];
+            if (set != hghl.set) {
+                callback(set, start, i);
+                start = i;
+                set   = hghl.set;
+            }
+            i += hghl.chr_len();
+        } else {
+            // The match was not found.
+            if (set != ZRCOLA_HLGHTSETID_DEFAULT) {
+                callback(set, start, i);
+                start = i;
+                set   = ZRCOLA_HLGHTSETID_DEFAULT;
+            }
+            i++;
+        }
+    }
+
+    callback(set, start, inputMax);
+}
--- a/lib/libZRCola/src/pch.h
+++ b/lib/libZRCola/src/pch.h
@@ -8,6 +8,7 @@
 #include "../../../include/version.h"

 #include "../include/zrcola/character.h"
+#include "../include/zrcola/highlight.h"
 #include "../include/zrcola/language.h"
 #include "../include/zrcola/translate.h"
 #include "../include/zrcola/tag.h"
--- a/output/data/ZRCola.zrcdb
+++ b/output/data/ZRCola.zrcdb
--- a/output/locale/ZRCola-zrcdb.pot
+++ b/output/locale/ZRCola-zrcdb.pot
@@ -694,24 +694,9 @@ msgstr ""
 msgid "Ukrainian"
 msgstr ""

-msgid "Unicode"
-msgstr ""
-
-msgid "Unicode Combining"
-msgstr ""
-
 msgid "Units"
 msgstr ""

-msgid "ZRCola"
-msgstr ""
-
-msgid "ZRCola Composed"
-msgstr ""
-
-msgid "ZRCola » Unicode"
-msgstr ""
-
 msgid "l+j l|j"
 msgstr ""

--- a/output/locale/de_DE/ZRCola-zrcdb.po
+++ b/output/locale/de_DE/ZRCola-zrcdb.po
@@ -700,24 +700,9 @@ msgstr ""
 msgid "Ukrainian"
 msgstr ""

-msgid "Unicode"
-msgstr "Unicode"
-
-msgid "Unicode Combining"
-msgstr ""
-
 msgid "Units"
 msgstr ""

-msgid "ZRCola"
-msgstr "ZRCola"
-
-msgid "ZRCola Composed"
-msgstr ""
-
-msgid "ZRCola » Unicode"
-msgstr "ZRCola » Unicode"
-
 msgid "l+j l|j"
 msgstr ""

@@ -726,3 +711,12 @@ msgstr ""

 msgid "small Case"
 msgstr ""
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "ZRCola"
+#~ msgstr "ZRCola"
+
+#~ msgid "ZRCola » Unicode"
+#~ msgstr "ZRCola » Unicode"
--- a/output/locale/ru_RU/ZRCola-zrcdb.po
+++ b/output/locale/ru_RU/ZRCola-zrcdb.po
@@ -702,24 +702,9 @@ msgstr "турецкий"
 msgid "Ukrainian"
 msgstr "украинский"

-msgid "Unicode"
-msgstr "Юникод"
-
-msgid "Unicode Combining"
-msgstr "комбинируемые символы в Юникоде"
-
 msgid "Units"
 msgstr "Единицы"

-msgid "ZRCola"
-msgstr "ZRCola"
-
-msgid "ZRCola Composed"
-msgstr "ZRCola составленное"
-
-msgid "ZRCola » Unicode"
-msgstr "ZRCola » Юникод"
-
 msgid "l+j l|j"
 msgstr "l+j l|j"

@@ -729,6 +714,21 @@ msgstr "без + |"
 msgid "small Case"
 msgstr "строчние буквы"

+#~ msgid "Unicode"
+#~ msgstr "Юникод"
+
+#~ msgid "Unicode Combining"
+#~ msgstr "комбинируемые символы в Юникоде"
+
+#~ msgid "ZRCola"
+#~ msgstr "ZRCola"
+
+#~ msgid "ZRCola Composed"
+#~ msgstr "ZRCola составленное"
+
+#~ msgid "ZRCola » Unicode"
+#~ msgstr "ZRCola » Юникод"
+
 #~ msgid "ZRCola Composed » Unicode Combining"
 #~ msgstr "ZRCola составленное » комбинируемые символы в Юникоде"

--- a/output/locale/sl_SI/ZRCola-zrcdb.po
+++ b/output/locale/sl_SI/ZRCola-zrcdb.po
@@ -702,24 +702,9 @@ msgstr "turščina"
 msgid "Ukrainian"
 msgstr "ukrajinščina"

-msgid "Unicode"
-msgstr "Unicode"
-
-msgid "Unicode Combining"
-msgstr "sestavljivi Unicode"
-
 msgid "Units"
 msgstr "Enote"

-msgid "ZRCola"
-msgstr "ZRCola"
-
-msgid "ZRCola Composed"
-msgstr "ZRCola-sestavljeno"
-
-msgid "ZRCola » Unicode"
-msgstr "ZRCola » Unicode"
-
 msgid "l+j l|j"
 msgstr "l+j l|j"

@@ -729,6 +714,21 @@ msgstr "brez + |"
 msgid "small Case"
 msgstr "male črke"

+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Unicode Combining"
+#~ msgstr "sestavljivi Unicode"
+
+#~ msgid "ZRCola"
+#~ msgstr "ZRCola"
+
+#~ msgid "ZRCola Composed"
+#~ msgstr "ZRCola-sestavljeno"
+
+#~ msgid "ZRCola » Unicode"
+#~ msgstr "ZRCola » Unicode"
+
 #~ msgid "ZRCola Composed » Unicode Combining"
 #~ msgstr "ZRCola-sestavljeno » sestavljivi Unicode"
Author	SHA1	Message	Date
Simon Rozman	e07ce00938	Set version to 2.5.5 Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-21 14:22:35 +01:00
Simon Rozman	7fb29aed80	Introduce bad ZRCola Unicode Composition highlighting Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-21 14:21:28 +01:00
Simon Rozman	6c3b2635f4	Finish ZRCola » Unicode (de)composition Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-20 20:23:36 +01:00
Simon Rozman	ad79961c33	Match integer datatypes with Access DB Integer in Access is short in C/C++. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-20 19:49:29 +01:00
Simon Rozman	454b02181e	Remove translations from transpositions Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-17 14:36:55 +01:00
Simon Rozman	0b68cdedda	Add non-PUA ZRCola translations to ZRCola to Unicode translation This allows ZRCola to Unicode translation to use precomposed Unicode characters and provide better coverage for ZRCola to Unicode translation. Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-13 14:37:59 +01:00
Simon Rozman	a3f0662022	Revert "Make composed text font customizable" ZRCola composed text depends on the ZRCola font a lot. With the recent introduction of ZRCola >> Unicode transposition, a non-ZRCola font for composed text does make sense, but the GUI should change back to ZRCola font when ZRCola >> Unicode transposition is not in use. This could make a cumbersome experience for end users, so removed for the time being. Reverts: `3bda60b340` Signed-off-by: Simon Rozman <simon@rozman.si>	2021-12-10 15:09:34 +01:00