diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot
index 4448740..441e431 100644
--- a/ZRCola/locale/ZRCola.pot
+++ b/ZRCola/locale/ZRCola.pot
@@ -1,7 +1,8 @@
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2018-09-19 09:00+0200\n"
+"POT-Creation-Date: 2019-04-01 11:13+0200\n"
 "PO-Revision-Date: 2018-09-19 09:09+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -9,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -21,16 +22,18 @@ msgid "E&xit"
 msgstr ""
 
 #: res/zrcolagui.cpp:42 zrcolagui.cpp:42
+#, fuzzy
 msgid "Quit this program"
-msgstr ""
+msgstr "Zapri ta program"
 
 #: res/zrcolagui.cpp:45 zrcolagui.cpp:45
 msgid "&Program"
 msgstr ""
 
 #: res/zrcolagui.cpp:78 zrcolagui.cpp:78
+#, fuzzy
 msgid "Select &All"
-msgstr ""
+msgstr "Izberi &vse"
 
 #: res/zrcolagui.cpp:78 zrcolagui.cpp:78
 msgid "Select all text"
@@ -40,376 +43,405 @@ msgstr ""
 msgid "Find C&haracter..."
 msgstr ""
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
-msgid "Display character search to select character to insert into text"
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:208 zrcolagui.cpp:84
+#: zrcolagui.cpp:208
+msgid "Toggle character search to select character to insert into text"
 msgstr ""
 
-#: res/zrcolagui.cpp:95 zrcolagui.cpp:95
+#: res/zrcolagui.cpp:90 zrcolagui.cpp:90
 msgid "&Send Composed"
 msgstr ""
 
-#: res/zrcolagui.cpp:95 res/zrcolagui.cpp:215 zrcolagui.cpp:95
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:210 zrcolagui.cpp:90
+#: zrcolagui.cpp:210
 msgid "Send composed text to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy Composed and &Return"
 msgstr ""
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy composed text to clipboard and return focus to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:113 zrcolagui.cpp:113
+#: res/zrcolagui.cpp:108 zrcolagui.cpp:108
 msgid "Send &Decomposed"
 msgstr ""
 
-#: res/zrcolagui.cpp:113 res/zrcolagui.cpp:217 zrcolagui.cpp:113
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:212 zrcolagui.cpp:108
+#: zrcolagui.cpp:212
 msgid "Send decomposed text to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy Decomposed and Re&turn"
 msgstr ""
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy decomposed text to clipboard and return focus to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort (De)composition"
 msgstr ""
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort composition and return focus to source window"
 msgstr ""
 
-#: res/zrcolagui.cpp:141 zrcolagui.cpp:141
+#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
+#, fuzzy
 msgid "&ZRCola (De)composition"
-msgstr ""
+msgstr "ZRCola (raz-)sestavljanje"
 
-#: res/zrcolagui.cpp:141 res/zrcolagui.cpp:219 zrcolagui.cpp:141
-#: zrcolagui.cpp:221
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:214 zrcolagui.cpp:136
+#: zrcolagui.cpp:216
 msgid "Toggle ZRCola character (De)composition"
 msgstr ""
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
 msgid "Tra&nslation"
 msgstr ""
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "&Settings..."
 msgstr ""
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "Open program configuration dialog"
 msgstr ""
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
+#, fuzzy
 msgid "&Edit"
-msgstr ""
+msgstr "&Uredi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "&Edit Toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "Toggle edit toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "&Compose Toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "Toggle compose toolbar"
 msgstr ""
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Character Catalo&g"
 msgstr ""
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Toggle character catalog panel"
 msgstr ""
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
+#, fuzzy
 msgid "&View"
-msgstr ""
+msgstr "&Pogled ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "&Instructions..."
 msgstr ""
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "Open a web site with product instructions"
 msgstr ""
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Keyboard &Shortcuts..."
 msgstr ""
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Open a list of keyboard shortcuts"
 msgstr ""
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "&Request a new character..."
 msgstr ""
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "Submit a request to ZRC to add a new character"
 msgstr ""
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check for &Updates..."
 msgstr ""
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check online for product update"
 msgstr ""
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
+#, fuzzy
 msgid "&About..."
-msgstr ""
+msgstr "O programu …"
+
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
+#, fuzzy
+msgid "&Help"
+msgstr "&Pomoč"
 
 #: res/zrcolagui.cpp:198 zrcolagui.cpp:198
-msgid "&Help"
-msgstr ""
-
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#, fuzzy
 msgid "Cut"
-msgstr ""
+msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#, fuzzy
 msgid "Cut selection"
-msgstr ""
+msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
+#, fuzzy
 msgid "Copy"
-msgstr ""
+msgstr "Kopiraj"
+
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
+#, fuzzy
+msgid "Copy selection"
+msgstr "Kopiraj izbor"
+
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
+#, fuzzy
+msgid "Paste"
+msgstr "Prilepi"
+
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
+#, fuzzy
+msgid "Paste selection"
+msgstr "Prilepi izbor"
 
 #: res/zrcolagui.cpp:205 zrcolagui.cpp:205
-msgid "Copy selection"
-msgstr ""
-
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
-msgid "Paste"
-msgstr ""
-
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
-msgid "Paste selection"
-msgstr ""
-
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#, fuzzy
 msgid "Edit"
-msgstr ""
+msgstr "Uredi"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:208 zrcolagui.cpp:208
 msgid "Find Character"
 msgstr ""
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
 msgid "Send Composed"
 msgstr ""
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:212 zrcolagui.cpp:212
 msgid "Send Decomposed"
 msgstr ""
 
-#: res/zrcolagui.cpp:219 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:216
+#, fuzzy
 msgid "ZRCola (De)composition"
-msgstr ""
+msgstr "ZRCola (raz-)sestavljanje"
 
-#: res/zrcolagui.cpp:226 zrcolagui.cpp:228
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:223
 msgid "Compose"
 msgstr ""
 
-#: res/zrcolagui.cpp:230 zrcolagui.cpp:232
+#: res/zrcolagui.cpp:225 zrcolagui.cpp:227
 msgid "Character Catalog"
 msgstr ""
 
-#: res/zrcolagui.cpp:234 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:231
 msgid "(De)Composer"
 msgstr ""
 
-#: res/zrcolagui.cpp:275 zrcolagui.cpp:277
+#: res/zrcolagui.cpp:270 zrcolagui.cpp:272
 msgid "Decomposed Text"
 msgstr ""
 
-#: res/zrcolagui.cpp:295 zrcolagui.cpp:297
+#: res/zrcolagui.cpp:290 zrcolagui.cpp:292
 msgid "Decomposed Unicode Dump"
 msgstr ""
 
-#: res/zrcolagui.cpp:322 zrcolagui.cpp:324
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:319
 msgid "Composed Text"
 msgstr ""
 
-#: res/zrcolagui.cpp:342 zrcolagui.cpp:344
+#: res/zrcolagui.cpp:337 zrcolagui.cpp:339
 msgid "Composed Unicode Dump"
 msgstr ""
 
-#: res/zrcolagui.cpp:396 zrcolagui.cpp:398
+#: res/zrcolagui.cpp:391 zrcolagui.cpp:393
 msgid "Select category to display"
 msgstr ""
 
-#: res/zrcolagui.cpp:430 zrcolagui.cpp:432
+#: res/zrcolagui.cpp:425 zrcolagui.cpp:427
+#, fuzzy
 msgid "Show &All"
-msgstr ""
+msgstr "Pokaži vse"
 
-#: res/zrcolagui.cpp:431 zrcolagui.cpp:433
+#: res/zrcolagui.cpp:426 zrcolagui.cpp:428
 msgid "Toggle display of less frequent characters"
 msgstr ""
 
-#: res/zrcolagui.cpp:471 zrcolagui.cpp:473
+#: res/zrcolagui.cpp:466 zrcolagui.cpp:468
+#, fuzzy
 msgid "&Browse"
-msgstr ""
+msgstr "Prebrskaj"
 
-#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
+#: res/zrcolagui.cpp:473 zrcolagui.cpp:475
 msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr ""
 
-#: res/zrcolagui.cpp:482 zrcolagui.cpp:484
+#: res/zrcolagui.cpp:477 zrcolagui.cpp:479
 msgid "Search Options"
 msgstr ""
 
-#: res/zrcolagui.cpp:483 zrcolagui.cpp:485
+#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
 msgid "Shows/hides additional search options"
 msgstr ""
 
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:497
+#: res/zrcolagui.cpp:490 zrcolagui.cpp:492
 msgid "List of Unicode character categories to search in"
 msgstr ""
 
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
+#: res/zrcolagui.cpp:497 zrcolagui.cpp:499
+#, fuzzy
 msgid "All"
-msgstr ""
+msgstr "Vse"
 
-#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
+#: res/zrcolagui.cpp:498 zrcolagui.cpp:500
 msgid "Select all categories"
 msgstr ""
 
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
+#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
+#, fuzzy
 msgid "None"
-msgstr ""
+msgstr "Brez"
 
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
+#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
 msgid "Clear category selection"
 msgstr ""
 
-#: res/zrcolagui.cpp:512 zrcolagui.cpp:514
+#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
 msgid "Invert"
 msgstr ""
 
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:515
+#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
 msgid "Invert category selection"
 msgstr ""
 
-#: res/zrcolagui.cpp:552 zrcolagui.cpp:554
+#: res/zrcolagui.cpp:547 zrcolagui.cpp:549
 msgid "Character search results"
 msgstr ""
 
-#: res/zrcolagui.cpp:562 zrcolagui.cpp:564
+#: res/zrcolagui.cpp:557 zrcolagui.cpp:559
 msgid "Re&cently Used"
 msgstr ""
 
-#: res/zrcolagui.cpp:590 zrcolagui.cpp:592
+#: res/zrcolagui.cpp:585 zrcolagui.cpp:587
 msgid "List of recently inserted characters"
 msgstr ""
 
-#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
+#: res/zrcolagui.cpp:599 zrcolagui.cpp:601
+#, fuzzy
 msgid "Preview"
-msgstr ""
+msgstr " Predogled"
 
-#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
+#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
 msgid "U+"
 msgstr ""
 
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
+#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
 msgid "Unicode hexadecimal code"
 msgstr ""
 
-#: res/zrcolagui.cpp:619 zrcolagui.cpp:621
+#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
 msgid "Keyboard shortcut in Composer window"
 msgstr ""
 
-#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
+#: res/zrcolagui.cpp:649 zrcolagui.cpp:651
 msgid "Character preview"
 msgstr ""
 
-#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
+#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
 msgid "Unicode character description"
 msgstr ""
 
