Set version to 2.1-beta5

Update sub-modules
Update wxWidgets to 3.0.3
2017-12-19 12:23:28 +01:00 · 2017-12-19 12:10:38 +01:00 · 2017-12-19 10:39:15 +01:00 · 2017-12-19 09:11:47 +01:00 · 2017-12-19 09:10:53 +01:00 · 2017-12-18 12:02:26 +01:00
178 changed files with 16620 additions and 7629 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "lib/atlex"]
-	path = lib/atlex
-	url = https://github.com/Amebis/atlex.git
-[submodule "lib/MSICALib"]
-	path = lib/MSICALib
-	url = https://github.com/Amebis/MSICALib.git
 [submodule "lib/stdex"]
 	path = lib/stdex
 	url = https://github.com/Amebis/stdex.git
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSI/MSICA
+++ b/MSI/MSICA
--- a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@

 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck

 [parametri]
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -431,7 +431,7 @@ Property	Value
 s$(MSIBUILD_LENGTH_ID)	l0
 1252	Property	Property
 Manufacturer	Amebis, Slovenia, E.U.
-ARPCONTACT	Fran Ramov<EFBFBD> Institute of Slovenian Language SRC SASA
+ARPCONTACT	Fran Ramov<EFBFBD> Institute of Slovenian Language ZRC SAZU
 ARPHELPTELEPHONE	+386 1 470 6170
 ARPURLINFOABOUT	http://zrcola.zrc-sazu.si/en/contact/
 ARPHELPLINK	http://zrcola.zrc-sazu.si/en/info/instructions/
--- a/MSI/ZRCola/Makefile
+++ b/MSI/ZRCola/Makefile
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/ZRCola/locale/ZRCola.pot
+++ b/MSI/ZRCola/locale/ZRCola.pot
@@ -814,7 +814,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr ""

 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr ""

 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
--- a/MSI/ZRCola/locale/de_DE.po
+++ b/MSI/ZRCola/locale/de_DE.po
@@ -1526,7 +1526,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr ""

 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr ""

 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
--- a/MSI/ZRCola/locale/ru_RU.po
+++ b/MSI/ZRCola/locale/ru_RU.po
@@ -1479,7 +1479,7 @@ msgstr "Продолжить"

 #: en_US.Win32.Debug.Control-2.idtx:13 en_US.Win32.Release.Control-2.idtx:13 en_US.x64.Debug.Control-2.idtx:13 en_US.x64.Release.Control-2.idtx:13
 msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
-msgstr ""
+msgstr "[DlgTitleFont]Шрифт «00 ZRCola» в «ZRCola»"

 #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14
 msgid "binfontsubst.bmp"
@@ -1490,6 +1490,8 @@ msgid ""
 "The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after the "
 "next restart."
 msgstr ""
+"Шрифт «00 ZRCola» заменился шрифтом «ZRCola». Для правильного показа предыдущих документов в вашем компьютере проведена субституция шрифтов, которая вступит в силу после следующего запуска "
+"компьютера."

 #: en_US.Win32.Debug.Directory-2.idtx:4 en_US.Win32.Release.Directory-2.idtx:4 en_US.x64.Debug.Directory-2.idtx:4 en_US.x64.Release.Directory-2.idtx:4
 msgid "ZRCola:."
@@ -1532,8 +1534,8 @@ msgid "Amebis, Slovenia, E.U."
 msgstr "Amebis, Словения, ЕС"

 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
-msgstr ""
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
+msgstr "Институт словенского языка им. Франа Рамовша ZRC SAZU"

 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "+386 1 470 6170"
--- a/MSI/ZRCola/locale/sl_SI.po
+++ b/MSI/ZRCola/locale/sl_SI.po
@@ -1531,7 +1531,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr "Amebis, d. o. o., Kamnik"

 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr "Inštitut za slovenski jezik Frana Ramovša ZRC SAZU"

 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
--- a/MSILocal.mak
+++ b/MSILocal.mak
--- a/8
+++ b/8
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -450,9 +450,9 @@ Localization :: \
 !ENDIF


-LANG=de_DE
-LANG_OUT=De
-!INCLUDE "MSILocal.mak"
+#LANG=de_DE
+#LANG_OUT=De
+#!INCLUDE "MSILocal.mak"

 LANG=en_US
 LANG_OUT=En
--- a/README.md
+++ b/README.md
@@ -15,15 +15,16 @@ https://www.amebis.si/prenos/ZRCola/
 - Microsoft Visual Studio 2010 SP1
 - _sed.exe_ and _grep.exe_
 - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
- Additional command line utilities from project’s bin folder: add bin folder to path. The source code is provided on request.
+- Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
+- wxWidgets 3.0 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.

 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:

-1. A signing certificate installed in the current user’s certificate store.
+1. A signing certificate installed in the current user's certificate store.
 2. The following variables in the environment:
-  - `ManifestCertificateThumbprint` - set the value to certificate’s SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
-  - `ManifestTimestampUrl` - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
+  - `ManifestTimestampUrl`          - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.

 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.

@@ -36,7 +37,7 @@ Use Microsoft NMAKE to build the project. The resulting files can be found in ou
 - `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
 - `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!

-The `/ls` flag can be appended to the commands above to reduce NMAKE’s verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.

 ## Contact Information
 Please contact the following addressee for further information and help:
--- a/2
+++ b/2
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -200,9 +200,9 @@ All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt"
 Action	Condition	Sequence
 s$(MSIBUILD_LENGTH_ID)	S255	I2
 InstallUISequence	Action
-dlgTutorial1	NOT Installed	1400
-dlgTutorial2	NOT Installed	1401
-dlgTutorial3	NOT Installed	1402
+dlgTutorial1	NOT Installed AND &featZRCola>=3	1400
+dlgTutorial2	NOT Installed AND &featZRCola>=3	1401
+dlgTutorial3	NOT Installed AND &featZRCola>=3	1402
 <<NOKEEP


--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
--- a/ZRCola/ZRCola.rc
+++ b/ZRCola/ZRCola.rc
--- a/ZRCola/ZRCola.vcxproj
+++ b/ZRCola/ZRCola.vcxproj
@@ -91,6 +91,7 @@
    <ClCompile Include="zrcolagui.cpp" />
    <ClCompile Include="zrcolakeyhndlr.cpp" />
    <ClCompile Include="zrcolasettings.cpp" />
+    <ClCompile Include="zrcolatranseq.cpp" />
    <ClCompile Include="zrcolaupdater.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -106,6 +107,7 @@
    <ClInclude Include="zrcolagui.h" />
    <ClInclude Include="zrcolakeyhndlr.h" />
    <ClInclude Include="zrcolasettings.h" />
+    <ClInclude Include="zrcolatranseq.h" />
    <ClInclude Include="zrcolaupdater.h" />
  </ItemGroup>
  <ItemGroup>
@@ -128,6 +130,8 @@
  <ItemGroup>
    <None Include="locale\ZRCola.pot" />
    <None Include="res\char_select.ico" />
+    <None Include="res\copy_composed_and_return.ico" />
+    <None Include="res\copy_decomposed_and_return.ico" />
    <None Include="res\edit_copy.ico" />
    <None Include="res\edit_cut.ico" />
    <None Include="res\edit_paste.ico" />
@@ -137,7 +141,9 @@
    <None Include="res\send_composed.ico" />
    <None Include="res\send_decomposed.ico" />
    <None Include="res\zrcola.ico" />
-    <None Include="ZRCola.fbp" />
+    <None Include="ZRCola.fbp">
+      <SubType>Designer</SubType>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="ZRCola.rc" />
--- a/ZRCola/ZRCola.vcxproj.filters
+++ b/ZRCola/ZRCola.vcxproj.filters
@@ -58,6 +58,9 @@
    <ClCompile Include="zrcolachrreq.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="zrcolatranseq.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="stdafx.h">
@@ -99,6 +102,9 @@
    <ClInclude Include="zrcolachrreq.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="zrcolatranseq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="res\zrcola.ico">
@@ -137,6 +143,12 @@
    <None Include="res\navigate_forward.ico">
      <Filter>Resource Files</Filter>
    </None>
+    <None Include="res\copy_composed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\copy_decomposed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="ZRCola.rc">
--- a/ZRCola/locale/ZRCola.pot
+++ b/ZRCola/locale/ZRCola.pot
--- a/ZRCola/locale/de_DE.po
+++ b/ZRCola/locale/de_DE.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:55+0200\n"
-"PO-Revision-Date: 2016-10-13 11:55+0200\n"
+"POT-Creation-Date: 2017-06-01 18:04+0200\n"
+"PO-Revision-Date: 2017-06-01 18:04+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.2\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -20,74 +20,79 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""

-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "ZRCola"
 msgstr "ZRCola"

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 #, fuzzy
 msgid "Character"
 msgstr "Eingabe eines Zeichenstils"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 #, fuzzy
 msgid "Context"
 msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."

-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr ""

-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr ""
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr "Fehler bei der Validierung"
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr ""
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr ""

 # Recitation separator
-#: zrcolachrslct.cpp:164
+#: zrcolachrslct.cpp:328
 #, fuzzy
 msgid ", "
 msgstr ", "

-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr ""

-#: zrcolafrm.cpp:141
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
 msgstr ""

-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr ""
+
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "

-#: zrcolafrm.cpp:143
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
+#: zrcolafrm.cpp:177
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr ""

-#: zrcolafrm.cpp:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"

-#: zrcolafrm.cpp:375
-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:434
+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"

 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -117,7 +122,7 @@ msgstr ""
 msgid "Find C&haracter..."
 msgstr "Eingabe eines Zeichenstils"

-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr ""

@@ -126,595 +131,595 @@ msgstr ""
 msgid "&Send Composed"
 msgstr "Pošlji sestavljeno (F5)"

-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr ""

 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr ""
+
+#: zrcolagui.cpp:98
+msgid "Copy composed text to clipboard and return focus to source window"
+msgstr ""
+
+#: zrcolagui.cpp:107
 #, fuzzy
 msgid "Send &Decomposed"
 msgstr "Pošlji razstavljeno (F6)"

-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr ""

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr ""
+
+#: zrcolagui.cpp:116
+msgid "Copy decomposed text to clipboard and return focus to source window"
+msgstr ""
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr ""

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr ""

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr ""

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr ""

-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 #, fuzzy
 msgid "&Edit"
 msgstr "&Bearbeiten"

-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr ""

-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "Toggle edit toolbar"
 msgstr ""

-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr ""

-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "Toggle compose toolbar"
 msgstr ""

-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr ""

-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Toggle character catalog panel"
 msgstr ""

-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 #, fuzzy
 msgid "&View"
 msgstr "&Ansicht..."

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr ""

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr ""

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr ""

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr ""

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr ""

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr ""

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr ""

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr ""

-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
+#, fuzzy
 msgid "&About..."
-msgstr ""
+msgstr "Über..."

-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 #, fuzzy
 msgid "&Help"
 msgstr "&Hilfe"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 #, fuzzy
 msgid "Cut"
 msgstr "Ausschneiden"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 #, fuzzy
 msgid "Cut selection"
 msgstr "Auswahl ausschneiden"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 #, fuzzy
 msgid "Copy"
 msgstr "Kopieren"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 #, fuzzy
 msgid "Copy selection"
 msgstr "Auswahl kopieren"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 #, fuzzy
 msgid "Paste"
 msgstr "Einfügen"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 #, fuzzy
 msgid "Paste selection"
 msgstr "Auswahl einfügen"

-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 #, fuzzy
 msgid "Edit"
 msgstr "Bearbeiten"

-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 #, fuzzy
 msgid "Find Character"
 msgstr "Eingabe eines Zeichenstils"

-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 #, fuzzy
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno (F5)"

-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 #, fuzzy
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno (F6)"

-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr ""

-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr ""

-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr ""

-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr ""

-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr ""

-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr ""

-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr ""

-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr ""

-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 #, fuzzy
 msgid "Show &All"
 msgstr "Alles zeigen"