-#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
+#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
 msgid "Character tags"
 msgstr ""
 
-#: res/zrcolagui.cpp:669 zrcolagui.cpp:671
+#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
 msgid "Unicode character category"
 msgstr ""
 
-#: res/zrcolagui.cpp:676 zrcolagui.cpp:678
+#: res/zrcolagui.cpp:671 zrcolagui.cpp:673
+#, fuzzy
 msgid "« Back"
-msgstr ""
+msgstr "< &Nazaj"
 
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:680
+#: res/zrcolagui.cpp:673 zrcolagui.cpp:675
 msgid "To previously viewed character"
 msgstr ""
 
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:684
+#: res/zrcolagui.cpp:677 zrcolagui.cpp:679
+#, fuzzy
 msgid "Forward »"
-msgstr ""
+msgstr "&Naprej"
 
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:686
+#: res/zrcolagui.cpp:679 zrcolagui.cpp:681
 msgid "To following viewed character"
 msgstr ""
 
-#: res/zrcolagui.cpp:695 zrcolagui.cpp:697
+#: res/zrcolagui.cpp:690 zrcolagui.cpp:692
 msgid "Re&lated"
 msgstr ""
 
-#: res/zrcolagui.cpp:722 zrcolagui.cpp:724
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:719
 msgid "List of related characters"
 msgstr ""
 
-#: res/zrcolagui.cpp:811 zrcolagui.cpp:816
+#: res/zrcolagui.cpp:736 zrcolagui.cpp:738
+#, fuzzy
+msgid "&Insert"
+msgstr "Vstavi"
+
+#: res/zrcolagui.cpp:740 zrcolagui.cpp:742
+msgid "Insert character into decomposed text"
+msgstr ""
+
+#: res/zrcolagui.cpp:813 zrcolagui.cpp:818
 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:815 zrcolagui.cpp:820
+#: res/zrcolagui.cpp:817 zrcolagui.cpp:822
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""
 
-#: res/zrcolagui.cpp:818 zrcolagui.cpp:823
+#: res/zrcolagui.cpp:820 zrcolagui.cpp:825
 msgid "&Manually select the language from the list below:"
 msgstr ""
 
-#: res/zrcolagui.cpp:829 zrcolagui.cpp:834
+#: res/zrcolagui.cpp:831 zrcolagui.cpp:836
 msgid "Text Language"
 msgstr ""
 
-#: res/zrcolagui.cpp:834 zrcolagui.cpp:839
+#: res/zrcolagui.cpp:836 zrcolagui.cpp:841
 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:838 zrcolagui.cpp:843
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:845
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: res/zrcolagui.cpp:844 zrcolagui.cpp:849
+#: res/zrcolagui.cpp:846 zrcolagui.cpp:851
 msgid "Startup"
 msgstr ""
 
-#: res/zrcolagui.cpp:911 res/zrcolagui.h:113 zrcolaapp.cpp:72 zrcolafrm.cpp:123
-#: zrcolagui.cpp:916 zrcolagui.h:113
+#: res/zrcolagui.cpp:913 res/zrcolagui.h:113 zrcolaapp.cpp:72 zrcolafrm.cpp:128
+#: zrcolagui.cpp:918 zrcolagui.h:113
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -418,10 +450,11 @@ msgstr ""
 #: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
+#, fuzzy
 msgid "ZRCola"
-msgstr ""
+msgstr "ZRCola (raz-)sestavljanje"
 
-#: res/zrcolagui.cpp:922 zrcolagui.cpp:927
+#: res/zrcolagui.cpp:924 zrcolagui.cpp:929
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -430,129 +463,137 @@ msgid ""
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 
-#: res/zrcolagui.cpp:930 zrcolagui.cpp:935
+#: res/zrcolagui.cpp:932 zrcolagui.cpp:937
 msgid "zrcola.zrc-sazu.si"
 msgstr ""
 
-#: res/zrcolagui.cpp:936 zrcolagui.cpp:941
+#: res/zrcolagui.cpp:938 zrcolagui.cpp:943
 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:940 zrcolagui.cpp:945
+#: res/zrcolagui.cpp:942 zrcolagui.cpp:947
 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:981 zrcolagui.cpp:986
+#: res/zrcolagui.cpp:983 zrcolagui.cpp:988
+#, fuzzy
 msgid "Log"
-msgstr ""
+msgstr "&Dnevnik"
 
-#: res/zrcolagui.cpp:997 zrcolagui.cpp:1002
+#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
 msgid "Quit and &Update..."
 msgstr ""
 
-#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
+#: res/zrcolagui.cpp:1001 zrcolagui.cpp:1006
 msgid "Exit this program and launch product update"
 msgstr ""
 
-#: res/zrcolagui.cpp:1003 zrcolagui.cpp:1008
+#: res/zrcolagui.cpp:1005 zrcolagui.cpp:1010
+#, fuzzy
 msgid "&Close"
-msgstr ""
+msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1004 zrcolagui.cpp:1009
+#: res/zrcolagui.cpp:1006 zrcolagui.cpp:1011
+#, fuzzy
 msgid "Close this window"
-msgstr ""
+msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1041 zrcolachrreq.cpp:49 zrcolagui.cpp:1046
+#: res/zrcolagui.cpp:1043 zrcolachrreq.cpp:49 zrcolagui.cpp:1048
+#, fuzzy
 msgid "Character"
-msgstr ""
+msgstr "Znak"
 
-#: res/zrcolagui.cpp:1043 zrcolagui.cpp:1048
+#: res/zrcolagui.cpp:1045 zrcolagui.cpp:1050
 msgid "Enter the &character you would like to request:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1057 zrcolagui.cpp:1062
+#: res/zrcolagui.cpp:1059 zrcolagui.cpp:1064
 msgid "Decomposed character to request"
 msgstr ""
 
-#: res/zrcolagui.cpp:1061 zrcolagui.cpp:1066
+#: res/zrcolagui.cpp:1063 zrcolagui.cpp:1068
 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:1069 zrcolachrreq.cpp:58 zrcolagui.cpp:1074
+#: res/zrcolagui.cpp:1071 zrcolachrreq.cpp:58 zrcolagui.cpp:1076
+#, fuzzy
 msgid "Context"
-msgstr ""
+msgstr "Konteksta prekrivnega okna ni mogoče vzpostaviti."
 
-#: res/zrcolagui.cpp:1071 zrcolagui.cpp:1076
+#: res/zrcolagui.cpp:1073 zrcolagui.cpp:1078
 msgid "The &context, examples or description why and where the character is required:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1077 zrcolagui.cpp:1082
+#: res/zrcolagui.cpp:1079 zrcolagui.cpp:1084
 msgid "Additional notes for character request"
 msgstr ""
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1089
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1091
 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:1126 zrcolagui.cpp:1131
+#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
 msgid "Translation"
 msgstr ""
 
-#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
+#: res/zrcolagui.cpp:1130 zrcolagui.cpp:1135
 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:1138 zrcolagui.cpp:1143
+#: res/zrcolagui.cpp:1140 zrcolagui.cpp:1145
 msgid "A&vailable:"
 msgstr ""
 
-#: res/zrcolagui.cpp:1153 zrcolagui.cpp:1158
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1160
 msgid ">"
 msgstr ""
 
-#: res/zrcolagui.cpp:1156 zrcolagui.cpp:1161
+#: res/zrcolagui.cpp:1158 zrcolagui.cpp:1163
 msgid "<"
 msgstr ""
 
-#: res/zrcolagui.cpp:1165 zrcolagui.cpp:1170
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1172
+#, fuzzy
 msgid "&Selected:"
-msgstr ""
+msgstr "Kliknite za brisanje izbranega položaja tabulatorja."
 
-#: res/zrcolagui.cpp:1183 zrcolagui.cpp:1188
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1190
+#, fuzzy
 msgid "Up"
-msgstr ""
+msgstr "Gor"
 
-#: res/zrcolagui.cpp:1186 zrcolagui.cpp:1191
+#: res/zrcolagui.cpp:1188 zrcolagui.cpp:1193
+#, fuzzy
 msgid "Down"
-msgstr ""
+msgstr "Dol"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:254 zrcolagui.h:254
 msgid "Character Search"
 msgstr ""
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:290 zrcolagui.h:290
 msgid "Settings"
 msgstr ""
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:316 zrcolagui.h:316
 msgid "About ZRCola"
 msgstr ""
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:94
+#: res/zrcolagui.h:341 zrcolagui.h:341 zrcolaupdater.cpp:94
 msgid "Product Update"
 msgstr ""
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:370 zrcolachrreq.cpp:64 zrcolagui.h:370
 msgid "Request a New Character"
 msgstr ""
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:412 zrcolagui.h:412
 msgid "Custom Translation Sequence"
 msgstr ""
 
@@ -566,15 +607,16 @@ msgid "Too many digits in Unicode."
 msgstr ""
 
 #: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+#, fuzzy
 msgid "Validation conflict"
-msgstr ""
+msgstr "Konflikt pri preverjanju"
 
 #: zrcolachrslct.cpp:107
 #, c-format
 msgid "Invalid character in Unicode found: %c"
 msgstr ""
 
-#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:867
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:885
 msgid "▸ Search Options"
 msgstr ""
 
@@ -582,35 +624,36 @@ msgstr ""
 msgid ", "
 msgstr ""
 
-#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:864
+#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:882
 msgid "▾ Search Options"
 msgstr ""
 
-#: zrcolafrm.cpp:89
+#: zrcolafrm.cpp:94
 msgid "No Translation"
 msgstr ""
 
-#: zrcolafrm.cpp:102
+#: zrcolafrm.cpp:107
 msgid "Custom Translation..."
 msgstr ""
 
-#: zrcolafrm.cpp:206
+#: zrcolafrm.cpp:215
 msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:206 zrcolafrm.cpp:208
+#: zrcolafrm.cpp:215 zrcolafrm.cpp:217
+#, fuzzy
 msgid "Warning"
-msgstr ""
+msgstr "Opozorilo:"
 
-#: zrcolafrm.cpp:208
+#: zrcolafrm.cpp:217
 msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:472
+#: zrcolafrm.cpp:486
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr ""
 
-#: zrcolafrm.cpp:496
+#: zrcolafrm.cpp:510
 msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
 
diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po
index 629f9a6..a9c8da7 100644
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -4,20 +4,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2018-09-19 09:00+0200\n"
-"PO-Revision-Date: 2018-09-19 09:09+0200\n"
-"Last-Translator: Janoš Ježovnik, 2018\n"
+"POT-Creation-Date: 2019-04-01 11:13+0200\n"
+"PO-Revision-Date: 2019-04-01 11:17+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru_RU\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
 
 #: res/zrcolagui.cpp:42 zrcolagui.cpp:42
 msgid "E&xit"
@@ -43,350 +43,354 @@ msgstr "Выделить весь текст"
 msgid "Find C&haracter..."
 msgstr "Поиск &знака ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
-msgid "Display character search to select character to insert into text"
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:208 zrcolagui.cpp:84
+#: zrcolagui.cpp:208
+#, fuzzy
+#| msgid "Display character search to select character to insert into text"
+msgid "Toggle character search to select character to insert into text"
 msgstr "Показать браузер знаков для вставления выбранного знака"
 
-#: res/zrcolagui.cpp:95 zrcolagui.cpp:95
+#: res/zrcolagui.cpp:90 zrcolagui.cpp:90
 msgid "&Send Composed"
 msgstr "&Послать составленное"
 
-#: res/zrcolagui.cpp:95 res/zrcolagui.cpp:215 zrcolagui.cpp:95
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:210 zrcolagui.cpp:90
+#: zrcolagui.cpp:210
 msgid "Send composed text to source window"
 msgstr "Послать составленный текст в исходное окно"
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy Composed and &Return"
 msgstr "Копировать составленное и &возвратиться"
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy composed text to clipboard and return focus to source window"
-msgstr ""
-"Копировать составленный текст в буфер обмена и возвратить фокус в исходное "
-"окно"
+msgstr "Копировать составленный текст в буфер обмена и возвратить фокус в исходное окно"
 
-#: res/zrcolagui.cpp:113 zrcolagui.cpp:113
+#: res/zrcolagui.cpp:108 zrcolagui.cpp:108
 msgid "Send &Decomposed"
 msgstr "Послать &разобранное"
 
-#: res/zrcolagui.cpp:113 res/zrcolagui.cpp:217 zrcolagui.cpp:113
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:212 zrcolagui.cpp:108
+#: zrcolagui.cpp:212
 msgid "Send decomposed text to source window"
 msgstr "Послать разобранный текст в исходное окно"
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy Decomposed and Re&turn"
 msgstr "Копировать разобранное и возв&ратиться"
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy decomposed text to clipboard and return focus to source window"
-msgstr ""
-"Копировать разобранный текст в буфер обмена и возвратить фокус в исходное "
-"окно"
+msgstr "Копировать разобранный текст в буфер обмена и возвратить фокус в исходное окно"
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort (De)composition"
 msgstr "Прервать составление/разборку"
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort composition and return focus to source window"
 msgstr "Прервать составление и возвратить фокус в исходное окно"
 
-#: res/zrcolagui.cpp:141 zrcolagui.cpp:141
+#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
 msgid "&ZRCola (De)composition"
 msgstr "Составление/разборка &ZRCola "
 
-#: res/zrcolagui.cpp:141 res/zrcolagui.cpp:219 zrcolagui.cpp:141
-#: zrcolagui.cpp:221
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:214 zrcolagui.cpp:136
+#: zrcolagui.cpp:216
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Переключить составление/разборку ZRCola"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
 msgid "Tra&nslation"
 msgstr "Тра&нслитерация"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "&Settings..."
 msgstr "&Настройки ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "Open program configuration dialog"
 msgstr "Открыть диалог конфигурации программы"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 msgid "&Edit"
 msgstr "&Правка"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "&Edit Toolbar"
 msgstr "Панель инструментов для &правки"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "Toggle edit toolbar"
 msgstr "Переключить панель инструментов для правки"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "&Compose Toolbar"
 msgstr "Панель инструментов для &составления"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "Toggle compose toolbar"
 msgstr "Переключить панель инструментов для составления"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Character Catalo&g"
 msgstr "Список &знаков"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Toggle character catalog panel"
 msgstr "Переключить список знаков"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 msgid "&View"
 msgstr "&Вид"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "&Instructions..."
 msgstr "&Инструкции ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "Open a web site with product instructions"
 msgstr "Открыть сайт с инструкциями по продукту"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Keyboard &Shortcuts..."
 msgstr "Сочетания &клавиш ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Open a list of keyboard shortcuts"
 msgstr "Открыть список сочетаний клавиш"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "&Request a new character..."
 msgstr "&Запрос нового знака ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Отправить запрос нового знака"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check for &Updates..."
 msgstr "Проверить наличие &обновлений ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check online for product update"
 msgstr "Проверить наличие обновлений онлайн"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "&About..."
 msgstr "О прогр&амме ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 msgid "&Help"
 msgstr "&Справка"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 msgid "Cut"
 msgstr "Вырезать"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 msgid "Cut selection"
 msgstr "Вырезать выбор"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Copy"
 msgstr "Копировать"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Copy selection"
 msgstr "Копировать выбор"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
 msgid "Paste"
 msgstr "Вставить"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
 msgid "Paste selection"
 msgstr "Вставить выбор"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 msgid "Edit"
 msgstr "Правка"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:208 zrcolagui.cpp:208
 msgid "Find Character"
 msgstr "Поиск знака"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
 msgid "Send Composed"
 msgstr "Послать составленное (F5)"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:212 zrcolagui.cpp:212
 msgid "Send Decomposed"
 msgstr "Послать разобранное (F6)"
 
-#: res/zrcolagui.cpp:219 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:216
 msgid "ZRCola (De)composition"
 msgstr "ZRCola составление/разборка"
 
-#: res/zrcolagui.cpp:226 zrcolagui.cpp:228
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:223
 msgid "Compose"
 msgstr "Составить"
 
-#: res/zrcolagui.cpp:230 zrcolagui.cpp:232
+#: res/zrcolagui.cpp:225 zrcolagui.cpp:227
 msgid "Character Catalog"
 msgstr "Список знаков"
 
-#: res/zrcolagui.cpp:234 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:231
 msgid "(De)Composer"
 msgstr "(Де)Композитор"
 
-#: res/zrcolagui.cpp:275 zrcolagui.cpp:277
+#: res/zrcolagui.cpp:270 zrcolagui.cpp:272
 msgid "Decomposed Text"
 msgstr "Разобранний текст"
 
-#: res/zrcolagui.cpp:295 zrcolagui.cpp:297
+#: res/zrcolagui.cpp:290 zrcolagui.cpp:292
 msgid "Decomposed Unicode Dump"
 msgstr "Дамп разобранного Юнукода"
 
-#: res/zrcolagui.cpp:322 zrcolagui.cpp:324
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:319
 msgid "Composed Text"
 msgstr "Составленный текст"
 
-#: res/zrcolagui.cpp:342 zrcolagui.cpp:344
+#: res/zrcolagui.cpp:337 zrcolagui.cpp:339
 msgid "Composed Unicode Dump"
 msgstr "Дамп составленного Юникода"
 
-#: res/zrcolagui.cpp:396 zrcolagui.cpp:398
+#: res/zrcolagui.cpp:391 zrcolagui.cpp:393
 msgid "Select category to display"
 msgstr "Выделить категории для отображения"
 
-#: res/zrcolagui.cpp:430 zrcolagui.cpp:432
+#: res/zrcolagui.cpp:425 zrcolagui.cpp:427
 msgid "Show &All"
 msgstr "Показать &все"
 
-#: res/zrcolagui.cpp:431 zrcolagui.cpp:433
+#: res/zrcolagui.cpp:426 zrcolagui.cpp:428
 msgid "Toggle display of less frequent characters"
 msgstr "Переключить отображение редко использованных знаков"
 
-#: res/zrcolagui.cpp:471 zrcolagui.cpp:473
+#: res/zrcolagui.cpp:466 zrcolagui.cpp:468
 msgid "&Browse"
 msgstr "&Обзор"
 
-#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
-msgstr ""
-"Полное либо частичное описание знака Юникод (на английском) для поиска"
+#: res/zrcolagui.cpp:473 zrcolagui.cpp:475
+msgid "Full or partial terms from Unicode character description (in English) to search for"
+msgstr "Полное либо частичное описание знака Юникод (на английском) для поиска"
 
-#: res/zrcolagui.cpp:482 zrcolagui.cpp:484
+#: res/zrcolagui.cpp:477 zrcolagui.cpp:479
 msgid "Search Options"
 msgstr "Опции поиска"
 
-#: res/zrcolagui.cpp:483 zrcolagui.cpp:485
+#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
 msgid "Shows/hides additional search options"
 msgstr "Показать/скрыть дополнительные опции поиска"
 
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:497
+#: res/zrcolagui.cpp:490 zrcolagui.cpp:492
 msgid "List of Unicode character categories to search in"
 msgstr "Список категории Юникод для проведения поиска"
 
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
+#: res/zrcolagui.cpp:497 zrcolagui.cpp:499
 msgid "All"
 msgstr "Все"
 
-#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
+#: res/zrcolagui.cpp:498 zrcolagui.cpp:500
 msgid "Select all categories"
 msgstr "Выбрать все категории"
 
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
+#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
 msgid "None"
 msgstr "Ничего"
 
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
+#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
 msgid "Clear category selection"
 msgstr "Очистить выбор категории"
 
-#: res/zrcolagui.cpp:512 zrcolagui.cpp:514
+#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
 msgid "Invert"
 msgstr "Обратить"
 
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:515
+#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
 msgid "Invert category selection"
 msgstr "Обратить выбор категории"
 
-#: res/zrcolagui.cpp:552 zrcolagui.cpp:554
+#: res/zrcolagui.cpp:547 zrcolagui.cpp:549
 msgid "Character search results"
 msgstr "Результаты поиска знаков"
 
-#: res/zrcolagui.cpp:562 zrcolagui.cpp:564
+#: res/zrcolagui.cpp:557 zrcolagui.cpp:559
 msgid "Re&cently Used"
 msgstr "&Недавно использованное"
 
-#: res/zrcolagui.cpp:590 zrcolagui.cpp:592
+#: res/zrcolagui.cpp:585 zrcolagui.cpp:587
 msgid "List of recently inserted characters"
 msgstr "Список недавно вставленных знаков"
 
-#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
+#: res/zrcolagui.cpp:599 zrcolagui.cpp:601
 msgid "Preview"
 msgstr "Просмотр"
 
-#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
+#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
+#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
 msgid "Unicode hexadecimal code"
 msgstr "Шестнадцатеричный код Юникод"
 
-#: res/zrcolagui.cpp:619 zrcolagui.cpp:621
+#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
 msgid "Keyboard shortcut in Composer window"
 msgstr "Сочетание клавиш в окне композитора"
 
-#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
+#: res/zrcolagui.cpp:649 zrcolagui.cpp:651
 msgid "Character preview"
 msgstr "Просмотр знака"
 