-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr ""

-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 #, fuzzy
 msgid "&Browse"
 msgstr "Durchsuchen"

-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr ""

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr ""

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr ""

-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr ""

-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 #, fuzzy
 msgid "All"
 msgstr "Alle"

-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr ""

-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 #, fuzzy
 msgid "None"
 msgstr "Kein"

-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Auswahl kopieren"

-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr ""

-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"

-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 #, fuzzy
 msgid "Character search results"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr ""

-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr ""

-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 #, fuzzy
 msgid "Preview"
 msgstr " Vorschau"

-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"

-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr ""

-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr ""

-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 #, fuzzy
 msgid "Character preview"
 msgstr "Skupine &znakov"

-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr ""

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:647
 #, fuzzy
 msgid "Character tags"
 msgstr "Eingabe eines Zeichenstils"

-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr ""

-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"

-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr ""

-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"

-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr ""

-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr ""

-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr ""

-#: zrcolagui.cpp:770
-msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
-"For optimal decomposition you should set the language correctly."
-msgstr ""
-
-#: zrcolagui.cpp:774
-msgid "Select language &automatically according to selected keyboard"
-msgstr ""
-
-#: zrcolagui.cpp:777
-msgid "&Manually select the language from the list below:"
-msgstr ""
-
-#: zrcolagui.cpp:789
-msgid "Text Language"
-msgstr ""
-
 #: zrcolagui.cpp:794
 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."
+"Some character native to specific language you are working with should not decompose to primitives.\n"
+"For optimal decomposition you should set the language correctly."
 msgstr ""

 #: zrcolagui.cpp:798
+msgid "Select language &automatically according to selected keyboard"
+msgstr ""
+
+#: zrcolagui.cpp:801
+msgid "&Manually select the language from the list below:"
+msgstr ""
+
+#: zrcolagui.cpp:812
+msgid "Text Language"
+msgstr ""
+
+#: zrcolagui.cpp:817
+msgid ""
+"ZRCola can be launched every time you log in to your computer.\n"
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
+msgstr ""
+
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr ""

-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr ""

-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""

-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
+#, fuzzy
 msgid "zrcola.zrc-sazu.si"
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
+
+#: zrcolagui.cpp:919
+msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr ""

-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+#: zrcolagui.cpp:923
+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 ""

-#: zrcolagui.cpp:903
-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 ""
-
-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 #, fuzzy
 msgid "Log"
 msgstr "&Log"

-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."

-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr ""

-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"

-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 #, fuzzy
 msgid "Close this window"
 msgstr "Fenster schließen"

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr ""

-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr ""

-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 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."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 msgstr ""

-#: zrcolagui.cpp:1027
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
 msgstr ""

-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr ""

-#: zrcolagui.cpp:1040
+#: zrcolagui.cpp:1060
 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."
+"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 ""
+
+#: zrcolagui.cpp:1102
+msgid "Translation"
+msgstr ""
+
+#: zrcolagui.cpp:1104
+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 ""
+
+#: zrcolagui.cpp:1114
+msgid "A&vailable:"
+msgstr ""
+
+#: zrcolagui.cpp:1129
+msgid ">"
+msgstr ">"
+
+#: zrcolagui.cpp:1132
+msgid "<"
+msgstr "<"
+
+#: zrcolagui.cpp:1141
+#, fuzzy
+msgid "&Selected:"
+msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#: zrcolagui.cpp:1159
+#, fuzzy
+msgid "Up"
+msgstr "Up"
+
+#: zrcolagui.cpp:1162
+#, fuzzy
+msgid "Down"
+msgstr "Down"
+
+#: zrcolagui.h:250
+#, fuzzy
+msgid "Character Search"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.h:286
+msgid "Settings"
+msgstr ""
+
+#: zrcolagui.h:312
+msgid "About ZRCola"
+msgstr ""
+
+#: zrcolagui.h:337 zrcolaupdater.cpp:94
+msgid "Product Update"
+msgstr ""
+
+#: zrcolagui.h:408
+msgid "Custom Translation Sequence"
 msgstr ""

 #: 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."
+msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr ""

-#: zrcolasettings.cpp:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr ""

+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr ""
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
 msgstr ""

-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr ""
-
-#: zrcolagui.h:246
-#, fuzzy
-msgid "Character Search"
-msgstr "Skupine &znakov"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr ""
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr ""
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr ""

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: 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."
+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 ""

-#: 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!"
+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 ""

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 #, fuzzy
 msgid "&Continue"
-msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
+msgstr "Auf Volume \"[2]\" steht nicht genügend Speicherplatz für die Installation bei aktivierter Wiederherstellungsoption zur Verfügung. [3] KB sind erforderlich, aber nur [4] KB sind verfügbar. Klicken Sie auf \"Ignorieren\", um die Installation ohne Speicherung von Wiederherstellungsinformationen fortzusetzen, klicken Sie auf \"Wiederholen\", um den verfügbaren Speicher erneut zu überprüfen oder auf \"Abbrechen\", um die Installation abzubrechen."

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr ""

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: 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."
+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 ""

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr ""

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: 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)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
 msgstr ""

-#: 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
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "Input system for linguistic use"
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -1,18 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:53+0200\n"
-"PO-Revision-Date: 2016-10-13 11:54+0200\n"
+"POT-Creation-Date: 2017-06-01 18:04+0200\n"
+"PO-Revision-Date: 2017-08-02 08:28+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0\n"
 "X-Poedit-Basepath: .\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"

@@ -21,75 +20,75 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004–%s ZRC SAZU"

-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "ZRCola"
 msgstr "ZRCola"

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 msgid "Character"
 msgstr "Знак"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 msgid "Context"
 msgstr "Контекст"

-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr "Запрос нового знака"

-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr "Слишком много цифр в записи Unicode."
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr "Конфликт проверки"
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr "Недействительный знак в записи Unicode: %c"
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr "▸ Опции поиска"

 # Recitation separator
-#: zrcolachrslct.cpp:164
-#, fuzzy
+#: zrcolachrslct.cpp:328
 msgid ", "
 msgstr ", "

-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr "▾ Опции поиска"

-#: zrcolafrm.cpp:141
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"Сочетание клавиш Win+F5 \n"
-"регистрировать. Некоторые функциональности не будут доступны."
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
+msgstr "Настраиваемое  преобразование ..."

-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F5 регистрировать. Некоторые функциональности не будут доступны."
+
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Предупреждение"

-#: zrcolafrm.cpp:143
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые "
-"функциональности не будут доступны."
+#: zrcolafrm.cpp:177
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые функциональности не будут доступны."

-#: zrcolafrm.cpp:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"

-#: zrcolafrm.cpp:375
-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:434
+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"

 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -115,7 +114,7 @@ msgstr "Выделить весь текст"
 msgid "Find C&haracter..."
 msgstr "Поиск &знака ..."

-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr "Показать браузер знаков для вставления выбранного знака"

@@ -123,455 +122,497 @@ msgstr "Показать браузер знаков для вставления
 msgid "&Send Composed"
 msgstr "&Послать составленное"

-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr "Послать составленный текст в исходное окно"

 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr "Копировать составленное и &возвратиться"
+
+#: zrcolagui.cpp:98
+msgid "Copy composed text to clipboard and return focus to source window"
+msgstr "Копировать составленный текст в буфер обмена и возвратить фокус в исходное окно"
+
+#: zrcolagui.cpp:107
 msgid "Send &Decomposed"
 msgstr "Послать &разобранное"

-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr "Послать разобранный текст в исходное окно"

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr "Копировать разобранное и возв&ратиться"
+
+#: zrcolagui.cpp:116
+msgid "Copy decomposed text to clipboard and return focus to source window"
+msgstr "Копировать разобранный текст в буфер обмена и возвратить фокус в исходное окно"
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr "Прервать составление/разборку"

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr "Прервать составление и возвратить фокус в исходное окно"

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr "&Настройки ..."

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr "Открыть диалог конфигурации программы"

-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 msgid "&Edit"
 msgstr "&Правка"

-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr "Панель инструментов для &правки"

-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "Toggle edit toolbar"
 msgstr "Переключить панель инструментов для правки"

-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr "Панель инструментов для &составления"

-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "Toggle compose toolbar"
 msgstr "Переключить панель инструментов для составления"

-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr "Список &знаков"

-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Toggle character catalog panel"
 msgstr "Переключить список знаков"

-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 msgid "&View"
 msgstr "&Вид"

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr "&Инструкции ..."

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr "Открыть сайт с инструкциями по продукту"

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr "Сочетания &клавиш ..."

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr "Открыть список сочетаний клавиш"

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr "&Запрос нового знака ..."

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Отправить запрос нового знака"

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr "Проверить наличие &обновлений ..."

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr "Проверить наличие обновлений онлайн"

-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
 msgid "&About..."
 msgstr "О прогр&амме ..."

-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 msgid "&Help"
 msgstr "&Справка"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut"
 msgstr "Вырезать"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut selection"
 msgstr "Вырезать выбор"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy"
 msgstr "Копировать"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy selection"
 msgstr "Копировать выбор"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste"
 msgstr "Вставить"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste selection"
 msgstr "Вставить выбор"

-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 msgid "Edit"
 msgstr "Правка"

-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 msgid "Find Character"
 msgstr "Поиск знака"

-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 msgid "Send Composed"
 msgstr "Послать составленное (F5)"

-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 msgid "Send Decomposed"
 msgstr "Послать разобранное (F6)"

-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr "Составить"

-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr "Список знаков"

-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr "(Де)Композитор"

-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr "Разобранний текст"

-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr "Дамп разобранного Юнукода"

-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr "Составленный текст"

-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr "Дамп составленного Юникода"

-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr "Выделить категории для отображения"

-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 msgid "Show &All"
 msgstr "Показать &все"

-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr "Переключить отображение редко использованных знаков"

-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 msgid "&Browse"
 msgstr "&Обзор"

-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Полное либо частичное описание знака Юникод (на английском) для поиска"

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr "Опции поиска"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr "Показать/скрыть дополнительные опции поиска"

-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr "Список категории Юникод для проведения поиска"

-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 msgid "All"
 msgstr "Все"

-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr "Выбрать все категории"

-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 msgid "None"
 msgstr "Ничего"

-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 msgid "Clear category selection"
 msgstr "Очистить выбор категории"

-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr "Обратить"

-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 msgid "Invert category selection"
 msgstr "Обратить выбор категории"

-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 msgid "Character search results"
 msgstr "Результаты поиска знаков"

-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr "&Недавно использованное"

-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr "Список недавно вставленных знаков"

-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 msgid "Preview"
 msgstr "Просмотр"

-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"

-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr "Шестнадцатеричный код Юникод"

-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr "Сочетание клавиш в окне композитора"

-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 msgid "Character preview"
 msgstr "Просмотр знака"

-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr "Описание знака Юникод"

-#: zrcolagui.cpp:623
-#, fuzzy
+#: zrcolagui.cpp:647
 msgid "Character tags"
-msgstr "Список знаков"
+msgstr "Ключевые слова"

-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr "Категория знака Юникод"

-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 msgid "« Back"
 msgstr "« Назад"

-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr "К предыдущему знаку"

-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 msgid "Forward »"
 msgstr "Далее »"

-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr "К следующему знаку"

-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr "&Связанное"

-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr "Список связанных знаков"

-#: zrcolagui.cpp:770
+#: zrcolagui.cpp:794
 msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
+"Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""
 "Некоторые знаки использованного языка нельзя разбирать.\n"
 "Для оптимальной разборки вы должны настроить правильный язык."

-#: zrcolagui.cpp:774
+#: zrcolagui.cpp:798
 msgid "Select language &automatically according to selected keyboard"
 msgstr "&Автоматически установить язык на основе выбранной клавиатуры"

-#: zrcolagui.cpp:777
+#: zrcolagui.cpp:801
 msgid "&Manually select the language from the list below:"
 msgstr "&Вручную выбрать язык со списка:"

-#: zrcolagui.cpp:789
+#: zrcolagui.cpp:812
 msgid "Text Language"
 msgstr "Язык текста"

-#: zrcolagui.cpp:794
+#: zrcolagui.cpp:817
 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."
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
 msgstr ""
 "Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
-"После запуска система ZRCola доступна на панели задач либо через нажатие "
-"сочетания клавиш Win+F5 и Win+F6."
+"После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."

-#: zrcolagui.cpp:798
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr "&Автоматически запустить систему ZRCola при запуске компьютера"

-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr "Запуск"

-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 "Администратор программы и сайта: Янош Ежовник (Janoš Ježovnik)\n"
 "Разработка: Amebis, d. o. o., Kamnik\n"
 "Перевод на английский яазык: Янош Ежовник (Janoš Ježovnik)\n"
-"Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo "
-"Torkar), Анастасия Плотникова\n"
-"Разработка in техническая поддержка первоначальной программы (2004–2015): "
-"Петер Вейсс (Peter Weiss)"
+"Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo Torkar), Анастасия Плотникова\n"
+"Разработка in техническая поддержка первоначальной программы (2004–2015): Петер Вейсс (Peter Weiss)"

-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"

-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
-msgstr ""
-"Текст, созданный с помощью системы ZRCola, должен в примечании или другом "
-"соответствующем месте в публикации сопровождаться следующей записью:"
+#: zrcolagui.cpp:919
+msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
+msgstr "Текст, созданный с помощью системы ZRCola, должен в примечании или другом соответствующем месте в публикации сопровождаться следующей записью:"

-#: zrcolagui.cpp:903
-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м."
+#: zrcolagui.cpp:923
+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м."

-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Журнал"

-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 msgid "Quit and &Update..."
 msgstr "Выйти и &обновить ..."

-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr "Выйти из программы и запустить обновление"

-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 msgid "&Close"
 msgstr "&Закрыть"

-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 msgid "Close this window"
 msgstr "Закрыть это окно"

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr "Ввести запрашиваемый &знак:"

-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr "Запрашиваемый разобранный знак"

-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 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."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 msgstr ""
 "Пожалуйста, используйте разобранный формат.\n"
-"Для ввода запрашиваемого знака можно использовать сочетания клавиш системы "
-"ZRCola либо копировать и вставить знаки из окна для разборки."
+"Для ввода запрашиваемого знака можно использовать сочетания клавиш системы ZRCola либо копировать и вставить знаки из окна для разборки."

-#: zrcolagui.cpp:1027
-#, fuzzy
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
-msgstr ""
-"&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем "
-"он нужен:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
+msgstr "&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем он нужен:"

-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr "Дополнительные примечания"

-#: zrcolagui.cpp:1040
-#, fuzzy
+#: zrcolagui.cpp:1060
 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."
+"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 ""
-"После нажатия на кнопку \"OK\" ваша почтовая программа должна открытся для "
-"отправки запроса нового знака администратору системы ZRCola.\n"
-"Возможно, не все знаки будут отображены правильно, но все информации будут "
-"закодированны таким образом, что администратор сможет их правильно прочитать."
+"После нажатия на кнопку «OK» ваша почтовая программа должна открытся для отправки запроса нового знака администратору системы ZRCola.\n"
+"Возможно, не все знаки будут отображены правильно, но все информации будут закодированны таким образом, что администратор сможет их правильно прочитать."
+
+#: zrcolagui.cpp:1102
+msgid "Translation"
+msgstr "Преобразование"
+
+#: zrcolagui.cpp:1104
+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 ""
+"ZRCola предоставляет различные преобразования текста, последовательность которых можно свободно изменять.\n"
+"Пожалуйста, выбрать желаемые преобразования и порядок их применения."
+
+#: zrcolagui.cpp:1114
+msgid "A&vailable:"
+msgstr "&Доступное:"
+
+#: zrcolagui.cpp:1129
+msgid ">"
+msgstr ">"
+
+#: zrcolagui.cpp:1132
+msgid "<"
+msgstr "<"
+
+#: zrcolagui.cpp:1141
+msgid "&Selected:"
+msgstr "&Выбранное:"
+
+#: zrcolagui.cpp:1159
+msgid "Up"
+msgstr "Up"
+
+#: zrcolagui.cpp:1162
+msgid "Down"
+msgstr "Down"
+
+#: zrcolagui.h:250
+msgid "Character Search"
+msgstr "Поиск знака"
+
+#: zrcolagui.h:286
+msgid "Settings"
+msgstr "Настройки"
+
+#: zrcolagui.h:312
+msgid "About ZRCola"
+msgstr "О системе ZRCola"
+
+#: zrcolagui.h:337 zrcolaupdater.cpp:94
+msgid "Product Update"
+msgstr "Обновление продукта"
+
+#: zrcolagui.h:408
+msgid "Custom Translation Sequence"
+msgstr "Настраиваемая последовательность преобразований"

 #: 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:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr "Автоматически запустить систему ZRCola при запуске компьютера"

+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr "Неизвестное преобразование (%u)"
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
@@ -580,151 +621,76 @@ msgstr ""
 "Программа будет закрыта и обновлена.\n"
 "Вы уверены?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr "Обновление продукта"
-
-#: zrcolagui.h:246
-msgid "Character Search"
-msgstr "Поиск знака"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr "Настройки"
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr "О системе ZRCola"
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по запуску системы"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: 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
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 msgid "&Continue"
 msgstr "&Продолжить"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по составлению"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: 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
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по вводу знаков"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: 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
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "Input system for linguistic use"
@@ -733,12 +699,8 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "http://zrcola-2.amebis.si/en/info/instructions/"
 #~ msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"

-#~ msgid ""
-#~ "http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-#~ "Tipkovnica_2009-06-21.pdf"
-#~ msgstr ""
-#~ "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/08/"
-#~ "ZRCola_tipkovnica_20160801.pdf"
+#~ msgid "http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-Tipkovnica_2009-06-21.pdf"
+#~ msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/08/ZRCola_tipkovnica_20160801.pdf"

 # Windows charset for this language (decimal)
 #~ msgid "1252"
@@ -859,15 +821,9 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "Left"
 #~ msgstr "Left"

-#~ msgid "Up"
-#~ msgstr "Up"
-
 #~ msgid "Right"
 #~ msgstr "Right"

-#~ msgid "Down"
-#~ msgstr "Down"
-
 #~ msgid "Num Lock"
 #~ msgstr "Num Lock"

@@ -936,12 +892,8 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "Send Composed (F5)"
 #~ msgstr "Pošlji sestavljeno (F5)"

-#~ msgid ""
-#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
-#~ "functionality will not be available."
-#~ msgstr ""
-#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
-#~ "Nekaj funkcionalnosti ne bo na voljo."
+#~ msgid "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some functionality will not be available."
+#~ msgstr "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."

 #, fuzzy
 #~ msgid "Authentication progress real time monitor"
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -1,18 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:53+0200\n"
-"PO-Revision-Date: 2016-10-13 11:55+0200\n"
+"POT-Creation-Date: 2017-06-01 18:05+0200\n"
+"PO-Revision-Date: 2017-08-01 15:23+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0\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"
+"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"
 "X-Poedit-KeywordsList: _\n"

@@ -21,74 +20,75 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"

-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "ZRCola"
 msgstr "ZRCola"

-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 msgid "Character"
 msgstr "Znak"

-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 msgid "Context"
 msgstr "Kontekst"

-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"

-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr "Preveč števk v zapisu Unicode."
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr "Nesoglasje pri preverjanju"
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr "Napačen znak v zapisu Unicode: %c"
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"

 # Recitation separator
-#: zrcolachrslct.cpp:164
+#: zrcolachrslct.cpp:328
 msgid ", "
 msgstr ", "

-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"

-#: zrcolafrm.cpp:141
-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:90
+msgid "Custom Translation..."
+msgstr "Pretvorba po meri ..."

-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+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:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Opozorilo"

-#: zrcolafrm.cpp:143
-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:177
+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:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"

-#: zrcolafrm.cpp:375
-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:434
+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"

 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -114,7 +114,7 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."

-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"

@@ -122,348 +122,356 @@ msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"

-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"

 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr "Kopi&raj sestavljeno in se vrni"
+
+#: zrcolagui.cpp:98
+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"
+
+#: zrcolagui.cpp:107
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"

-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr "Kopi&raj razstavljeno in se vrni"
+
+#: zrcolagui.cpp:116
+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"
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr "Prekini raz/sestavljanje"

-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr "Na&stavitve ..."

-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"

-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 msgid "&Edit"
 msgstr "Ur&edi"

-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"

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

-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"

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

-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"

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

-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 msgid "&View"
 msgstr "Po&gled"

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr "Navod&ila ..."

-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."

-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."

-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."

-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"

-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
 msgid "&About..."
 msgstr "O progr&amu ..."

-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 msgid "&Help"
 msgstr "Po&moč"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut"
 msgstr "Izreži"

-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut selection"
 msgstr "Izreži izbor"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy"
 msgstr "Kopiraj"

-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy selection"
 msgstr "Kopiraj izbor"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste"
 msgstr "Prilepi"

-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste selection"
 msgstr "Prilepi izbor"

-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 msgid "Edit"
 msgstr "Urejanje"

-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 msgid "Find Character"
 msgstr "Poišči znak"

-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"

-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"

-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr "Sestavljanje"

-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr "Katalog znakov"

-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"

-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"

-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"

-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"

-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"

-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"

-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 msgid "Show &All"
 msgstr "Prik&aži vse"

-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"

-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 msgid "&Browse"
 msgstr "Pre&brskaj"

-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
-msgstr ""
-"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
+msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"

-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr "Možnosti iskanja"

-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"

-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"

-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 msgid "All"
 msgstr "Vse"

-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"

-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 msgid "None"
 msgstr "Nič"

-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"

-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr "Obrni"

-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"

-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"

-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"

-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"

-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 msgid "Preview"
 msgstr "Predogled"

-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"

-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"

-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"

-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 msgid "Character preview"
 msgstr "Predogled znaka"

-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"

-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:647
 msgid "Character tags"
 msgstr "Oznake znaka"

-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"

-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 msgid "« Back"
 msgstr "« Nazaj"

-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"

-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 msgid "Forward »"
 msgstr "Naprej »"

-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"

-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr "&Sorodni"

-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"

-#: zrcolagui.cpp:770
+#: zrcolagui.cpp:794
 msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
+"Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""
-"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo "
-"razstavljati.\n"
+"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."

-#: zrcolagui.cpp:774
+#: zrcolagui.cpp:798
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"

-#: zrcolagui.cpp:777
+#: zrcolagui.cpp:801
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"

-#: zrcolagui.cpp:789
+#: zrcolagui.cpp:812
 msgid "Text Language"
 msgstr "Jezik besedila"

-#: zrcolagui.cpp:794
+#: zrcolagui.cpp:817
 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."
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
 msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
-"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih "
-"bližnjic Win+F5 in Win+F6."
+"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."

-#: zrcolagui.cpp:798
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"

-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr "Zagon"

-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 "Urednik programa in spletne strani: Janoš Ježovnik\n"
@@ -472,102 +480,140 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"

-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"

-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
-msgstr ""
-"Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v "
-"opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
-"zapisom:"
+#: zrcolagui.cpp:919
+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:"

-#: zrcolagui.cpp:903
-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."
+#: zrcolagui.cpp:923
+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."

-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Dnevnik"

-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."

-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"

-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 msgid "&Close"
 msgstr "&Zapri"

-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 msgid "Close this window"
 msgstr "Zapri to okno"

-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"

-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"

 # Please use a double && for final "&" character
-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 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."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 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."
+"Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."

-#: zrcolagui.cpp:1027
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"

-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"

-#: zrcolagui.cpp:1040
+#: zrcolagui.cpp:1060
 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."