-#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
+#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
 msgid "Unicode character description"
 msgstr "Описание знака Юникод"
 
-#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
+#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
 msgid "Character tags"
 msgstr "Ключевые слова"
 
-#: res/zrcolagui.cpp:669 zrcolagui.cpp:671
+#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
 msgid "Unicode character category"
 msgstr "Категория знака Юникод"
 
-#: res/zrcolagui.cpp:676 zrcolagui.cpp:678
+#: res/zrcolagui.cpp:671 zrcolagui.cpp:673
 msgid "« Back"
 msgstr "« Назад"
 
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:680
+#: res/zrcolagui.cpp:673 zrcolagui.cpp:675
 msgid "To previously viewed character"
 msgstr "К предыдущему знаку"
 
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:684
+#: res/zrcolagui.cpp:677 zrcolagui.cpp:679
 msgid "Forward »"
 msgstr "Далее »"
 
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:686
+#: res/zrcolagui.cpp:679 zrcolagui.cpp:681
 msgid "To following viewed character"
 msgstr "К следующему знаку"
 
-#: res/zrcolagui.cpp:695 zrcolagui.cpp:697
+#: res/zrcolagui.cpp:690 zrcolagui.cpp:692
 msgid "Re&lated"
 msgstr "&Связанное"
 
-#: res/zrcolagui.cpp:722 zrcolagui.cpp:724
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:719
 msgid "List of related characters"
 msgstr "Список связанных знаков"
 
-#: res/zrcolagui.cpp:811 zrcolagui.cpp:816
+#: res/zrcolagui.cpp:736 zrcolagui.cpp:738
+#, fuzzy
+msgid "&Insert"
+msgstr "&Вставить"
+
+#: res/zrcolagui.cpp:740 zrcolagui.cpp:742
+msgid "Insert character into decomposed text"
+msgstr ""
+
+#: res/zrcolagui.cpp:813 zrcolagui.cpp:818
 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."
@@ -394,19 +398,19 @@ msgstr ""
 "Некоторые знаки использованного языка нельзя разбирать.\n"
 "Для оптимальной разборки вы должны настроить правильный язык."
 
-#: res/zrcolagui.cpp:815 zrcolagui.cpp:820
+#: res/zrcolagui.cpp:817 zrcolagui.cpp:822
 msgid "Select language &automatically according to selected keyboard"
 msgstr "&Автоматически установить язык на основе выбранной клавиатуры"
 
-#: res/zrcolagui.cpp:818 zrcolagui.cpp:823
+#: res/zrcolagui.cpp:820 zrcolagui.cpp:825
 msgid "&Manually select the language from the list below:"
 msgstr "&Вручную выбрать язык со списка:"
 
-#: res/zrcolagui.cpp:829 zrcolagui.cpp:834
+#: res/zrcolagui.cpp:831 zrcolagui.cpp:836
 msgid "Text Language"
 msgstr "Язык текста"
 
-#: res/zrcolagui.cpp:834 zrcolagui.cpp:839
+#: res/zrcolagui.cpp:836 zrcolagui.cpp:841
 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."
@@ -414,16 +418,16 @@ msgstr ""
 "Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
 "После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."
 
-#: res/zrcolagui.cpp:838 zrcolagui.cpp:843
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:845
 msgid "Start ZRCola &automatically on logon"
 msgstr "&Автоматически запустить систему ZRCola при запуске компьютера"
 
-#: res/zrcolagui.cpp:844 zrcolagui.cpp:849
+#: res/zrcolagui.cpp:846 zrcolagui.cpp:851
 msgid "Startup"
 msgstr "Запуск"
 
-#: res/zrcolagui.cpp:911 res/zrcolagui.h:113 zrcolaapp.cpp:72
-#: zrcolafrm.cpp:123 zrcolagui.cpp:916 zrcolagui.h:113
+#: res/zrcolagui.cpp:913 res/zrcolagui.h:113 zrcolaapp.cpp:72 zrcolafrm.cpp:128
+#: zrcolagui.cpp:918 zrcolagui.h:113
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -435,7 +439,7 @@ msgstr "Запуск"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:922 zrcolagui.cpp:927
+#: res/zrcolagui.cpp:924 zrcolagui.cpp:929
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -449,61 +453,51 @@ msgstr ""
 "Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo Torkar), Анастасия Плотникова\n"
 "Разработка in техническая поддержка первоначальной программы (2004–2015): Петер Вейсс (Peter Weiss)"
 
-#: res/zrcolagui.cpp:930 zrcolagui.cpp:935
+#: res/zrcolagui.cpp:932 zrcolagui.cpp:937
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:936 zrcolagui.cpp:941
-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:938 zrcolagui.cpp:943
+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:940 zrcolagui.cpp:945
-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:942 zrcolagui.cpp:947
+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:981 zrcolagui.cpp:986
+#: res/zrcolagui.cpp:983 zrcolagui.cpp:988
 msgid "Log"
 msgstr "Журнал"
 
-#: res/zrcolagui.cpp:997 zrcolagui.cpp:1002
+#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
 msgid "Quit and &Update..."
 msgstr "Выйти и &обновить ..."
 
-#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
+#: res/zrcolagui.cpp:1001 zrcolagui.cpp:1006
 msgid "Exit this program and launch product update"
 msgstr "Выйти из программы и запустить обновление"
 
-#: res/zrcolagui.cpp:1003 zrcolagui.cpp:1008
+#: res/zrcolagui.cpp:1005 zrcolagui.cpp:1010
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: res/zrcolagui.cpp:1004 zrcolagui.cpp:1009
+#: res/zrcolagui.cpp:1006 zrcolagui.cpp:1011
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: res/zrcolagui.cpp:1041 zrcolachrreq.cpp:49 zrcolagui.cpp:1046
+#: res/zrcolagui.cpp:1043 zrcolachrreq.cpp:49 zrcolagui.cpp:1048
 msgid "Character"
 msgstr "Знак"
 
-#: res/zrcolagui.cpp:1043 zrcolagui.cpp:1048
+#: res/zrcolagui.cpp:1045 zrcolagui.cpp:1050
 msgid "Enter the &character you would like to request:"
 msgstr "Ввести запрашиваемый &знак:"
 
-#: res/zrcolagui.cpp:1057 zrcolagui.cpp:1062
+#: res/zrcolagui.cpp:1059 zrcolagui.cpp:1064
 msgid "Decomposed character to request"
 msgstr "Запрашиваемый разобранный знак"
 
-#: res/zrcolagui.cpp:1061 zrcolagui.cpp:1066
+#: res/zrcolagui.cpp:1063 zrcolagui.cpp:1068
 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."
@@ -511,23 +505,19 @@ msgstr ""
 "Пожалуйста, используйте разобранный формат.\n"
 "Для ввода запрашиваемого знака можно использовать сочетания клавиш системы ZRCola либо копировать и вставить знаки из окна для разборки."
 
-#: res/zrcolagui.cpp:1069 zrcolachrreq.cpp:58 zrcolagui.cpp:1074
+#: res/zrcolagui.cpp:1071 zrcolachrreq.cpp:58 zrcolagui.cpp:1076
 msgid "Context"
 msgstr "Контекст"
 
-#: res/zrcolagui.cpp:1071 zrcolagui.cpp:1076
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
-msgstr ""
-"&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем "
-"он нужен:"
+#: res/zrcolagui.cpp:1073 zrcolagui.cpp:1078
+msgid "The &context, examples or description why and where the character is required:"
+msgstr "&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем он нужен:"
 
-#: res/zrcolagui.cpp:1077 zrcolagui.cpp:1082
+#: res/zrcolagui.cpp:1079 zrcolagui.cpp:1084
 msgid "Additional notes for character request"
 msgstr "Дополнительные примечания"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1089
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1091
 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."
@@ -535,11 +525,11 @@ msgstr ""
 "После нажатия на кнопку «OK» ваша почтовая программа должна открытся для отправки запроса нового знака администратору системы ZRCola.\n"
 "Возможно, не все знаки будут отображены правильно, но все информации будут закодированны таким образом, что администратор сможет их правильно прочитать."
 
-#: res/zrcolagui.cpp:1126 zrcolagui.cpp:1131
+#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
 msgid "Translation"
 msgstr "Преобразование"
 
-#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
+#: res/zrcolagui.cpp:1130 zrcolagui.cpp:1135
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -547,51 +537,51 @@ msgstr ""
 "ZRCola предоставляет различные преобразования текста, последовательность которых можно свободно изменять.\n"
 "Пожалуйста, выбрать желаемые преобразования и порядок их применения."
 
-#: res/zrcolagui.cpp:1138 zrcolagui.cpp:1143
+#: res/zrcolagui.cpp:1140 zrcolagui.cpp:1145
 msgid "A&vailable:"
 msgstr "&Доступное:"
 
-#: res/zrcolagui.cpp:1153 zrcolagui.cpp:1158
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1160
 msgid ">"
 msgstr ">"
 
-#: res/zrcolagui.cpp:1156 zrcolagui.cpp:1161
+#: res/zrcolagui.cpp:1158 zrcolagui.cpp:1163
 msgid "<"
 msgstr "<"
 
-#: res/zrcolagui.cpp:1165 zrcolagui.cpp:1170
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1172
 msgid "&Selected:"
 msgstr "&Выбранное:"
 
-#: res/zrcolagui.cpp:1183 zrcolagui.cpp:1188
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1190
 msgid "Up"
 msgstr "Up"
 
-#: res/zrcolagui.cpp:1186 zrcolagui.cpp:1191
+#: res/zrcolagui.cpp:1188 zrcolagui.cpp:1193
 msgid "Down"
 msgstr "Down"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:254 zrcolagui.h:254
 msgid "Character Search"
 msgstr "Поиск знака"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:290 zrcolagui.h:290
 msgid "Settings"
 msgstr "Настройки"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:316 zrcolagui.h:316
 msgid "About ZRCola"
 msgstr "О системе ZRCola"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:94
+#: res/zrcolagui.h:341 zrcolagui.h:341 zrcolaupdater.cpp:94
 msgid "Product Update"
 msgstr "Обновление продукта"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:370 zrcolachrreq.cpp:64 zrcolagui.h:370
 msgid "Request a New Character"
 msgstr "Запрос нового знака"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:412 zrcolagui.h:412
 msgid "Custom Translation Sequence"
 msgstr "Настраиваемая последовательность преобразований"
 
@@ -613,7 +603,7 @@ msgstr "Конфликт проверки"
 msgid "Invalid character in Unicode found: %c"
 msgstr "Недействительный знак в записи Unicode: %c"
 
-#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:867
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:885
 msgid "▸ Search Options"
 msgstr "▸ Опции поиска"
 
@@ -621,57 +611,41 @@ msgstr "▸ Опции поиска"
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:864
+#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:882
 msgid "▾ Search Options"
 msgstr "▾ Опции поиска"
 
-#: zrcolafrm.cpp:89
+#: zrcolafrm.cpp:94
 msgid "No Translation"
 msgstr "Без транслитерации"
 
-#: zrcolafrm.cpp:102
+#: zrcolafrm.cpp:107
 msgid "Custom Translation..."
 msgstr "Настраиваемое  преобразование ..."
 
-#: zrcolafrm.cpp:206
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"Сочетание клавиш Win+F5 регистрировать. Некоторые функциональности не будут "
-"доступны."
+#: zrcolafrm.cpp:215
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F5 регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:206 zrcolafrm.cpp:208
+#: zrcolafrm.cpp:215 zrcolafrm.cpp:217
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: zrcolafrm.cpp:208
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые "
-"функциональности не будут доступны."
+#: zrcolafrm.cpp:217
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:472
+#: zrcolafrm.cpp:486
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"
 
-#: zrcolafrm.cpp:496
-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"
+#: zrcolafrm.cpp:510
+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
-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."
+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
 msgid "Start ZRCola automatically on logon"
@@ -723,28 +697,15 @@ msgstr "bintutorial1.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:7
-msgid ""
-"When configured, ZRCola starts at system startup and runs in the background."
-" If needed, it can be brought up by pressing the combination Win+F5."
-msgstr ""
-"Если так настроено, система ZRCola запускается при запуске компьютера и "
-"работает в фоновом режиме. Если потребуется, пользователь может вывести "
-"программу на экран, нажав на сочетание клавиш Win+F5."
+msgid "When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5."
+msgstr "Если так настроено, система ZRCola запускается при запуске компьютера и работает в фоновом режиме. Если потребуется, пользователь может вывести программу на экран, нажав на сочетание клавиш Win+F5."
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:8
-msgid ""
-"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
-"location of the cursor in the text. If ZRCola is brought to the foreground "
-"without using the aforementioned combination of keys, the program won't know"
-" where to insert the special characters!"
-msgstr ""
-"Внимание: При нажатии сочетание клавиш Win+F5 программа запомнить "
-"местонахождение курсора в тексте. Если система ZRCola выведена на экран без "
-"использования упомянутого сочетания клавиш, программа не знает, куда ввести "
-"желаемые знаки!"
+msgid "IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!"
+msgstr "Внимание: При нажатии сочетание клавиш Win+F5 программа запомнить местонахождение курсора в тексте. Если система ZRCola выведена на экран без использования упомянутого сочетания клавиш, программа не знает, куда ввести желаемые знаки!"
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
@@ -779,14 +740,8 @@ msgstr "bintutorial2.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:13
-msgid ""
-"The string of basic and substitute characters is entered into the upper "
-"input window of the program. In the window below the resulted special "
-"characters are displayed. To insert them in the text, the F5 key is used."
-msgstr ""
-"Строка основных и замещающих знаков вводится в верхнее окно для ввода. После"
-" того, в нижнем окне появляются соответствующие специальные знаки. Для их "
-"ввода в текст нужно нажать клавишу F5."
+msgid "The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used."
+msgstr "Строка основных и замещающих знаков вводится в верхнее окно для ввода. После того, в нижнем окне появляются соответствующие специальные знаки. Для их ввода в текст нужно нажать клавишу F5."
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
@@ -806,12 +761,8 @@ msgstr "bintutorial3.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
-msgstr ""
-"Знак можно ввести, употребляя сочетания клавиш на клавиатуре, список знаков "
-"(F4) или функцию \"Поиск знака\" (F8)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
+msgstr "Знак можно ввести, употребляя сочетания клавиш на клавиатуре, список знаков (F4) или функцию \"Поиск знака\" (F8)."
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po
index 0eb0484..2a4b1a2 100644
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -3,20 +3,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2018-09-19 09:00+0200\n"
-"PO-Revision-Date: 2018-09-19 09:09+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"POT-Creation-Date: 2019-04-01 11:13+0200\n"
+"PO-Revision-Date: 2019-04-01 11:14+0200\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.2.1\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: .\n"
 
 #: res/zrcolagui.cpp:42 zrcolagui.cpp:42
 msgid "E&xit"
@@ -42,349 +42,351 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:213 zrcolagui.cpp:84
-#: zrcolagui.cpp:213
-msgid "Display character search to select character to insert into text"
-msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
+#: res/zrcolagui.cpp:84 res/zrcolagui.cpp:208 zrcolagui.cpp:84
+#: zrcolagui.cpp:208
+msgid "Toggle character search to select character to insert into text"
+msgstr "Prikaži/skrij iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 
-#: res/zrcolagui.cpp:95 zrcolagui.cpp:95
+#: res/zrcolagui.cpp:90 zrcolagui.cpp:90
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: res/zrcolagui.cpp:95 res/zrcolagui.cpp:215 zrcolagui.cpp:95
-#: zrcolagui.cpp:215
+#: res/zrcolagui.cpp:90 res/zrcolagui.cpp:210 zrcolagui.cpp:90
+#: zrcolagui.cpp:210
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy Composed and &Return"
 msgstr "Kopi&raj sestavljeno in se vrni"
 
-#: res/zrcolagui.cpp:104 zrcolagui.cpp:104
+#: res/zrcolagui.cpp:99 zrcolagui.cpp:99
 msgid "Copy composed text to clipboard and return focus to source window"
-msgstr ""
-"Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvornemu oknu"
+msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvornemu oknu"
 
-#: res/zrcolagui.cpp:113 zrcolagui.cpp:113
+#: res/zrcolagui.cpp:108 zrcolagui.cpp:108
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: res/zrcolagui.cpp:113 res/zrcolagui.cpp:217 zrcolagui.cpp:113
-#: zrcolagui.cpp:217
+#: res/zrcolagui.cpp:108 res/zrcolagui.cpp:212 zrcolagui.cpp:108
+#: zrcolagui.cpp:212
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy Decomposed and Re&turn"
 msgstr "Kopi&raj razstavljeno in se vrni"
 
-#: res/zrcolagui.cpp:122 zrcolagui.cpp:122
+#: res/zrcolagui.cpp:117 zrcolagui.cpp:117
 msgid "Copy decomposed text to clipboard and return focus to source window"
-msgstr ""
-"Kopiraj razstavljeno besedilo na odložišče in vrni fokus nazaj izvornemu "
-"oknu"
+msgstr "Kopiraj razstavljeno besedilo na odložišče in vrni fokus nazaj izvornemu oknu"
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort (De)composition"
 msgstr "Prekini raz/sestavljanje"
 
-#: res/zrcolagui.cpp:131 zrcolagui.cpp:131
+#: res/zrcolagui.cpp:126 zrcolagui.cpp:126
 msgid "Abort composition and return focus to source window"
 msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
-#: res/zrcolagui.cpp:141 zrcolagui.cpp:141
+#: res/zrcolagui.cpp:136 zrcolagui.cpp:136
 msgid "&ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje &ZRCola"
 
-#: res/zrcolagui.cpp:141 res/zrcolagui.cpp:219 zrcolagui.cpp:141
-#: zrcolagui.cpp:221
+#: res/zrcolagui.cpp:136 res/zrcolagui.cpp:214 zrcolagui.cpp:136
+#: zrcolagui.cpp:216
 msgid "Toggle ZRCola character (De)composition"
 msgstr "Vklopi/izklopi (raz-)sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:145 zrcolagui.cpp:145
+#: res/zrcolagui.cpp:140 zrcolagui.cpp:140
 msgid "Tra&nslation"
 msgstr "Tra&nsliteracija"
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: res/zrcolagui.cpp:151 zrcolagui.cpp:151
+#: res/zrcolagui.cpp:146 zrcolagui.cpp:146
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: res/zrcolagui.cpp:154 zrcolagui.cpp:154
+#: res/zrcolagui.cpp:149 zrcolagui.cpp:149
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: res/zrcolagui.cpp:158 zrcolagui.cpp:158
+#: res/zrcolagui.cpp:153 zrcolagui.cpp:153
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: res/zrcolagui.cpp:162 zrcolagui.cpp:162
+#: res/zrcolagui.cpp:157 zrcolagui.cpp:157
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: res/zrcolagui.cpp:168 zrcolagui.cpp:168
+#: res/zrcolagui.cpp:163 zrcolagui.cpp:163
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: res/zrcolagui.cpp:171 zrcolagui.cpp:171
+#: res/zrcolagui.cpp:166 zrcolagui.cpp:166
 msgid "&View"
 msgstr "Po&gled"
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: res/zrcolagui.cpp:175 zrcolagui.cpp:175
+#: res/zrcolagui.cpp:170 zrcolagui.cpp:170
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: res/zrcolagui.cpp:179 zrcolagui.cpp:179
+#: res/zrcolagui.cpp:174 zrcolagui.cpp:174
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: res/zrcolagui.cpp:185 zrcolagui.cpp:185
+#: res/zrcolagui.cpp:180 zrcolagui.cpp:180
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: res/zrcolagui.cpp:189 zrcolagui.cpp:189
+#: res/zrcolagui.cpp:184 zrcolagui.cpp:184
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: res/zrcolagui.cpp:195 zrcolagui.cpp:195
+#: res/zrcolagui.cpp:190 zrcolagui.cpp:190
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
+#: res/zrcolagui.cpp:193 zrcolagui.cpp:193
 msgid "&Help"
 msgstr "Po&moč"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 msgid "Cut"
 msgstr "Izreži"
 
-#: res/zrcolagui.cpp:203 zrcolagui.cpp:203
+#: res/zrcolagui.cpp:198 zrcolagui.cpp:198
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
+#: res/zrcolagui.cpp:200 zrcolagui.cpp:200
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
 msgid "Paste"
 msgstr "Prilepi"
 
-#: res/zrcolagui.cpp:207 zrcolagui.cpp:207
+#: res/zrcolagui.cpp:202 zrcolagui.cpp:202
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
+#: res/zrcolagui.cpp:205 zrcolagui.cpp:205
 msgid "Edit"
 msgstr "Urejanje"
 
-#: res/zrcolagui.cpp:213 zrcolagui.cpp:213
+#: res/zrcolagui.cpp:208 zrcolagui.cpp:208
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.cpp:215 zrcolagui.cpp:215
+#: res/zrcolagui.cpp:210 zrcolagui.cpp:210
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: res/zrcolagui.cpp:217 zrcolagui.cpp:217
+#: res/zrcolagui.cpp:212 zrcolagui.cpp:212
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: res/zrcolagui.cpp:219 zrcolagui.cpp:221
+#: res/zrcolagui.cpp:214 zrcolagui.cpp:216
 msgid "ZRCola (De)composition"
 msgstr "(Raz-)Sestavljanje ZRCola"
 