+"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 ""
-"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."
+"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."
+
+#: zrcolagui.cpp:1102
+msgid "Translation"
+msgstr "Pretvorba"
+
+#: zrcolagui.cpp:1104
+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 ""
+"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."
+
+#: zrcolagui.cpp:1114
+msgid "A&vailable:"
+msgstr "Na &voljo:"
+
+#: zrcolagui.cpp:1129
+msgid ">"
+msgstr ">"
+
+#: zrcolagui.cpp:1132
+msgid "<"
+msgstr "<"
+
+#: zrcolagui.cpp:1141
+msgid "&Selected:"
+msgstr "I&zbrano:"
+
+#: zrcolagui.cpp:1159
+msgid "Up"
+msgstr "Gor"
+
+#: zrcolagui.cpp:1162
+msgid "Down"
+msgstr "Dol"
+
+#: zrcolagui.h:250
+msgid "Character Search"
+msgstr "Poišči znak"
+
+#: zrcolagui.h:286
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: zrcolagui.h:312
+msgid "About ZRCola"
+msgstr "O ZRColi"
+
+#: zrcolagui.h:337 zrcolaupdater.cpp:94
+msgid "Product Update"
+msgstr "Posodabljanje izdelka"
+
+#: zrcolagui.h:408
+msgid "Custom Translation Sequence"
+msgstr "Zaporedje pretvorb po meri"

 #: 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:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"

+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr "Neznana pretvorba (%u)"
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
@@ -576,150 +622,80 @@ msgstr ""
 "Program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
 "Ali ste prepričani, da želite nadaljevati?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr "Posodabljanje izdelka"
-
-#: zrcolagui.h:246
-msgid "Character Search"
-msgstr "Poišči znak"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr "O ZRColi"
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: 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
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 msgid "&Continue"
 msgstr "&Nadaljuj"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: 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
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"

-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: 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
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: 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
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
+
+#~ msgid "&Active:"
+#~ msgstr "&Aktivni:"
--- a/ZRCola/res/copy_destination_and_return.ico
+++ b/ZRCola/res/copy_destination_and_return.ico
--- a/ZRCola/res/copy_destination_and_return.pdf
+++ b/ZRCola/res/copy_destination_and_return.pdf
--- a/ZRCola/res/copy_source_and_return.ico
+++ b/ZRCola/res/copy_source_and_return.ico
--- a/ZRCola/res/copy_source_and_return.pdf
+++ b/ZRCola/res/copy_source_and_return.pdf
--- a/ZRCola/res/desktop.ini
+++ b/ZRCola/res/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Pictures
--- a/ZRCola/res/send_abort.pdf
+++ b/ZRCola/res/send_abort.pdf
--- a/ZRCola/res/send_composed.pdf
+++ b/ZRCola/res/send_composed.pdf
--- a/ZRCola/res/send_decomposed.pdf
+++ b/ZRCola/res/send_decomposed.pdf
--- a/ZRCola/res/send_destination.ico
+++ b/ZRCola/res/send_destination.ico
--- a/ZRCola/res/send_destination.pdf
+++ b/ZRCola/res/send_destination.pdf
--- a/ZRCola/res/send_decomposed.ico
+++ b/ZRCola/res/send_decomposed.ico
--- a/ZRCola/res/send_source.pdf
+++ b/ZRCola/res/send_source.pdf
--- a/ZRCola/stdafx.cpp
+++ b/ZRCola/stdafx.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

--- a/ZRCola/stdafx.h
+++ b/ZRCola/stdafx.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -29,6 +29,7 @@
 #include "zrcolafrm.h"
 #include "zrcolakeyhndlr.h"
 #include "zrcolasettings.h"
+#include "zrcolatranseq.h"
 #include "zrcolaupdater.h"

 #include <Updater/chkthread.h>
@@ -37,13 +38,15 @@
 #include <wxex/url.h>
 #include <wxex/persist/auimanager.h>

+#include <wx/clipbrd.h>
 #include <wx/ffile.h>
 #include <wx/msgdlg.h>
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
+#include <wx/socket.h>
+#include <wx/tokenzr.h>
 #include <wx/utils.h>
 #include <wx/valtext.h>
-#include <wx/socket.h>

 #include <WinStd/MSI.h>

--- a/ZRCola/zrcolaabout.cpp
+++ b/ZRCola/zrcolaabout.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

--- a/ZRCola/zrcolaabout.h
+++ b/ZRCola/zrcolaabout.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -32,6 +32,7 @@ wxIMPLEMENT_APP(ZRColaApp);

 ZRColaApp::ZRColaApp() :
    m_mainWnd(NULL),
+    m_lang_ui(wxLANGUAGE_DEFAULT),
    wxApp()
 {
 }
@@ -55,7 +56,7 @@ bool ZRColaApp::OnInit()
        return false;

    // Initialize locale.
-    if (wxInitializeLocale(m_locale)) {
+    if (wxInitializeLocale(m_locale, &m_lang_ui)) {
        wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
        wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola")));
        wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));
@@ -101,6 +102,18 @@ bool ZRColaApp::OnInit()
                            wxFAIL_MSG(wxT("Error reading translation data from ZRCola.zrcdb."));
                            m_t_db.clear();
                        }
+                    } else if (id == ZRCola::transet_rec::id) {
+                        dat >> ZRCola::transet_rec(m_ts_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading translation set data from ZRCola.zrcdb."));
+                            m_ts_db.clear();
+                        }
+                    } else if (id == ZRCola::transeq_rec::id) {
+                        dat >> ZRCola::transeq_rec(m_tsq_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading translation sequence data from ZRCola.zrcdb."));
+                            m_tsq_db.clear();
+                        }
                    } else if (id == ZRCola::langchar_rec::id) {
                        dat >> ZRCola::langchar_rec(m_lc_db);
                        if (!dat.good()) {
@@ -158,7 +171,6 @@ bool ZRColaApp::OnInit()
    wxSocketBase::Initialize();

    m_mainWnd = new wxZRColaFrame();
-    wxPersistentRegisterAndRestore<wxZRColaFrame>(m_mainWnd);
    m_mainWnd->Show();

    return true;
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -73,6 +73,8 @@ public:

 public:
    ZRCola::translation_db m_t_db;  ///< Translation database
+    ZRCola::transet_db m_ts_db;     ///< Translation set database
+    ZRCola::transeq_db m_tsq_db;    ///< Translation sequence database
    ZRCola::langchar_db m_lc_db;    ///< Language character database
    ZRCola::language_db m_lang_db;  ///< Language database
    ZRCola::keyseq_db m_ks_db;      ///< Key sequence database
@@ -84,6 +86,7 @@ public:
    wxZRColaFrame *m_mainWnd;       ///< Main window

    wxLocale m_locale;              ///< Current locale
+    wxLanguage m_lang_ui;           ///< Translation language (language of User Interface, wxLANGUAGE_DEFAULT = English)

 protected:
 #ifdef __WXMSW__
--- a/ZRCola/zrcolachrcatpnl.cpp
+++ b/ZRCola/zrcolachrcatpnl.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -25,7 +25,7 @@
 //////////////////////////////////////////////////////////////////////////

 BEGIN_EVENT_TABLE(wxZRColaCharacterCatalogPanel, wxZRColaCharacterCatalogPanelBase)
-    EVT_MENU(wxZRColaCharacterCatalogPanel::wxID_FOCUS_DECOMPOSED, wxZRColaCharacterCatalogPanel::OnFocusDecomposed)
+    EVT_MENU(wxZRColaCharacterCatalogPanel::wxID_FOCUS_SOURCE, wxZRColaCharacterCatalogPanel::OnFocusSource)
 END_EVENT_TABLE()


@@ -42,8 +42,8 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
                    dat >> rec;
                    if (!dat.good()) {
                        wxFAIL_MSG(wxT("Error reading character group data from ZRCola.zrcdb."));
-                        m_cg_db.idxRnk.clear();
-                        m_cg_db.data  .clear();
+                        m_cg_db.idxRank.clear();
+                        m_cg_db.data   .clear();
                    }
                } else
                    wxFAIL_MSG(wxT("ZRCola.zrcdb has no character group data."));
@@ -52,16 +52,16 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
            wxFAIL_MSG(wxT("ZRCola.zrcdb is not a valid ZRCola database."));
    }