-#: res/zrcolagui.cpp:226 zrcolagui.cpp:228
+#: res/zrcolagui.cpp:221 zrcolagui.cpp:223
 msgid "Compose"
 msgstr "Sestavljanje"
 
-#: res/zrcolagui.cpp:230 zrcolagui.cpp:232
+#: res/zrcolagui.cpp:225 zrcolagui.cpp:227
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: res/zrcolagui.cpp:234 zrcolagui.cpp:236
+#: res/zrcolagui.cpp:229 zrcolagui.cpp:231
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: res/zrcolagui.cpp:275 zrcolagui.cpp:277
+#: res/zrcolagui.cpp:270 zrcolagui.cpp:272
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: res/zrcolagui.cpp:295 zrcolagui.cpp:297
+#: res/zrcolagui.cpp:290 zrcolagui.cpp:292
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: res/zrcolagui.cpp:322 zrcolagui.cpp:324
+#: res/zrcolagui.cpp:317 zrcolagui.cpp:319
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: res/zrcolagui.cpp:342 zrcolagui.cpp:344
+#: res/zrcolagui.cpp:337 zrcolagui.cpp:339
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: res/zrcolagui.cpp:396 zrcolagui.cpp:398
+#: res/zrcolagui.cpp:391 zrcolagui.cpp:393
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: res/zrcolagui.cpp:430 zrcolagui.cpp:432
+#: res/zrcolagui.cpp:425 zrcolagui.cpp:427
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: res/zrcolagui.cpp:431 zrcolagui.cpp:433
+#: res/zrcolagui.cpp:426 zrcolagui.cpp:428
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: res/zrcolagui.cpp:471 zrcolagui.cpp:473
+#: res/zrcolagui.cpp:466 zrcolagui.cpp:468
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
-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:473 zrcolagui.cpp:475
+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:482 zrcolagui.cpp:484
+#: res/zrcolagui.cpp:477 zrcolagui.cpp:479
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: res/zrcolagui.cpp:483 zrcolagui.cpp:485
+#: res/zrcolagui.cpp:478 zrcolagui.cpp:480
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: res/zrcolagui.cpp:495 zrcolagui.cpp:497
+#: res/zrcolagui.cpp:490 zrcolagui.cpp:492
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
+#: res/zrcolagui.cpp:497 zrcolagui.cpp:499
 msgid "All"
 msgstr "Vse"
 
-#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
+#: res/zrcolagui.cpp:498 zrcolagui.cpp:500
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
+#: res/zrcolagui.cpp:502 zrcolagui.cpp:504
 msgid "None"
 msgstr "Nič"
 
-#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
+#: res/zrcolagui.cpp:503 zrcolagui.cpp:505
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: res/zrcolagui.cpp:512 zrcolagui.cpp:514
+#: res/zrcolagui.cpp:507 zrcolagui.cpp:509
 msgid "Invert"
 msgstr "Obrni"
 
-#: res/zrcolagui.cpp:513 zrcolagui.cpp:515
+#: res/zrcolagui.cpp:508 zrcolagui.cpp:510
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: res/zrcolagui.cpp:552 zrcolagui.cpp:554
+#: res/zrcolagui.cpp:547 zrcolagui.cpp:549
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: res/zrcolagui.cpp:562 zrcolagui.cpp:564
+#: res/zrcolagui.cpp:557 zrcolagui.cpp:559
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: res/zrcolagui.cpp:590 zrcolagui.cpp:592
+#: res/zrcolagui.cpp:585 zrcolagui.cpp:587
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
+#: res/zrcolagui.cpp:599 zrcolagui.cpp:601
 msgid "Preview"
 msgstr "Predogled"
 
-#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
+#: res/zrcolagui.cpp:604 zrcolagui.cpp:606
 msgid "U+"
 msgstr "U+"
 
-#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
+#: res/zrcolagui.cpp:609 zrcolagui.cpp:611
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: res/zrcolagui.cpp:619 zrcolagui.cpp:621
+#: res/zrcolagui.cpp:614 zrcolagui.cpp:616
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
+#: res/zrcolagui.cpp:649 zrcolagui.cpp:651
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
+#: res/zrcolagui.cpp:654 zrcolagui.cpp:656
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
+#: res/zrcolagui.cpp:659 zrcolagui.cpp:661
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: res/zrcolagui.cpp:669 zrcolagui.cpp:671
+#: res/zrcolagui.cpp:664 zrcolagui.cpp:666
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: res/zrcolagui.cpp:676 zrcolagui.cpp:678
+#: res/zrcolagui.cpp:671 zrcolagui.cpp:673
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: res/zrcolagui.cpp:678 zrcolagui.cpp:680
+#: res/zrcolagui.cpp:673 zrcolagui.cpp:675
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: res/zrcolagui.cpp:682 zrcolagui.cpp:684
+#: res/zrcolagui.cpp:677 zrcolagui.cpp:679
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: res/zrcolagui.cpp:684 zrcolagui.cpp:686
+#: res/zrcolagui.cpp:679 zrcolagui.cpp:681
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: res/zrcolagui.cpp:695 zrcolagui.cpp:697
+#: res/zrcolagui.cpp:690 zrcolagui.cpp:692
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: res/zrcolagui.cpp:722 zrcolagui.cpp:724
+#: res/zrcolagui.cpp:717 zrcolagui.cpp:719
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: res/zrcolagui.cpp:811 zrcolagui.cpp:816
+#: res/zrcolagui.cpp:736 zrcolagui.cpp:738
+msgid "&Insert"
+msgstr "Vstav&i"
+
+#: res/zrcolagui.cpp:740 zrcolagui.cpp:742
+msgid "Insert character into decomposed text"
+msgstr "Vstavi znak v razstavljeno besedilo"
+
+#: res/zrcolagui.cpp:813 zrcolagui.cpp:818
 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."
@@ -392,19 +394,19 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: res/zrcolagui.cpp:815 zrcolagui.cpp:820
+#: res/zrcolagui.cpp:817 zrcolagui.cpp:822
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: res/zrcolagui.cpp:818 zrcolagui.cpp:823
+#: res/zrcolagui.cpp:820 zrcolagui.cpp:825
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: res/zrcolagui.cpp:829 zrcolagui.cpp:834
+#: res/zrcolagui.cpp:831 zrcolagui.cpp:836
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: res/zrcolagui.cpp:834 zrcolagui.cpp:839
+#: res/zrcolagui.cpp:836 zrcolagui.cpp:841
 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."
@@ -412,16 +414,16 @@ 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:838 zrcolagui.cpp:843
+#: res/zrcolagui.cpp:840 zrcolagui.cpp:845
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: res/zrcolagui.cpp:844 zrcolagui.cpp:849
+#: res/zrcolagui.cpp:846 zrcolagui.cpp:851
 msgid "Startup"
 msgstr "Zagon"
 
-#: res/zrcolagui.cpp:911 res/zrcolagui.h:113 zrcolaapp.cpp:72
-#: zrcolafrm.cpp:123 zrcolagui.cpp:916 zrcolagui.h:113
+#: res/zrcolagui.cpp:913 res/zrcolagui.h:113 zrcolaapp.cpp:72 zrcolafrm.cpp:128
+#: zrcolagui.cpp:918 zrcolagui.h:113
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -433,7 +435,7 @@ msgstr "Zagon"
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: res/zrcolagui.cpp:922 zrcolagui.cpp:927
+#: res/zrcolagui.cpp:924 zrcolagui.cpp:929
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -447,61 +449,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:930 zrcolagui.cpp:935
+#: res/zrcolagui.cpp:932 zrcolagui.cpp:937
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: res/zrcolagui.cpp:936 zrcolagui.cpp:941
-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:938 zrcolagui.cpp:943
+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:940 zrcolagui.cpp:945
-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:942 zrcolagui.cpp:947
+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:981 zrcolagui.cpp:986
+#: res/zrcolagui.cpp:983 zrcolagui.cpp:988
 msgid "Log"
 msgstr "Dnevnik"
 
-#: res/zrcolagui.cpp:997 zrcolagui.cpp:1002
+#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: res/zrcolagui.cpp:999 zrcolagui.cpp:1004
+#: res/zrcolagui.cpp:1001 zrcolagui.cpp:1006
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: res/zrcolagui.cpp:1003 zrcolagui.cpp:1008
+#: res/zrcolagui.cpp:1005 zrcolagui.cpp:1010
 msgid "&Close"
 msgstr "&Zapri"
 
-#: res/zrcolagui.cpp:1004 zrcolagui.cpp:1009
+#: res/zrcolagui.cpp:1006 zrcolagui.cpp:1011
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: res/zrcolagui.cpp:1041 zrcolachrreq.cpp:49 zrcolagui.cpp:1046
+#: res/zrcolagui.cpp:1043 zrcolachrreq.cpp:49 zrcolagui.cpp:1048
 msgid "Character"
 msgstr "Znak"
 
-#: res/zrcolagui.cpp:1043 zrcolagui.cpp:1048
+#: res/zrcolagui.cpp:1045 zrcolagui.cpp:1050
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: res/zrcolagui.cpp:1057 zrcolagui.cpp:1062
+#: res/zrcolagui.cpp:1059 zrcolagui.cpp:1064
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
-#: res/zrcolagui.cpp:1061 zrcolagui.cpp:1066
+#: res/zrcolagui.cpp:1063 zrcolagui.cpp:1068
 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."
@@ -509,21 +501,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:1069 zrcolachrreq.cpp:58 zrcolagui.cpp:1074
+#: res/zrcolagui.cpp:1071 zrcolachrreq.cpp:58 zrcolagui.cpp:1076
 msgid "Context"
 msgstr "Kontekst"
 
-#: res/zrcolagui.cpp:1071 zrcolagui.cpp:1076
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
+#: res/zrcolagui.cpp:1073 zrcolagui.cpp:1078
+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:1077 zrcolagui.cpp:1082
+#: res/zrcolagui.cpp:1079 zrcolagui.cpp:1084
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: res/zrcolagui.cpp:1084 zrcolagui.cpp:1089
+#: res/zrcolagui.cpp:1086 zrcolagui.cpp:1091
 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."
@@ -531,11 +521,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:1126 zrcolagui.cpp:1131
+#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
 msgid "Translation"
 msgstr "Pretvorba"
 
-#: res/zrcolagui.cpp:1128 zrcolagui.cpp:1133
+#: res/zrcolagui.cpp:1130 zrcolagui.cpp:1135
 msgid ""
 "ZRCola offers multiple text translations that can be arranged in a sequence.\n"
 "Please select desired translations and the order they are applied."
@@ -543,51 +533,51 @@ msgstr ""
 "ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
 "Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj potečejo."
 
-#: res/zrcolagui.cpp:1138 zrcolagui.cpp:1143
+#: res/zrcolagui.cpp:1140 zrcolagui.cpp:1145
 msgid "A&vailable:"
 msgstr "Na &voljo:"
 
-#: res/zrcolagui.cpp:1153 zrcolagui.cpp:1158
+#: res/zrcolagui.cpp:1155 zrcolagui.cpp:1160
 msgid ">"
 msgstr ">"
 
-#: res/zrcolagui.cpp:1156 zrcolagui.cpp:1161
+#: res/zrcolagui.cpp:1158 zrcolagui.cpp:1163
 msgid "<"
 msgstr "<"
 
-#: res/zrcolagui.cpp:1165 zrcolagui.cpp:1170
+#: res/zrcolagui.cpp:1167 zrcolagui.cpp:1172
 msgid "&Selected:"
 msgstr "I&zbrano:"
 
-#: res/zrcolagui.cpp:1183 zrcolagui.cpp:1188
+#: res/zrcolagui.cpp:1185 zrcolagui.cpp:1190
 msgid "Up"
 msgstr "Gor"
 
-#: res/zrcolagui.cpp:1186 zrcolagui.cpp:1191
+#: res/zrcolagui.cpp:1188 zrcolagui.cpp:1193
 msgid "Down"
 msgstr "Dol"
 
-#: res/zrcolagui.h:255 zrcolagui.h:255
+#: res/zrcolagui.h:254 zrcolagui.h:254
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: res/zrcolagui.h:291 zrcolagui.h:291
+#: res/zrcolagui.h:290 zrcolagui.h:290
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: res/zrcolagui.h:317 zrcolagui.h:317
+#: res/zrcolagui.h:316 zrcolagui.h:316
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: res/zrcolagui.h:342 zrcolagui.h:342 zrcolaupdater.cpp:94
+#: res/zrcolagui.h:341 zrcolagui.h:341 zrcolaupdater.cpp:94
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: res/zrcolagui.h:371 zrcolachrreq.cpp:64 zrcolagui.h:371
+#: res/zrcolagui.h:370 zrcolachrreq.cpp:64 zrcolagui.h:370
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: res/zrcolagui.h:413 zrcolagui.h:413
+#: res/zrcolagui.h:412 zrcolagui.h:412
 msgid "Custom Translation Sequence"
 msgstr "Zaporedje pretvorb po meri"
 
@@ -609,7 +599,7 @@ msgstr "Nesoglasje pri preverjanju"
 msgid "Invalid character in Unicode found: %c"
 msgstr "Napačen znak v zapisu Unicode: %c"
 
-#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:867
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:388 zrcolachrslct.cpp:885
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"
 
@@ -617,57 +607,41 @@ msgstr "▸ Možnosti iskanja"
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:864
+#: zrcolachrslct.cpp:391 zrcolachrslct.cpp:882
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:89
+#: zrcolafrm.cpp:94
 msgid "No Translation"
 msgstr "Brez transliteracije"
 
-#: zrcolafrm.cpp:102
+#: zrcolafrm.cpp:107
 msgid "Custom Translation..."
 msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:206
-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:215
+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:206 zrcolafrm.cpp:208
+#: zrcolafrm.cpp:215 zrcolafrm.cpp:217
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:208
-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:217
+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:472
+#: zrcolafrm.cpp:486
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:496
-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"
+#: zrcolafrm.cpp:510
+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
-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."
+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
 msgid "Start ZRCola automatically on logon"
@@ -719,26 +693,15 @@ msgstr "bintutorial1.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:7
-msgid ""
-"When configured, ZRCola starts at system startup and runs in the background."
-" If needed, it can be brought up by pressing the combination Win+F5."
-msgstr ""
-"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
-"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+msgid "When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5."
+msgstr "Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:8
-msgid ""
-"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
-"location of the cursor in the text. If ZRCola is brought to the foreground "
-"without using the aforementioned combination of keys, the program won't know"
-" where to insert the special characters!"
-msgstr ""
-"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
-"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
-"vedel, kam vstaviti želene znake!"
+msgid "IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!"
+msgstr "POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo vedel, kam vstaviti želene znake!"
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
@@ -773,14 +736,8 @@ msgstr "bintutorial2.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:13
-msgid ""
-"The string of basic and substitute characters is entered into the upper "
-"input window of the program. In the window below the resulted special "
-"characters are displayed. To insert them in the text, the F5 key is used."
-msgstr ""
-"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
-"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
-"vnesemo s pritiskom na tipko F5."
+msgid "The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used."
+msgstr "Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih vnesemo s pritiskom na tipko F5."
 
 #: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
@@ -800,12 +757,8 @@ msgstr "bintutorial3.bmp"
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
-msgstr ""
-"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz"
-" kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
+msgstr "Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz kataloga znakov (F4) ali z iskalnikom znakov (F8)."
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
diff --git a/ZRCola/res/ZRCola.fbp b/ZRCola/res/ZRCola.fbp
index a1835f7..c314e98 100644
--- a/ZRCola/res/ZRCola.fbp
+++ b/ZRCola/res/ZRCola.fbp
@@ -247,12 +247,12 @@
                         <property name="permission">none</property>
                     </object>
                     <object class="wxMenuItem" expanded="0">
-                        <property name="bitmap">Load From Icon Resource; char_select.ico; [16; 16]</property>
+                        <property name="bitmap"></property>
                         <property name="checked">0</property>
                         <property name="enabled">1</property>
-                        <property name="help">Display character search to select character to insert into text</property>
+                        <property name="help">Toggle character search to select character to insert into text</property>
                         <property name="id">wxID_CHARACTER_SELECTOR</property>
-                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="kind">wxITEM_CHECK</property>
                         <property name="label">Find C&amp;haracter...</property>
                         <property name="name">m_menuItemCharSelect</property>
                         <property name="permission">none</property>
@@ -774,11 +774,11 @@
                     <property name="bitmap">Load From Icon Resource; char_select.ico; [24; 24]</property>
                     <property name="context_menu">0</property>
                     <property name="id">wxID_CHARACTER_SELECTOR</property>
-                    <property name="kind">wxITEM_NORMAL</property>
+                    <property name="kind">wxITEM_CHECK</property>
                     <property name="label">Find Character</property>
                     <property name="name">m_toolCharSelect</property>
                     <property name="permission">protected</property>
-                    <property name="statusbar">Display character search to select character to insert into text</property>
+                    <property name="statusbar">Toggle character search to select character to insert into text</property>
                     <property name="tooltip">Find Character</property>
                     <event name="OnAuiToolBarBeginDrag"></event>
                     <event name="OnAuiToolBarMiddleClick"></event>
@@ -4911,28 +4911,116 @@
                 </object>
                 <object class="sizeritem" expanded="0">
                     <property name="border">5</property>
-                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="flag">wxALIGN_RIGHT|wxALL</property>
                     <property name="proportion">0</property>
-                    <object class="wxStdDialogButtonSizer" expanded="0">
-                        <property name="Apply">0</property>
-                        <property name="Cancel">1</property>
-                        <property name="ContextHelp">0</property>
-                        <property name="Help">0</property>
-                        <property name="No">0</property>
-                        <property name="OK">1</property>
-                        <property name="Save">0</property>
-                        <property name="Yes">0</property>
+                    <object class="wxBoxSizer" expanded="0">
                         <property name="minimum_size"></property>
-                        <property name="name">m_sdbSizerButtons</property>
-                        <property name="permission">protected</property>
-                        <event name="OnApplyButtonClick"></event>
-                        <event name="OnCancelButtonClick"></event>
-                        <event name="OnContextHelpButtonClick"></event>
-                        <event name="OnHelpButtonClick"></event>
-                        <event name="OnNoButtonClick"></event>
-                        <event name="OnOKButtonClick">OnOKButtonClick</event>
-                        <event name="OnSaveButtonClick"></event>
-                        <event name="OnYesButtonClick"></event>
+                        <property name="name">bSizerButtons</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="0">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" 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="bitmap"></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="current"></property>
+                                <property name="default">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="disabled"></property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">0</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="focus"></property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">&amp;Insert</property>
+                                <property name="margins"></property>
+                                <property name="markup">0</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"></property>
+                                <property name="moveable">1</property>
+                                <property name="name">m_buttonInsert</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="position"></property>
+                                <property name="pressed"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip">Insert character into decomposed text</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="OnAux1DClick"></event>
+                                <event name="OnAux1Down"></event>
+                                <event name="OnAux1Up"></event>
+                                <event name="OnAux2DClick"></event>
+                                <event name="OnAux2Down"></event>
+                                <event name="OnAux2Up"></event>
+                                <event name="OnButtonClick">OnInsert</event>
+                                <event name="OnChar"></event>
+                                <event name="OnCharHook"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI">OnInsertUpdateUI</event>
+                            </object>
+                        </object>
                     </object>
                 </object>
             </object>
diff --git a/ZRCola/res/zrcolagui.cpp b/ZRCola/res/zrcolagui.cpp
index 4fbf90b..7a95a27 100644
--- a/ZRCola/res/zrcolagui.cpp
+++ b/ZRCola/res/zrcolagui.cpp
@@ -81,12 +81,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->AppendSeparator();
 	
 	wxMenuItem* m_menuItemCharSelect;
-	m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Display character search to select character to insert into text"), wxITEM_NORMAL );
-	#ifdef __WXMSW__
-	m_menuItemCharSelect->SetBitmaps( wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
-	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
-	m_menuItemCharSelect->SetBitmap( wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 16, 16 ) );
-	#endif
+	m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Toggle character search to select character to insert into text"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemCharSelect );
 	
 	m_menuEdit->AppendSeparator();
@@ -210,7 +205,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 	
 	m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
-	m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Find Character"), _("Display character search to select character to insert into text"), NULL ); 
+	m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); 
 	
 	m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
 	
@@ -735,14 +730,19 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	
 	bSizerContent->Add( 5, 5, 0, wxALL|wxEXPAND, 5 );
 	
-	m_sdbSizerButtons = new wxStdDialogButtonSizer();
-	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
-	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
-	m_sdbSizerButtons->Realize();
+	wxBoxSizer* bSizerButtons;
+	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
 	