-    if (!m_cg_db.idxRnk.empty()) {
+    if (!m_cg_db.idxRank.empty()) {
        // Populate character group list.
-        for (size_t i = 0, n = m_cg_db.idxRnk.size(); i < n; i++) {
-            const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[i];
+        for (size_t i = 0, n = m_cg_db.idxRank.size(); i < n; i++) {
+            const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[i];
            wxString
-                label(cg.data, cg.name_len),
+                label(cg.name(), cg.name_len()),
                label_tran2(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
            m_choice->Insert(label_tran2, i);
        }
-        m_cg_id = m_cg_db.idxRnk[0].id;
+        m_cg_id = m_cg_db.idxRank[0].grp;
        m_choice->Select(0);

        Update();
@@ -70,7 +70,7 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
    // Register frame specific hotkey(s).
    {
        wxAcceleratorEntry entries[1];
-        entries[0].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_FOCUS_DECOMPOSED);
+        entries[0].Set(wxACCEL_NORMAL, WXK_ESCAPE, wxID_FOCUS_SOURCE);
        SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
    }
 }
@@ -83,10 +83,10 @@ wxZRColaCharacterCatalogPanel::~wxZRColaCharacterCatalogPanel()

 void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
 {
-    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[event.GetSelection()];

-    if (m_cg_id != cg.id) {
-        m_cg_id = cg.id;
+    if (m_cg_id != cg.grp) {
+        m_cg_id = cg.grp;
        Update();
    }

@@ -98,8 +98,8 @@ void wxZRColaCharacterCatalogPanel::OnGridClick(wxGridEvent& event)
 {
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
    if (app->m_mainWnd) {
-        app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(event.GetRow(), event.GetCol()));
-        app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+        app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(event.GetRow(), event.GetCol()));
+        app->m_mainWnd->m_panel->m_source->SetFocus();
    }

    event.Skip();
@@ -113,8 +113,8 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
    case WXK_NUMPAD_ENTER:
        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
        if (app->m_mainWnd) {
-            app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(m_grid->GetCursorRow(), m_grid->GetCursorColumn()));
-            app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+            app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(m_grid->GetCursorRow(), m_grid->GetCursorColumn()));
+            app->m_mainWnd->m_panel->m_source->SetFocus();

            event.StopPropagation();
            return;
@@ -135,11 +135,11 @@ void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
 }


-void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
+void wxZRColaCharacterCatalogPanel::OnFocusSource(wxCommandEvent& event)
 {
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
    if (app->m_mainWnd) {
-        app->m_mainWnd->m_panel->m_decomposed->SetFocus();
+        app->m_mainWnd->m_panel->m_source->SetFocus();

        event.StopPropagation();
        return;
@@ -151,21 +151,23 @@ void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)

 void wxZRColaCharacterCatalogPanel::Update()
 {
-    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[m_choice->GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRank[m_choice->GetSelection()];

    if (m_show_all->GetValue()) {
        m_grid->SetCharacters(
-            wxString(cg.get_chars(), cg.char_len),
-            wxArrayShort((const short*)cg.get_char_shown(), (const short*)cg.get_char_shown() + (cg.char_len + 15)/16));
+            wxString(cg.chrlst(), cg.chrlst_end()),
+            wxArrayShort(reinterpret_cast<const short*>(cg.chrshow()), reinterpret_cast<const short*>(cg.chrshow_end())));
    } else {
        // Select frequently used characters only.
-        const wchar_t *src = cg.get_chars();
-        const unsigned __int16 *shown = cg.get_char_shown();
-        wxString chars;
-        for (unsigned __int16 i = 0, j = 0; i < cg.char_len; j++) {
-            for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < cg.char_len; k++, mask >>= 1, i++) {
+        const wchar_t *src = cg.chrlst();
+        const unsigned __int16 *shown = cg.chrshow();
+        wxArrayString chars;
+        for (size_t i = 0, i_end = cg.chrlst_len(), j = 0; i < i_end; j++) {
+            for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < i_end; k++, mask >>= 1) {
+                size_t len = wcsnlen(src + i, i_end - i);
                if (mask & 1)
-                    chars += src[i];
+                    chars.Add(wxString(src + i, len));
+                i += len + 1;
            }
        }
        m_grid->SetCharacters(chars);
@@ -208,11 +210,11 @@ bool wxPersistentZRColaCharacterCatalogPanel::Restore()
    // Restore selected character group.
    int cg_id;
    if (RestoreValue(wxT("charGroup"), &cg_id)) {
-        for (size_t i = 0, n = wnd->m_cg_db.idxRnk.size(); i < n; i++) {
-            const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRnk[i];
-            if (cg.id == cg_id) {
-                if (wnd->m_cg_id != cg.id) {
-                    wnd->m_cg_id = cg.id;
+        for (size_t i = 0, n = wnd->m_cg_db.idxRank.size(); i < n; i++) {
+            const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRank[i];
+            if (cg.grp == cg_id) {
+                if (wnd->m_cg_id != cg.grp) {
+                    wnd->m_cg_id = cg.grp;
                    wnd->m_choice->Select(i);
                    update = true;
                }
--- a/ZRCola/zrcolachrcatpnl.h
+++ b/ZRCola/zrcolachrcatpnl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -38,7 +38,7 @@ class wxZRColaCharacterCatalogPanel : public wxZRColaCharacterCatalogPanelBase
 public:
    enum
    {
-        wxID_FOCUS_DECOMPOSED = 6000,
+        wxID_FOCUS_SOURCE = 6000,
    };

    wxZRColaCharacterCatalogPanel(wxWindow* parent);
@@ -51,7 +51,7 @@ protected:
    virtual void OnGridClick(wxGridEvent& event);
    virtual void OnGridKeyDown(wxKeyEvent& event);
    virtual void OnShowAll(wxCommandEvent& event);
-    void OnFocusDecomposed(wxCommandEvent& event);
+    void OnFocusSource(wxCommandEvent& event);
    DECLARE_EVENT_TABLE()

    void Update();
--- a/ZRCola/zrcolachrgrid.cpp
+++ b/ZRCola/zrcolachrgrid.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -68,6 +68,24 @@ void wxZRColaCharGrid::Init()


 void wxZRColaCharGrid::SetCharacters(const wxString &chars)
+{
+    m_chars.Clear();
+    const wxCStrData chr = chars.GetData();
+    for (size_t i = 0, i_end = chars.Length(), i_next; i < i_end; i = i_next + 1) {
+        i_next = i + _tcsnlen(chr + i, i_end - i);
+        m_chars.Add(wxString(chr + i, chr + i_next));
+    };
+    m_relevance.Clear();
+    m_regenerate = true;
+
+    // Invoke OnSize(), which will populate the grid.
+    wxSizeEvent e(GetSize(), m_windowId);
+    e.SetEventObject(this);
+    HandleWindowEvent(e);
+}
+
+
+void wxZRColaCharGrid::SetCharacters(const wxArrayString &chars)
 {
    m_chars = chars;
    m_relevance.Clear();
@@ -82,7 +100,12 @@ void wxZRColaCharGrid::SetCharacters(const wxString &chars)

 void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &relevance)
 {
-    m_chars      = chars;
+    m_chars.Clear();
+    const wxCStrData chr = chars.GetData();
+    for (size_t i = 0, i_end = chars.Length(), i_next; i < i_end; i = i_next + 1) {
+        i_next = i + _tcsnlen(chr + i, i_end - i);
+        m_chars.Add(wxString(chr + i, chr + i_next));
+    };
    m_relevance  = relevance;
    m_regenerate = true;

@@ -95,22 +118,23 @@ void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &

 wxString wxZRColaCharGrid::GetToolTipText(int idx)
 {
-    wxASSERT_MSG(idx < (int)m_chars.Length(), wxT("index out of bounds"));
+    wxASSERT_MSG(idx < (int)m_chars.GetCount(), wxT("index out of bounds"));

    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    const auto &chr = m_chars[idx];

    // See if this character has a key sequence registered.
-    char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
-    ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_chars[idx];
+    std::unique_ptr<ZRCola::keyseq_db::keyseq> ks((ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(wchar_t)*chr.length()]);
+    ks->ZRCola::keyseq_db::keyseq::keyseq(NULL, 0, chr.data(), chr.length());
    ZRCola::keyseq_db::indexKey::size_type start;
-    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
+    if (app->m_ks_db.idxChr.find(*ks, start)) {
        ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
        wxString ks_str;
-        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
-            return wxString::Format(wxT("U+%04X (%s)"), (int)m_chars[idx], ks_str.c_str());
+        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq(), seq.seq_len(), ks_str))
+            return wxString::Format(wxT("U+%s (%s)"), ZRCola::GetUnicodeDump(chr.data(), chr.length(), _T("+")).c_str(), ks_str.c_str());
    }

-    return wxString::Format(wxT("U+%04X"), (int)m_chars[idx]);
+    return wxString::Format(wxT("U+%s"), ZRCola::GetUnicodeDump(chr.data(), chr.length(), _T("+")).c_str());
 }


@@ -126,17 +150,17 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
    // Calculate initial estimate of columns and rows.
    wxSize size(event.GetSize());
    size_t
-        char_len = m_chars.Length();
+        char_count = m_chars.GetCount();
    int
-        width    = size.GetWidth() - m_rowLabelWidth - m_extraWidth,
-        cols     = std::max<int>(width / wxZRColaCharacterGridColumnWidth, 1),
-        rows     = std::max<int>((char_len + cols - 1) / cols, 1);
+        width      = size.GetWidth() - m_rowLabelWidth - m_extraWidth,
+        cols       = std::max<int>(width / wxZRColaCharacterGridColumnWidth, 1),
+        rows       = std::max<int>((char_count + cols - 1) / cols, 1);

    if (m_colLabelHeight + rows*wxZRColaCharacterGridRowHeight + m_extraHeight > size.GetHeight()) {
        // Vertical scrollbar will be shown. Adjust the width and recalculate layout to avoid horizontal scrollbar.
        width = std::max<int>(width - wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, this), 0);
        cols  = std::max<int>(width / wxZRColaCharacterGridColumnWidth, 1);
-        rows  = std::max<int>((char_len + cols - 1) / cols, 1);
+        rows  = std::max<int>((char_count + cols - 1) / cols, 1);
    }

    BeginBatch();
@@ -146,14 +170,14 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
        wxGridStringTable *table = new wxGridStringTable(rows, cols);
        for (int r = 0, i = 0; r < rows; r++)
            for (int c = 0; c < cols; c++, i++)
-                table->SetValue(r, c, i < (int)char_len ? wxString(1, m_chars[i]) : wxEmptyString);
+                table->SetValue(r, c, i < (int)char_count ? m_chars[i] : wxEmptyString);
        SetTable(table, true);
        if (!m_relevance.IsEmpty()) {
            const wxColour colour_def;
            const wxColour colour_irr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT);
            for (int r = 0, i = 0; r < rows; r++)
                for (int c = 0; c < cols; c++, i++)
-                    SetCellBackgroundColour(r, c, i >= (int)char_len || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
+                    SetCellBackgroundColour(r, c, i >= (int)char_count || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
        } else {
            for (int r = 0, i = 0; r < rows; r++)
                for (int c = 0; c < cols; c++, i++)
@@ -217,7 +241,7 @@ void wxZRColaCharGrid::OnMotion(wxMouseEvent& event)
        return;

    size_t toolTipIdx = row*m_numCols + col;
-    if (toolTipIdx >= m_chars.Length()) {
+    if (toolTipIdx >= m_chars.GetCount()) {
        // Index out of range.
        m_toolTipIdx = (size_t)-1;
        m_timerToolTip.Stop();
@@ -241,7 +265,7 @@ void wxZRColaCharGrid::OnTooltipTimer(wxTimerEvent& event)
 {
    event.Skip();

-    if (m_toolTipIdx >= m_chars.Length())
+    if (m_toolTipIdx >= m_chars.GetCount())
        return;

    GetGridWindow()->SetToolTip(GetToolTipText(m_toolTipIdx));
--- a/ZRCola/zrcolachrgrid.h
+++ b/ZRCola/zrcolachrgrid.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -54,14 +54,21 @@ public:
    ///
    /// Sets new array of characters to display
    ///
-    /// \param[in] chars  The string containing characters to display
+    /// \param[in] chars  The string containing characters to display (zero delimited)
    ///
    void SetCharacters(const wxString &chars);

    ///
    /// Sets new array of characters to display
    ///
-    /// \param[in] chars      The string containing characters to display
+    /// \param[in] chars  The array of characters to display
+    ///
+    void SetCharacters(const wxArrayString &chars);
+
+    ///
+    /// Sets new array of characters to display
+    ///
+    /// \param[in] chars      The string containing characters to display (zero delimited)
    /// \param[in] relevance  Bit-array of \p chars relevance (1=more relevant, 0=less relevant)
    ///
    void SetCharacters(const wxString &chars, const wxArrayShort &relevance);
@@ -71,7 +78,7 @@ public:
    ///
    /// \returns  The string containing displayed characters
    ///
-    inline wxString GetCharacters() const
+    inline const wxArrayString& GetCharacters() const
    {
        return m_chars;
    }
@@ -83,10 +90,14 @@ public:
    ///
    /// \returns Grid coordinates of selected character or (-1, -1) if character not found.
    ///
-    inline wxGridCellCoords GetCharacterCoords(wchar_t c) const
+    inline wxGridCellCoords GetCharacterCoords(const wxString &c) const
    {
-        int i = m_chars.Find(c);
-        return i != wxNOT_FOUND ? wxGridCellCoords(i / m_numCols, i % m_numCols) : wxGridCellCoords(-1, -1);
+        for (size_t i = 0, n = m_chars.GetCount(); ; i++) {
+            if (i >= n)
+                return wxGridCellCoords(-1, -1);
+            else if (m_chars[i] == c)
+                return wxGridCellCoords(i / m_numCols, i % m_numCols);
+        }
    }

 protected:
@@ -102,7 +113,7 @@ private:
    void Init();                // common part of all ctors

 protected:
-    wxString m_chars;           ///< Array of Unicode characters to display in the grid
+    wxArrayString m_chars;      ///< Array of Unicode characters to display in the grid
    wxArrayShort m_relevance;   ///< Bit-array of `m_chars` relevance

 private:
--- a/ZRCola/zrcolachrreq.cpp
+++ b/ZRCola/zrcolachrreq.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

--- a/ZRCola/zrcolachrreq.h
+++ b/ZRCola/zrcolachrreq.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -20,6 +20,174 @@
 #include "stdafx.h"


+//////////////////////////////////////////////////////////////////////
+// wxZRColaUTF16CharValidator
+//////////////////////////////////////////////////////////////////////
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxZRColaUTF16CharValidator, wxValidator);
+
+
+wxZRColaUTF16CharValidator::wxZRColaUTF16CharValidator(wchar_t *val) :
+    m_val(val),
+    wxValidator()
+{
+}
+
+
+wxObject* wxZRColaUTF16CharValidator::Clone() const
+{
+    return new wxZRColaUTF16CharValidator(*this);
+}
+
+
+bool wxZRColaUTF16CharValidator::Validate(wxWindow *parent)
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+    if (!ctrl->IsEnabled()) return true;
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, parent);
+}
+
+
+bool wxZRColaUTF16CharValidator::TransferToWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+
+    if (m_val)
+        ((wxTextCtrl*)GetWindow())->SetValue(wxString::Format(wxT("%04X"), *m_val));
+
+    return true;
+}
+
+
+bool wxZRColaUTF16CharValidator::TransferFromWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, NULL, m_val);
+}
+
+
+bool wxZRColaUTF16CharValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wchar_t *val_out)
+{
+    const wxStringCharType *buf = val_in;
+
+    wchar_t chr = 0;
+    for (size_t i = i_start;;) {
+        if (i >= i_end) {
+            // End of Unicode found.
+            if (val_out) *val_out = chr;
+            return true;
+        } else if (i >= i_start + 4) {
+            // Maximum characters exceeded.
+            ctrl->SetFocus();
+            ctrl->SetSelection(i, i_end);
+            wxMessageBox(_("Too many digits in Unicode."), _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
+            return false;
+        } else if (_T('0') <= buf[i] && buf[i] <= _T('9')) {
+            // Digit found.
+            chr = (chr << 4) | (buf[i] - _T('0'));
+            i++;
+        } else if (_T('A') <= buf[i] && buf[i] <= _T('F')) {
+            // Capital letter found.
+            chr = (chr << 4) | (buf[i] - _T('A') + 10);
+            i++;
+        } else if (_T('a') <= buf[i] && buf[i] <= _T('f')) {
+            // Lower letter found.
+            chr = (chr << 4) | (buf[i] - _T('a') + 10);
+            i++;
+        } else {
+            // Invalid character found.
+            ctrl->SetFocus();
+            ctrl->SetSelection(i, i + 1);
+            wxMessageBox(wxString::Format(_("Invalid character in Unicode found: %c"), buf[i]), _("Validation conflict"), wxOK | wxICON_EXCLAMATION, parent);
+            return false;
+        }
+    }
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// wxZRColaUnicodeDumpValidator
+//////////////////////////////////////////////////////////////////////
+
+wxIMPLEMENT_DYNAMIC_CLASS(wxZRColaUnicodeDumpValidator, wxValidator);
+
+
+wxZRColaUnicodeDumpValidator::wxZRColaUnicodeDumpValidator(wxString *val) :
+    m_val(val),
+    wxValidator()
+{
+}
+
+
+wxObject* wxZRColaUnicodeDumpValidator::Clone() const
+{
+    return new wxZRColaUnicodeDumpValidator(*this);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::Validate(wxWindow *parent)
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+    if (!ctrl->IsEnabled()) return true;
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, parent);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::TransferToWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+
+    if (m_val)
+        ((wxTextCtrl*)GetWindow())->SetValue(ZRCola::GetUnicodeDumpW(m_val->c_str(), m_val->length(), L"+"));
+
+    return true;
+}
+
+
+bool wxZRColaUnicodeDumpValidator::TransferFromWindow()
+{
+    wxASSERT(GetWindow()->IsKindOf(CLASSINFO(wxTextCtrl)));
+    wxTextCtrl *ctrl = (wxTextCtrl*)GetWindow();
+
+    wxString val(ctrl->GetValue());
+    return Parse(val, 0, val.Length(), ctrl, NULL, m_val);
+}
+
+
+bool wxZRColaUnicodeDumpValidator::Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wxString *val_out)
+{
+    const wxStringCharType *buf = val_in;
+
+    wxString str;
+    for (size_t i = i_start;;) {
+        const wxStringCharType *buf_next;
+        wchar_t chr;
+        if ((buf_next = wmemchr(buf + i, L'+', i_end - i)) != NULL) {
+            // Unicode dump separator found.
+            if (!wxZRColaUTF16CharValidator::Parse(val_in, i, buf_next - buf, ctrl, parent, &chr))
+                return false;
+            str += chr;
+            i = buf_next - buf + 1;
+        } else if (wxZRColaUTF16CharValidator::Parse(val_in, i, i_end, ctrl, parent, &chr)) {
+            // The rest of the FQDN parsed succesfully.
+            if (chr) str += chr;
+            if (val_out) *val_out = str;
+            return true;
+        } else
+            return false;
+    }
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 // wxZRColaCharSelect
 //////////////////////////////////////////////////////////////////////////
@@ -30,13 +198,13 @@ wxDEFINE_EVENT(wxEVT_SEARCH_COMPLETE, wxThreadEvent);
 wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
    m_searchChanged(false),
    m_unicodeChanged(false),
-    m_char(0),
    m_searchThread(NULL),
    wxZRColaCharSelectBase(parent)
 {
    // Set tag lookup locale.
-    auto language = static_cast<wxLanguage>(dynamic_cast<ZRColaApp*>(wxTheApp)->m_locale.GetLanguage());
-         if (wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
+    wxLanguage language = dynamic_cast<ZRColaApp*>(wxTheApp)->m_lang_ui;
+         if (wxLANGUAGE_DEFAULT   == language ||
+             wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
    else if (wxLANGUAGE_RUSSIAN   <= language && language <= wxLANGUAGE_RUSSIAN_UKRAINE ) m_locale = MAKELCID(MAKELANGID(LANG_RUSSIAN  , SUBLANG_DEFAULT), SORT_DEFAULT);
    else if (wxLANGUAGE_SLOVENIAN == language                                           ) m_locale = MAKELCID(MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), SORT_DEFAULT);
    else                                                                                  m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
@@ -45,15 +213,15 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :

    m_search_more->SetLabel(_(L"▸ Search Options"));

-    m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));
+    m_unicode->SetValidator(wxZRColaUnicodeDumpValidator(&m_char));

    // Fill categories.
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
-        int idx = m_categories->Insert(wxGetTranslation(wxString(cc.name, cc.name_len), wxT("ZRCola-zrcdb")), i);
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) {
+        const auto &cc = app->m_cc_db.idxRank[i];
+        int idx = m_categories->Insert(wxGetTranslation(wxString(cc.name(), cc.name_len()), wxT("ZRCola-zrcdb")), i);
        m_categories->Check(idx);
-        m_ccOrder.insert(std::make_pair(cc.id, idx));
+        m_ccOrder.insert(std::make_pair(cc.cat, idx));
    }

    ResetResults();
@@ -83,24 +251,24 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
        if (m_unicode->GetValidator()->TransferFromWindow()) {
            auto app = dynamic_cast<ZRColaApp*>(wxTheApp);

-            m_gridPreview->SetCellValue(wxString(1, m_char), 0, 0);
+            m_gridPreview->SetCellValue(m_char, 0, 0);

-            char chr[sizeof(ZRCola::character_db::character)] = {};
-            ((ZRCola::character_db::character*)chr)->chr = m_char;
+            std::unique_ptr<ZRCola::character_db::character> chr((ZRCola::character_db::character*)new char[sizeof(ZRCola::character_db::character) + sizeof(wchar_t)*m_char.length()]);
+            chr->ZRCola::character_db::character::character(m_char.data(), m_char.length());
            size_t start;
-            if (app->m_chr_db.idxChr.find(*(ZRCola::character_db::character*)chr, start)) {
+            if (app->m_chr_db.idxChr.find(*chr, start)) {
                const auto &chr = app->m_chr_db.idxChr[start];
                // Update character description.
-                m_description->SetValue(wxString(chr.data, chr.desc_len));
+                m_description->SetValue(wxString(chr.desc(), chr.desc_len()));
                {
                    // See if this character has a key sequence registered.
-                    char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
-                    ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_char;
+                    std::unique_ptr<ZRCola::keyseq_db::keyseq> ks((ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(wchar_t)*m_char.length()]);
+                    ks->ZRCola::keyseq_db::keyseq::keyseq(NULL, 0, m_char.data(), m_char.length());
                    ZRCola::keyseq_db::indexKey::size_type start;
-                    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
+                    if (app->m_ks_db.idxChr.find(*ks, start)) {
                        ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
                        wxString ks_str;
-                        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
+                        if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq(), seq.seq_len(), ks_str))
                            m_shortcut->SetValue(ks_str);
                        else
                            m_shortcut->SetValue(wxEmptyString);
@@ -108,18 +276,16 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                        m_shortcut->SetValue(wxEmptyString);
                }
                {
-                    char cc[sizeof(ZRCola::chrcat_db::chrcat)] = {};
-                    ((ZRCola::chrcat_db::chrcat*)cc)->id = chr.cat;
                    size_t start;
                    // Update character category.
-                    if (app->m_cc_db.idxChrCat.find(*((ZRCola::chrcat_db::chrcat*)cc), start)) {
+                    if (app->m_cc_db.idxChrCat.find(ZRCola::chrcat_db::chrcat(chr.cat), start)) {
                        const auto &cat = app->m_cc_db.idxChrCat[start];
-                        m_category->SetValue(wxGetTranslation(wxString(cat.name, cat.name_len), wxT("ZRCola-zrcdb")));
+                        m_category->SetValue(wxGetTranslation(wxString(cat.name(), cat.name_len()), wxT("ZRCola-zrcdb")));
                    } else
                        m_category->SetValue(wxEmptyString);
                }
                // Update related characters.
-                m_gridRelated->SetCharacters(wxString(chr.data + chr.desc_len, chr.rel_len));
+                m_gridRelated->SetCharacters(wxString(chr.rel(), chr.rel_end()));
            } else {
                m_description->SetValue(wxEmptyString);
                m_shortcut->SetValue(wxEmptyString);
@@ -129,18 +295,16 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)

            // Find character tags.
            std::list<std::wstring> tag_names;
-            ZRCola::chrtag_db::chrtag ct = { m_char };
+            std::unique_ptr<ZRCola::chrtag_db::chrtag> ct((ZRCola::chrtag_db::chrtag*)new char[sizeof(ZRCola::chrtag_db::chrtag) + sizeof(wchar_t)*m_char.length()]);
+            ct->ZRCola::chrtag_db::chrtag::chrtag(m_char.data(), m_char.length());
            size_t end;
-            if (app->m_ct_db.idxChr.find(ct, start, end)) {
+            if (app->m_ct_db.idxChr.find(*ct, start, end)) {
                for (size_t i = start; i < end; i++) {
                    const ZRCola::chrtag_db::chrtag &ct = app->m_ct_db.idxChr[i];

                    // Find tag names.
-                    char tn[sizeof(ZRCola::tagname_db::tagname)] = {};
-                    ((ZRCola::tagname_db::tagname*)tn)->locale = m_locale;
-                    ((ZRCola::tagname_db::tagname*)tn)->tag    = ct.tag;
                    size_t start, end;
-                    if (app->m_tn_db.idxTag.find(*((ZRCola::tagname_db::tagname*)tn), start, end)) {
+                    if (app->m_tn_db.idxTag.find(ZRCola::tagname_db::tagname(ct.tag, m_locale), start, end)) {
                        for (size_t i = start; i < end; i++) {
                            const ZRCola::tagname_db::tagname &tn = app->m_tn_db.idxTag[i];

@@ -148,9 +312,9 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                            for (auto name = tag_names.cbegin(), name_end = tag_names.cend();; ++name) {
                                if (name == name_end) {
                                    // Add name to the list.
-                                    tag_names.push_back(std::wstring(tn.name, tn.name + tn.name_len));
+                                    tag_names.push_back(std::wstring(tn.name(), tn.name_end()));
                                    break;
-                                } else if (ZRCola::tagname_db::tagname::CompareName(m_locale, name->data(), (unsigned __int16)name->length(), tn.name, tn.name_len) == 0)
+                                } else if (ZRCola::tagname_db::tagname::CompareName(m_locale, name->data(), (unsigned __int16)name->length(), tn.name(), tn.name_len()) == 0)
                                    // Name is already on the list.
                                    break;
                            }
@@ -190,10 +354,10 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
            m_searchThread->m_search.assign(val.c_str(), val.Length());

            // Select categories.
-            for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-                const auto &cc = app->m_cc_db.idxRnk[i];
+            for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) {
+                const auto &cc = app->m_cc_db.idxRank[i];
                if (m_categories->IsChecked(i))
-                    m_searchThread->m_cats.insert(cc.id);
+                    m_searchThread->m_cats.insert(cc.cat);
            }

            if (m_searchThread->Run() != wxTHREAD_NO_ERROR) {
@@ -238,7 +402,7 @@ void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event)
    event.StopPropagation();

    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++)
        m_categories->Check(i, true);

    m_searchChanged = true;
@@ -250,7 +414,7 @@ void wxZRColaCharSelect::OnCategoriesNone(wxHyperlinkEvent& event)
    event.StopPropagation();

    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++)
        m_categories->Check(i, false);

    m_searchChanged = true;
@@ -262,7 +426,7 @@ void wxZRColaCharSelect::OnCategoriesInvert(wxHyperlinkEvent& event)
    event.StopPropagation();

    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++)
        m_categories->Check(i, !m_categories->IsChecked(i));

    m_searchChanged = true;
@@ -283,10 +447,10 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)

    if (m_searchThread) {
        // Display results.
-        wxString chars;
+        wxArrayString chars;
        chars.reserve(m_searchThread->m_hits.size());
        for (auto i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
-            chars += i->second;
+            chars.Add(i->second);
        m_gridResults->SetCharacters(chars);

        m_searchThread->Delete();
@@ -303,7 +467,7 @@ void wxZRColaCharSelect::OnResultSelectCell(wxGridEvent& event)

    wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
    if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }


@@ -313,7 +477,7 @@ void wxZRColaCharSelect::OnResultCellDClick(wxGridEvent& event)

    wxString val(m_gridResults->GetCellValue(event.GetRow(), event.GetCol()));
    if (!val.IsEmpty()) {
-        NavigateTo(val[0]);
+        NavigateTo(val);
        wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
    }
@@ -327,7 +491,7 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
    case WXK_NUMPAD_ENTER:
        wxString val(m_gridResults->GetCellValue(m_gridResults->GetCursorRow(), m_gridResults->GetCursorColumn()));
        if (!val.IsEmpty()) {
-            NavigateTo(val[0]);
+            NavigateTo(val);
            wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);

@@ -346,7 +510,7 @@ void wxZRColaCharSelect::OnRecentSelectCell(wxGridEvent& event)

    wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
    if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }


@@ -356,7 +520,7 @@ void wxZRColaCharSelect::OnRecentCellDClick(wxGridEvent& event)

    wxString val(m_gridRecent->GetCellValue(event.GetRow(), event.GetCol()));
    if (!val.IsEmpty()) {
-        NavigateTo(val[0]);
+        NavigateTo(val);
        wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
        m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);
    }
@@ -370,7 +534,7 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
    case WXK_NUMPAD_ENTER:
        wxString val(m_gridRecent->GetCellValue(m_gridRecent->GetCursorRow(), m_gridRecent->GetCursorColumn()));
        if (!val.IsEmpty()) {
-            NavigateTo(val[0]);
+            NavigateTo(val);
            wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
            m_sdbSizerButtonsOK->GetEventHandler()->ProcessEvent(e);

@@ -430,7 +594,7 @@ void wxZRColaCharSelect::OnRelatedSelectCell(wxGridEvent& event)

    wxString val(m_gridRelated->GetCellValue(event.GetRow(), event.GetCol()));
    if (!val.IsEmpty())
-        NavigateTo(val[0]);
+        NavigateTo(val);
 }


@@ -438,15 +602,15 @@ void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
 {
    event.Skip();

-    wxString
-        recent(m_gridRecent->GetCharacters()),
-        val(1, m_char);
-    for (size_t i = 0, n = recent.Length(); i < n; i++) {
-        const wxStringCharType c = recent[i];
+    const wxArrayString &recent = m_gridRecent->GetCharacters();
+    wxArrayString val;
+    val.reserve(recent.GetCount() + 1);
+    val.Add(m_char);
+    for (size_t i = 0, n = recent.GetCount(); i < n; i++) {
+        const wxString &c = recent[i];
        if (c != m_char)
-            val += c;
+            val.Add(c);
    }
-
    m_gridRecent->SetCharacters(val);
 }

@@ -456,13 +620,13 @@ void wxZRColaCharSelect::ResetResults()
    // Fill the results.
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
    size_t i, n = app->m_chr_db.idxChr.size();
-    wxString val;
+    wxArrayString val;
    val.reserve(n);
    for (i = 0; i < n; i++) {
        const auto &chr = app->m_chr_db.idxChr[i];
        auto idx = m_ccOrder.find(chr.cat);
        if (idx == m_ccOrder.end() || m_categories->IsChecked(idx->second))
-            val += chr.chr;
+            val.Add(wxString(chr.chr(), chr.chr_len()));
    }
    m_gridResults->SetCharacters(val);
 }
@@ -506,7 +670,7 @@ void wxZRColaCharSelect::NavigateBy(int offset)
 }


-void wxZRColaCharSelect::NavigateTo(wchar_t c)
+void wxZRColaCharSelect::NavigateTo(const wxString &c)
 {
    if (m_char != c) {
        // Update history state
@@ -547,7 +711,7 @@ wxZRColaCharSelect::SearchThread::SearchThread(wxZRColaCharSelect *parent) :
 wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
 {
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    std::map<wchar_t, ZRCola::charrank_t> hits;
+    std::map<std::wstring, ZRCola::charrank_t> hits;

    if (TestDestroy()) return (wxThread::ExitCode)1;

@@ -560,7 +724,7 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()

    {
        // Search by description and merge results.
-        std::map<wchar_t, ZRCola::charrank_t> hits_sub;
+        std::map<std::wstring, ZRCola::charrank_t> hits_sub;
        if (!app->m_chr_db.Search(m_search.c_str(), m_cats, hits, hits_sub, TestDestroyS, this)) return (wxThread::ExitCode)1;
        for (auto i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
            if (TestDestroy()) return (wxThread::ExitCode)1;
@@ -588,7 +752,7 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
        if (i->second > rank_threshold)
            m_hits.push_back(std::make_pair(i->second, i->first));
    }
-    std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<ZRCola::charrank_t, wchar_t>), CompareHits);
+    std::qsort(m_hits.data(), m_hits.size(), sizeof(std::pair<ZRCola::charrank_t, std::wstring>), CompareHits);

    // Signal the event handler that this thread is going to be destroyed.
    // NOTE: here we assume that using the m_parent pointer is safe,
@@ -636,12 +800,25 @@ void wxPersistentZRColaCharSelect::Save() const
    auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);

-    SaveValue(wxT("recentChars"), wnd->m_gridRecent->GetCharacters());
+    wxString str, str2;
+    auto &recent = wnd->m_gridRecent->GetCharacters();
+    for (size_t i = 0, n = recent.GetCount(); i < n; i++) {
+        if (i) str2 += wxT('|');
+        auto &chr = recent[i];
+        for (size_t j = 0, m = chr.Length(); j < m; j++) {
+            if (j) str2 += wxT('+');
+            str2 += wxString::Format(wxT("%04X"), chr[j]);
+        }
+        if (chr.Length() == 1)
+            str += chr[0];
+    }
+    SaveValue(wxT("recentChars" ), str ); // Save in legacy format for backward compatibility.
+    SaveValue(wxT("recentChars2"), str2); // Save in native format

-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) {
+        const auto &cc = app->m_cc_db.idxRank[i];
        wxString name(wxT("category"));
-        name.Append(cc.id.data, _countof(cc.id.data));
+        name.Append(cc.cat.data, _countof(cc.cat.data));
        SaveValue(name, wnd->m_categories->IsChecked(i));
    }

@@ -654,14 +831,29 @@ bool wxPersistentZRColaCharSelect::Restore()
    auto wnd = dynamic_cast<wxZRColaCharSelect*>(GetWindow());
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);

-    wxString recent;
-    if (RestoreValue(wxT("recentChars"), &recent))
-        wnd->m_gridRecent->SetCharacters(recent);
+    wxString str;
+    if (RestoreValue(wxT("recentChars2"), &str)) {
+        // Native format found.
+        wxArrayString val;
+        for (wxStringTokenizer tok(str, wxT("|")); tok.HasMoreTokens(); ) {
+            wxString chr;
+            for (wxStringTokenizer tok_chr(tok.GetNextToken(), wxT("+")); tok_chr.HasMoreTokens(); )
+                chr += (wchar_t)_tcstoul(tok_chr.GetNextToken().c_str(), NULL, 16);
+            val.Add(chr);
+        }
+        wnd->m_gridRecent->SetCharacters(val);
+    } else if (RestoreValue(wxT("recentChars"), &str)) {
+        // Legacy value found.
+        wxArrayString val;
+        for (size_t i = 0, n = str.Length(); i < n; i++)
+            val.Add(wxString(1, str[i]));
+        wnd->m_gridRecent->SetCharacters(val);
+    }

-    for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const auto &cc = app->m_cc_db.idxRnk[i];
+    for (size_t i = 0, n = app->m_cc_db.idxRank.size(); i < n; i++) {
+        const auto &cc = app->m_cc_db.idxRank[i];
        wxString name(wxT("category"));
-        name.Append(cc.id.data, _countof(cc.id.data));
+        name.Append(cc.cat.data, _countof(cc.cat.data));
        bool val;
        if (RestoreValue(name, &val))
            wnd->m_categories->Check(i, val);
--- a/ZRCola/zrcolachrslct.h
+++ b/ZRCola/zrcolachrslct.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -28,15 +28,106 @@ class wxPersistentZRColaCharSelect;

 #include "zrcolagui.h"
 #include <zrcola/character.h>
-#include <wxex/valhex.h>
+#include <wx/validate.h>
 #include <wxex/persist/dialog.h>
 #include <wx/event.h>
 #include <wx/thread.h>
 #include <list>
 #include <map>
+#include <string>
 #include <vector>


+///
+/// Validator for Unicode character
+///
+class WXEXTEND_API wxZRColaUTF16CharValidator : public wxValidator
+{
+public:
+    ///
+    /// Construct the validator with a value to store data
+    ///
+    wxZRColaUTF16CharValidator(wchar_t *val = NULL);
+
+    ///
+    /// Copies this validator
+    ///
+    virtual wxObject* Clone() const;
+
+    ///
+    /// Validates the value
+    ///
+    virtual bool Validate(wxWindow *parent);
+
+    ///
+    /// Transfers the value to the window
+    ///
+    virtual bool TransferToWindow();
+
+    ///
+    /// Transfers the value from the window
+    ///
+    virtual bool TransferFromWindow();
+
+    ///
+    /// Parses FQDN value
+    ///
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wchar_t *val_out = NULL);
+
+protected:
+    wchar_t *m_val; ///< Pointer to variable to receive control's parsed value
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxZRColaUTF16CharValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxZRColaUTF16CharValidator);
+};
+
+
+///
+/// Validator for Unicode dump
+///
+class wxZRColaUnicodeDumpValidator : public wxValidator
+{
+public:
+    ///
+    /// Construct the validator with a value to store data
+    ///
+    wxZRColaUnicodeDumpValidator(wxString *val = NULL);
+
+    ///
+    /// Copies this validator
+    ///
+    virtual wxObject* Clone() const;
+
+    ///
+    /// Validates the value
+    ///
+    virtual bool Validate(wxWindow *parent);
+
+    ///
+    /// Transfers the value to the window
+    ///
+    virtual bool TransferToWindow();
+
+    ///
+    /// Transfers the value from the window
+    ///
+    virtual bool TransferFromWindow();
+
+    ///
+    /// Parses Unicode dump value
+    ///
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, wxString *val_out = NULL);
+
+protected:
+    wxString *m_val; ///< Pointer to variable to receive control's parsed value
+
+private:
+    wxDECLARE_DYNAMIC_CLASS(wxZRColaUnicodeDumpValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxZRColaUnicodeDumpValidator);
+};
+
+
 wxDECLARE_EVENT(wxEVT_SEARCH_COMPLETE, wxThreadEvent);


@@ -76,10 +167,10 @@ protected:

    void ResetResults();
    void NavigateBy(int offset);
-    void NavigateTo(wchar_t c);
+    void NavigateTo(const wxString &c);

 public:
-    wchar_t m_char;                                 ///< Currently selected character (0 when none)
+    wxString m_char;                                ///< Currently selected character (empty when none)

 protected:
    LCID m_locale;                                  ///< Locale for tag lookup
@@ -104,7 +195,7 @@ protected:
    public:
        std::wstring m_search;                      ///< Search phrase
        std::set<ZRCola::chrcatid_t> m_cats;        ///< Search categories
-        std::vector<std::pair<ZRCola::charrank_t, wchar_t> > m_hits; ///< Search results
+        std::vector<std::pair<ZRCola::charrank_t, std::wstring> > m_hits; ///< Search results

    protected:
        wxZRColaCharSelect *m_parent;               ///< Thread owner
@@ -116,7 +207,7 @@ protected:
    ///
    struct NavigationState
    {
-        wchar_t m_char;
+        std::wstring m_char;
        struct {
            wxGridCellCoords m_selected;
        } m_related;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	61d3369631	Set version to 2.1-beta5	2017-12-19 12:23:28 +01:00
Simon Rozman	a40d021404	Update sub-modules	2017-12-19 12:10:38 +01:00
Simon Rozman	bb4331d6f6	Update wxWidgets to 3.0.3	2017-12-19 10:39:15 +01:00
Simon Rozman	9d8c7d87ed	Update documentation	2017-12-19 09:11:47 +01:00
Simon Rozman	c0da04dcf4	Update submodule	2017-12-19 09:10:53 +01:00
Simon Rozman	44f00f0c40	Update to new wxFormBuilder	2017-12-18 12:02:26 +01:00
Simon Rozman	48945e15d6	Increase transliteration selector width	2017-12-18 11:15:15 +01:00
Simon Rozman	d0e367b881	Add translitarations	2017-12-18 10:49:06 +01:00
Simon Rozman	72e8e4893e	Update font and database	2017-12-18 08:37:46 +01:00
Simon Rozman	5502206810	Update translations	2017-12-18 08:36:28 +01:00
Simon Rozman	35f6b33f54	Update sub-modules	2017-12-18 08:23:19 +01:00
Simon Rozman	c5c505e32e	Version set to 2.1-beta4	2017-07-13 15:00:00 +02:00
Simon Rozman	9ca82f02f8	Decomposition (inverse-translation) fixed	2017-07-13 14:50:27 +02:00
Simon Rozman	9ff3f8c2ab	Version set to 2.1-beta3	2017-07-12 16:01:45 +02:00
Simon Rozman	0e50a733de	Normalization more flexible allowing mixing of modifiers (as long as the modifiers of a same class remain in the same order)	2017-07-12 15:57:48 +02:00
Simon Rozman	7fbcbd17fb	Sub-module update	2017-07-12 14:13:27 +02:00
Simon Rozman	593392782a	Version set to 2.1-beta2	2017-06-01 20:04:39 +02:00
Simon Rozman	e19a98a249	Translation management extended and moved from settings dialog to Translate toolbar	2017-06-01 20:02:43 +02:00
Simon Rozman	a66128b8ca	Incorrect data type fixed	2017-06-01 19:59:09 +02:00
Simon Rozman	6121f7ee12	Translation sequences loaded from database	2017-06-01 15:16:24 +02:00
Simon Rozman	d9527fe70f	Predefined translation sequences added to ZRCola.zrcdb database	2017-06-01 13:28:18 +02:00
Simon Rozman	937c263d56	Sub-module update	2017-05-30 12:55:45 +02:00
Simon Rozman	6487507570	Adaptation to database changes	2017-05-10 09:45:21 +02:00
Simon Rozman	84fa35c9be	Clean-up	2017-05-10 09:44:06 +02:00
Simon Rozman	b8be10390b	Database update	2017-05-09 13:06:05 +02:00
Simon Rozman	de6d890ac1	Secondary translation permutations added to support normalization	2017-05-09 12:08:34 +02:00
Simon Rozman	31b6f1a3e8	Recursively inverse translated translations ranks updated	2017-05-08 14:52:30 +02:00
Simon Rozman	4c6839e9fe	com_translation class extended to support normalization	2017-05-08 14:44:53 +02:00
Simon Rozman	397cfe71dd	Duplicate transformations (differing by rank only) removed from database	2017-05-08 14:33:33 +02:00
Simon Rozman	1834543564	Rearranged transformation sort order in database	2017-05-08 13:39:19 +02:00
Simon Rozman	8f4f20f2b4	Internal classes upgraded to support future normalization	2017-05-08 13:33:40 +02:00
Simon Rozman	9bba0ca557	com_translation now stand-alone class for clearer code	2017-05-08 12:40:01 +02:00
Simon Rozman	435b5c4a10	Duplicate error number resolved	2017-05-03 13:30:06 +02:00
Simon Rozman	bc5058f168	Database update	2017-05-03 13:01:29 +02:00
Simon Rozman	5ba870158e	Decomposition syntax validation temporary removed	2017-05-03 12:36:15 +02:00
Simon Rozman	a6693673a5	Preliminary decomposition syntax validation introduced	2017-04-28 19:37:14 +02:00
Simon Rozman	ba55173f28	Sub-module update	2017-04-28 19:34:56 +02:00
Simon Rozman	12a053a495	Database update	2017-04-28 19:34:47 +02:00
Simon Rozman	8da5f88e0d	MSICA has its own copy of WinStd and MSICALib libraries to allow stand-alone configuration (i.e. static RTL)	2017-04-24 23:07:06 +02:00
Simon Rozman	5a4a20a873	Sub-module update	2017-04-24 22:07:15 +02:00
Simon Rozman	7e50ba5974	Sub-module update	2017-04-24 21:59:48 +02:00
Simon Rozman	91fd26a51d	Sub-module update	2017-04-18 14:47:54 +02:00
Simon Rozman	1ea5e52208	Sub-module update	2017-04-18 14:44:13 +02:00
Simon Rozman	2a18117b17	Sub-module update	2017-04-18 14:05:58 +02:00
Simon Rozman	b7bef14746	Copyright extended to 2017	2017-04-18 14:05:45 +02:00
Simon Rozman	4aacc4abc5	Version set to 2.1-beta1	2017-04-03 12:38:54 +02:00
Simon Rozman	2f6c789fdf	Support for multiple transformations	2017-04-03 12:36:14 +02:00
Simon Rozman	57ceeadbe7	Clean-up	2017-04-03 12:34:18 +02:00
Simon Rozman	3b297c8427	Missing translations added	2017-04-03 12:16:46 +02:00
Simon Rozman	92374e57a8	Loading of recent character list simplified by using wxStringTokenizer	2017-03-31 14:02:37 +02:00
Simon Rozman	ace7551281	Main frame no longer deletes child dialogues in destructor, causing after-death wxPersist saving of deleted dialogue states later.	2017-03-31 13:44:47 +02:00
Simon Rozman	15e5f2d9e2	Character select dialog saves history in legacy format too now	2017-03-31 13:17:25 +02:00
Simon Rozman	08397415c4	Clean-up	2017-03-30 14:54:15 +02:00
Simon Rozman	6dff6eed4f	Translation set database and other translation sets added	2017-03-30 13:08:20 +02:00
Simon Rozman	acbae76737	Clean-up	2017-03-30 10:57:31 +02:00
Simon Rozman	cc4a150501	Translation set ID data-type introduced	2017-03-30 10:23:08 +02:00
Simon Rozman	186dbee443	Multiple translation sets support	2017-03-30 09:49:22 +02:00
Simon Rozman	716dde0a84	Clean-up	2017-03-29 09:46:33 +02:00
Simon Rozman	155642a3f9	"Composition" and "Decomposition" renamed to more general terms "Translation" and "Inverse translation" to extend its use for transliteration	2017-03-27 14:10:43 +02:00
Simon Rozman	7cb0317544	Translation update	2017-03-27 14:06:16 +02:00
Simon Rozman	87a2828ce0	Translation rank split to composed and decomposed character rank allowing asymmetric ranking	2017-03-27 12:39:36 +02:00
Simon Rozman	806aa550a5	Characters are represented as UTF-16 sequences instead of a single UTF-16 character	2017-03-21 09:09:07 +01:00
Simon Rozman	ca306345c2	Composed and decomposed strings of the ZRCola::translation_db::translation protected	2017-03-16 10:21:29 +01:00
Simon Rozman	03ff056898	ZRCola::translation_db::translation::com_start marked as const now	2017-03-16 09:44:43 +01:00
Simon Rozman	9f083bb521	Character-Language table extended to support multi-UTF-16 characters	2017-03-14 14:14:39 +01:00
Simon Rozman	a224454b3c	ZRCola::translation::CompareString() >> ZRCola::CompareString()	2017-03-14 13:23:20 +01:00
Simon Rozman	bd0fdba435	Composed characters extended to support multiple UTF-16 character	2017-03-14 12:54:46 +01:00
Simon Rozman	87814981db	ZRCola::translation_db::Compose fixed to honor inputMax==-1 correctly	2017-03-14 10:51:56 +01:00
Simon Rozman	acf86e2ce0	Reverted to SHA1 Authenticode signatures for Windows XP compatibility	2017-03-14 09:44:31 +01:00
Simon Rozman	1016d5f738	ZRCola tutorial is now displayed only if ZRCola feature was installed	2017-03-14 09:23:53 +01:00
Simon Rozman	4d53785af7	wxWidget RTL dependencies fixed	2017-03-14 09:00:16 +01:00
Simon Rozman	8e2a3860e3	Changed to RFC3161 time-stamping and forced SHA1 digest to support Vista	2017-03-10 13:49:07 +01:00
Simon Rozman	0c2e666d0f	Russian translation update	2017-03-10 13:36:48 +01:00
Simon Rozman	d6075327ef	Copy (de)composed and return feature introduced	2017-01-13 13:56:51 +01:00
Simon Rozman	14e665fdf2	Sub-module update	2017-01-13 13:55:18 +01:00
Simon Rozman	55e2ee8c4d	Folder options added	2017-01-12 10:10:08 +01:00
Simon Rozman	f444355d6d	00ZRCOla fonts replaced with ZRCOla	2017-01-12 10:09:54 +01:00
Simon Rozman	feb3c7c150	Unicode apostrophe changed to ASCII version for simplicity	2017-01-03 11:52:36 +01:00
Simon Rozman	f65634e285	Sub-module update and version set to 2.0	2016-11-08 11:20:50 +01:00
Simon Rozman	62a67b6be7	German MSI building commented until translation is available	2016-11-08 11:05:08 +01:00
Simon Rozman	5304402ec5	Sub-module update	2016-10-18 14:26:57 +02:00
Simon Rozman	f14fa2911d	Version set to 2.0-beta14	2016-10-18 13:50:13 +02:00
Simon Rozman	db391d7023	Incorrect frequent character information in Character Catalog fixed	2016-10-18 13:36:35 +02:00
Simon Rozman	0b5a6a7016	Required update package language determined correctly now	2016-10-18 12:56:34 +02:00
Simon Rozman	5cc72a6a96	wxAUI pane captions no longer persist to allow localization	2016-10-18 12:38:55 +02:00
Simon Rozman	4138f6a5a3	Language for product update matches UI language not OS Regional settings now	2016-10-18 11:14:55 +02:00
Simon Rozman	2b2b2656b3	Language of character tags in Character Search dialog resolved to match UI language	2016-10-18 11:00:40 +02:00
Simon Rozman	6253f2c267	About dialog text updated	2016-10-18 10:10:49 +02:00
Simon Rozman	c9779c3772	Version set to 2.0-beta13	2016-10-17 10:38:34 +02:00
Simon Rozman	f6019e361c	Russian translation complete now	2016-10-17 10:35:22 +02:00
Simon Rozman	3fd0aef27d	SRC SASA >> ZRC SAZU	2016-10-17 09:30:01 +02:00
Simon Rozman	49c9d33b97	Russian translations added	2016-10-17 09:21:16 +02:00
Simon Rozman	b01d1c5409	Sub-module update	2016-10-14 08:47:04 +02:00