-	bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, 5 );
+	m_buttonInsert = new wxButton( this, wxID_ANY, _("&Insert"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_buttonInsert->SetDefault();
+	m_buttonInsert->Enable( false );
+	m_buttonInsert->SetToolTip( _("Insert character into decomposed text") );
+	
+	bSizerButtons->Add( m_buttonInsert, 0, wxALL, 5 );
+	
+	
+	bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxALL, 5 );
 	
 	
 	this->SetSizer( bSizerContent );
@@ -768,7 +768,8 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_navigateBack->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
 	m_navigateForward->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
 	m_gridRelated->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
-	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );
+	m_buttonInsert->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this );
+	m_buttonInsert->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this );
 }
 
 wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
@@ -792,7 +793,8 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
 	m_navigateBack->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
 	m_navigateForward->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
 	m_gridRelated->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
-	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );
+	m_buttonInsert->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this );
+	m_buttonInsert->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this );
 	
 }
 
diff --git a/ZRCola/res/zrcolagui.h b/ZRCola/res/zrcolagui.h
index 4bd41f9..3d64b5d 100644
--- a/ZRCola/res/zrcolagui.h
+++ b/ZRCola/res/zrcolagui.h
@@ -224,9 +224,7 @@ class wxZRColaCharSelectBase : public wxDialog
 		wxHyperlinkCtrl* m_navigateBack;
 		wxHyperlinkCtrl* m_navigateForward;
 		wxZRColaCharGrid* m_gridRelated;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsCancel;
+		wxButton* m_buttonInsert;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
@@ -247,7 +245,8 @@ class wxZRColaCharSelectBase : public wxDialog
 		virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
 		
 	
 	public:
diff --git a/ZRCola/zrcolachrslct.cpp b/ZRCola/zrcolachrslct.cpp
index 9656b56..7ffbd62 100644
--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -477,7 +477,7 @@ void wxZRColaCharSelect::OnResultCellDClick(wxGridEvent& event)
     if (!val.IsEmpty()) {
         NavigateTo(val);
         wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+        m_buttonInsert->GetEventHandler()->ProcessEvent(e);
     }
 }
 
@@ -491,7 +491,7 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
         if (!val.IsEmpty()) {
             NavigateTo(val);
             wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+            m_buttonInsert->GetEventHandler()->ProcessEvent(e);
 
             event.StopPropagation();
             return;
@@ -520,7 +520,7 @@ void wxZRColaCharSelect::OnRecentCellDClick(wxGridEvent& event)
     if (!val.IsEmpty()) {
         NavigateTo(val);
         wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+        m_buttonInsert->GetEventHandler()->ProcessEvent(e);
     }
 }
 
@@ -534,7 +534,7 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
         if (!val.IsEmpty()) {
             NavigateTo(val);
             wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
-            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
+            m_buttonInsert->GetEventHandler()->ProcessEvent(e);
 
             event.StopPropagation();
             return;
@@ -596,7 +596,13 @@ void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)
 }
 
 
-void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
+void wxZRColaCharSelect::OnInsertUpdateUI(wxUpdateUIEvent& event)
+{
+    event.Enable(!m_char.empty());
+}
+
+
+void wxZRColaCharSelect::OnInsert(wxCommandEvent& event)
 {
     event.Skip();
 
@@ -610,6 +616,14 @@ void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
             val.Add(c);
     }
     m_gridRecent->SetCharacters(val);
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    if (app->m_mainWnd) {
+        app->m_mainWnd->m_panel->m_source->WriteText(m_char);
+        app->m_mainWnd->m_panel->m_source->SetFocus();
+    }
+
+    Show(false);
 }
 
 
diff --git a/ZRCola/zrcolachrslct.h b/ZRCola/zrcolachrslct.h
index 311d336..7327e7f 100644
--- a/ZRCola/zrcolachrslct.h
+++ b/ZRCola/zrcolachrslct.h
@@ -163,7 +163,8 @@ protected:
     virtual void OnUnicodeText(wxCommandEvent& event);
     virtual void OnPreviewKeyDown(wxKeyEvent& event);
     virtual void OnRelatedSelectCell(wxGridEvent& event);
-    virtual void OnOKButtonClick(wxCommandEvent& event);
+    virtual void OnInsertUpdateUI(wxUpdateUIEvent& event);
+    virtual void OnInsert(wxCommandEvent& event);
 
     void ResetResults();
     void NavigateBy(int offset);
diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp
index c5c724b..261fd0e 100644
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -32,6 +32,7 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
     EVT_UPDATE_UI      (wxID_SELECTALL                                        , wxZRColaFrame::OnForwardEventUpdate         )
     EVT_MENU           (wxID_SELECTALL                                        , wxZRColaFrame::OnForwardEvent               )
 
+    EVT_UPDATE_UI      (wxID_CHARACTER_SELECTOR                               , wxZRColaFrame::OnInsertCharacterUpdate      )
     EVT_MENU           (wxID_CHARACTER_SELECTOR                               , wxZRColaFrame::OnInsertCharacter            )
 
     EVT_UPDATE_UI_RANGE(wxID_SEND_DESTINATION     , wxID_SEND_ABORT           , wxZRColaFrame::OnSendUpdate                 )
@@ -269,12 +270,15 @@ void wxZRColaFrame::OnForwardEvent(wxCommandEvent& event)
 }
 
 
+void wxZRColaFrame::OnInsertCharacterUpdate(wxUpdateUIEvent& event)
+{
+    event.Check(m_chrSelect->IsVisible());
+}
+
+
 void wxZRColaFrame::OnInsertCharacter(wxCommandEvent& event)
 {
-    if (m_chrSelect->ShowModal() == wxID_OK && !m_chrSelect->m_char.empty()) {
-        m_panel->m_source->WriteText(m_chrSelect->m_char);
-        m_panel->m_source->SetFocus();
-    }
+    m_chrSelect->Show(!m_chrSelect->IsVisible());
 }
 
 
diff --git a/ZRCola/zrcolafrm.h b/ZRCola/zrcolafrm.h
index b781560..70f784d 100644
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -75,6 +75,7 @@ protected:
     void OnExit(wxCommandEvent& event);
     void OnForwardEventUpdate(wxUpdateUIEvent& event);
     void OnForwardEvent(wxCommandEvent& event);
+    void OnInsertCharacterUpdate(wxUpdateUIEvent& event);
     void OnInsertCharacter(wxCommandEvent& event);
     void OnSendUpdate(wxUpdateUIEvent& event);
     void OnSendDestination(wxCommandEvent& event);
diff --git a/ZRCola/zrcolagui.cpp b/ZRCola/zrcolagui.cpp
index c2497bf..46fe74d 100644
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -81,12 +81,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuEdit->AppendSeparator();
 	
 	wxMenuItem* m_menuItemCharSelect;
-	m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Display character search to select character to insert into text"), wxITEM_NORMAL );
-	#ifdef __WXMSW__
-	m_menuItemCharSelect->SetBitmaps( wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) );
-	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
-	m_menuItemCharSelect->SetBitmap( wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(16), FromDIP(16) ) );
-	#endif
+	m_menuItemCharSelect = new wxMenuItem( m_menuEdit, wxID_CHARACTER_SELECTOR, wxString( _("Find C&haracter...") ) + wxT('\t') + wxT("F8"), _("Toggle character search to select character to insert into text"), wxITEM_CHECK );
 	m_menuEdit->Append( m_menuItemCharSelect );
 	
 	m_menuEdit->AppendSeparator();
@@ -210,7 +205,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxDefaultSize ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 	
 	m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
-	m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Find Character"), _("Display character search to select character to insert into text"), NULL ); 
+	m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_CHECK, _("Find Character"), _("Toggle character search to select character to insert into text"), NULL ); 
 	
 	m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, FromDIP(24), FromDIP(24) ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
 	
@@ -737,14 +732,19 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	
 	bSizerContent->Add( FromDIP(5), FromDIP(5), 0, wxALL|wxEXPAND, FromDIP(5) );
 	
-	m_sdbSizerButtons = new wxStdDialogButtonSizer();
-	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
-	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
-	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
-	m_sdbSizerButtons->Realize();
+	wxBoxSizer* bSizerButtons;
+	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
 	
-	bSizerContent->Add( m_sdbSizerButtons, 0, wxALL|wxEXPAND, FromDIP(5) );
+	m_buttonInsert = new wxButton( this, wxID_ANY, _("&Insert"), wxDefaultPosition, wxDefaultSize, 0 );
+	
+	m_buttonInsert->SetDefault();
+	m_buttonInsert->Enable( false );
+	m_buttonInsert->SetToolTip( _("Insert character into decomposed text") );
+	
+	bSizerButtons->Add( m_buttonInsert, 0, wxALL, FromDIP(5) );
+	
+	
+	bSizerContent->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxALL, FromDIP(5) );
 	
 	
 	this->SetSizer( bSizerContent );
@@ -770,7 +770,8 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	m_navigateBack->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
 	m_navigateForward->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
 	m_gridRelated->Connect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
-	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );
+	m_buttonInsert->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this );
+	m_buttonInsert->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this );
 }
 
 wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
@@ -794,7 +795,8 @@ wxZRColaCharSelectBase::~wxZRColaCharSelectBase()
 	m_navigateBack->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateBack ), NULL, this );
 	m_navigateForward->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( wxZRColaCharSelectBase::OnNavigateForward ), NULL, this );
 	m_gridRelated->Disconnect( wxEVT_GRID_SELECT_CELL, wxGridEventHandler( wxZRColaCharSelectBase::OnRelatedSelectCell ), NULL, this );
-	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnOKButtonClick ), NULL, this );
+	m_buttonInsert->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharSelectBase::OnInsert ), NULL, this );
+	m_buttonInsert->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaCharSelectBase::OnInsertUpdateUI ), NULL, this );
 	
 }
 
diff --git a/ZRCola/zrcolagui.h b/ZRCola/zrcolagui.h
index f882ea7..8a84d84 100644
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -224,9 +224,7 @@ class wxZRColaCharSelectBase : public wxDialog
 		wxHyperlinkCtrl* m_navigateBack;
 		wxHyperlinkCtrl* m_navigateForward;
 		wxZRColaCharGrid* m_gridRelated;
-		wxStdDialogButtonSizer* m_sdbSizerButtons;
-		wxButton* m_sdbSizerButtonsOK;
-		wxButton* m_sdbSizerButtonsCancel;
+		wxButton* m_buttonInsert;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
@@ -247,7 +245,8 @@ class wxZRColaCharSelectBase : public wxDialog
 		virtual void OnNavigateBack( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnNavigateForward( wxHyperlinkEvent& event ) { event.Skip(); }
 		virtual void OnRelatedSelectCell( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsert( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInsertUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
 		
 	
 	public: