Version set to 2.1-beta2

Translation management extended and moved from settings dialog to Translate toolbar
Incorrect data type fixed
2017-06-01 20:04:39 +02:00 · 2017-06-01 20:02:43 +02:00 · 2017-06-01 19:59:09 +02:00 · 2017-06-01 15:16:24 +02:00 · 2017-06-01 13:28:18 +02:00 · 2017-05-30 12:55:45 +02:00
130 changed files with 4727 additions and 2687 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.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.
 #
--- 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.
 #
--- 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.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.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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.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.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.
 #
--- 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.
 #
--- 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.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.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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.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.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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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.
 #
--- 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/MSILocal.mak
+++ b/MSILocal.mak
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- 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.
 #
--- a/ZRCola/ZRCola.fbp
+++ b/ZRCola/ZRCola.fbp
--- 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>
@@ -139,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">
--- 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: 2017-04-03 12:04+0200\n"
-"PO-Revision-Date: 2017-04-03 12:05+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.11\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,7 +20,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""

-#: zrcolaapp.cpp:72 zrcolafrm.cpp:92 zrcolagui.cpp:980 zrcolagui.h:106
+#: 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.Release.Feature-2.idtx:4
@@ -28,17 +28,17 @@ msgstr ""
 msgid "ZRCola"
 msgstr "ZRCola"

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

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

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

@@ -69,24 +69,28 @@ msgstr ", "
 msgid "▾ Search Options"
 msgstr ""

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

-#: zrcolafrm.cpp:143 zrcolafrm.cpp:145
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "

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

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

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

@@ -239,8 +243,9 @@ msgid "Check online for product update"
 msgstr ""

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

 #: zrcolagui.cpp:183
 #, fuzzy
@@ -297,237 +302,203 @@ msgstr "Pošlji sestavljeno (F5)"
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno (F6)"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: zrcolagui.cpp:484
-#, fuzzy
-msgid "None"
-msgstr "Kein"
-
-#: zrcolagui.cpp:485
-#, fuzzy
-msgid "Clear category selection"
-msgstr "Auswahl kopieren"
-
-#: zrcolagui.cpp:489
-msgid "Invert"
-msgstr ""
-
 #: zrcolagui.cpp:490
 #, fuzzy
+msgid "None"
+msgstr "Kein"
+
+#: zrcolagui.cpp:491
+#, fuzzy
+msgid "Clear category selection"
+msgstr "Auswahl kopieren"
+
+#: zrcolagui.cpp:495
+msgid "Invert"
+msgstr ""
+
+#: zrcolagui.cpp:496
+#, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"

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

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

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

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

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

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

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

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

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

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

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

-#: zrcolagui.cpp:653
-#, fuzzy
-msgid "« Back"
-msgstr "< &Zurück"
-
-#: zrcolagui.cpp:655
-msgid "To previously viewed character"
-msgstr ""
-
 #: zrcolagui.cpp:659
 #, fuzzy
+msgid "« Back"
+msgstr "< &Zurück"
+
+#: zrcolagui.cpp:661
+msgid "To previously viewed character"
+msgstr ""
+
+#: zrcolagui.cpp:665
+#, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"

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

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

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

-#: zrcolagui.cpp:790
+#: zrcolagui.cpp:794
 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:794
+#: zrcolagui.cpp:798
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""

-#: zrcolagui.cpp:797
+#: zrcolagui.cpp:801
 msgid "&Manually select the language from the list below:"
 msgstr ""

-#: zrcolagui.cpp:809
+#: zrcolagui.cpp:812
 msgid "Text Language"
 msgstr ""

-#: zrcolagui.cpp:816
-msgid ""
-"ZRCola offers multiple text transformations that can be arranged in a sequence.\n"
-"Please select desired transformations and the order they are applied."
-msgstr ""
-
-#: zrcolagui.cpp:831
-msgid "A&vailable:"
-msgstr ""
-
-#: zrcolagui.cpp:844
-msgid ">"
-msgstr ">"
-
-#: zrcolagui.cpp:847
-msgid "<"
-msgstr "<"
-
-#: zrcolagui.cpp:856
-msgid "&Active:"
-msgstr ""
-
-#: zrcolagui.cpp:872
-msgid "Up"
-msgstr ""
-
-#: zrcolagui.cpp:875
-msgid "Down"
-msgstr ""
-
-#: zrcolagui.cpp:885
-msgid "Transformation"
-msgstr ""
-
-#: zrcolagui.cpp:892
+#: 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:896
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr ""

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

-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -536,81 +507,140 @@ msgid ""
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""

-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:913
+#, fuzzy
 msgid "zrcola.zrc-sazu.si"
-msgstr ""
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"

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

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

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

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

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

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

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

-#: zrcolagui.cpp:1123
+#: 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."
 msgstr ""

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

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

-#: zrcolagui.cpp:1146
+#: 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."
 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."
 msgstr ""

-#: zrcolasettings.cpp:90
-#, c-format
-msgid "Unknown transformation (%u)"
+#: zrcolasettings.cpp:87
+msgid "Start ZRCola automatically on logon"
 msgstr ""

-#: zrcolasettings.cpp:181
-msgid "Start ZRCola automatically on logon"
+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
 msgstr ""

 #: zrcolaupdater.cpp:94
@@ -619,23 +649,6 @@ msgid ""
 "Are you sure?"
 msgstr ""

-#: zrcolaupdater.cpp:94 zrcolagui.h:350
-msgid "Product Update"
-msgstr ""
-
-#: zrcolagui.h:248
-#, fuzzy
-msgid "Character Search"
-msgstr "Skupine &znakov"
-
-#: zrcolagui.h:299
-msgid "Settings"
-msgstr ""
-
-#: zrcolagui.h:325
-msgid "About ZRCola"
-msgstr ""
-
 #: 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
@@ -673,7 +686,7 @@ msgstr ""
 #: 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.Release.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
--- a/ZRCola/locale/ru_RU.po
+++ b/ZRCola/locale/ru_RU.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2017-04-03 12:04+0200\n"
-"PO-Revision-Date: 2017-04-03 12:04+0200\n"
+"POT-Creation-Date: 2017-06-01 18:04+0200\n"
+"PO-Revision-Date: 2017-06-01 18:05+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.11\n"
+"X-Generator: Poedit 2.0.2\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"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004–%s ZRC SAZU"

-#: zrcolaapp.cpp:72 zrcolafrm.cpp:92 zrcolagui.cpp:980 zrcolagui.h:106
+#: 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.Release.Feature-2.idtx:4
@@ -28,15 +28,15 @@ msgstr "© 2004–%s ZRC SAZU"
 msgid "ZRCola"
 msgstr "ZRCola"

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

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

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

@@ -66,23 +66,27 @@ msgstr ", "
 msgid "▾ Search Options"
 msgstr "▾ Опции поиска"

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

-#: zrcolafrm.cpp:143 zrcolafrm.cpp:145
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Предупреждение"

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

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

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

@@ -274,159 +278,159 @@ msgstr "Послать составленное (F5)"
 msgid "Send Decomposed"
 msgstr "Послать разобранное (F6)"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:647
 msgid "Character tags"
 msgstr "Ключевые слова"

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

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

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

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

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

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

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

-#: zrcolagui.cpp:790
+#: zrcolagui.cpp:794
 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."
@@ -434,53 +438,19 @@ msgstr ""
 "Некоторые знаки использованного языка нельзя разбирать.\n"
 "Для оптимальной разборки вы должны настроить правильный язык."

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

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

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

-#: zrcolagui.cpp:816
-msgid ""
-"ZRCola offers multiple text transformations that can be arranged in a sequence.\n"
-"Please select desired transformations and the order they are applied."
-msgstr ""
-
-#: zrcolagui.cpp:831
-msgid "A&vailable:"
-msgstr ""
-
-#: zrcolagui.cpp:844
-msgid ">"
-msgstr ">"
-
-#: zrcolagui.cpp:847
-msgid "<"
-msgstr "<"
-
-#: zrcolagui.cpp:856
-msgid "&Active:"
-msgstr ""
-
-#: zrcolagui.cpp:872
-msgid "Up"
-msgstr "Up"
-
-#: zrcolagui.cpp:875
-msgid "Down"
-msgstr "Down"
-
-#: zrcolagui.cpp:885
-msgid "Transformation"
-msgstr ""
-
-#: zrcolagui.cpp:892
+#: 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."
@@ -488,15 +458,15 @@ msgstr ""
 "Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
 "После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."

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

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

-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -510,47 +480,47 @@ msgstr ""
 "Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo Torkar), Анастасия Плотникова\n"
 "Разработка in техническая поддержка первоначальной программы (2004–2015): Петер Вейсс (Peter Weiss)"

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

-#: zrcolagui.cpp:1005
+#: 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:1009
+#: 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:1050
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Журнал"

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

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

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

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

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

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

-#: zrcolagui.cpp:1123
+#: 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."
@@ -558,15 +528,15 @@ msgstr ""
 "Пожалуйста, используйте разобранный формат.\n"
 "Для ввода запрашиваемого знака можно использовать сочетания клавиш системы ZRCola либо копировать и вставить знаки из окна для разборки."

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

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

-#: zrcolagui.cpp:1146
+#: 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."
@@ -574,19 +544,74 @@ msgstr ""
 "После нажатия на кнопку «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 ""
+
+#: 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
+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."

-#: zrcolasettings.cpp:90
-#, c-format
-msgid "Unknown transformation (%u)"
-msgstr ""
-
-#: zrcolasettings.cpp:181
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr "Автоматически запустить систему ZRCola при запуске компьютера"

+#: 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"
@@ -595,22 +620,6 @@ msgstr ""
 "Программа будет закрыта и обновлена.\n"
 "Вы уверены?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:350
-msgid "Product Update"
-msgstr "Обновление продукта"
-
-#: zrcolagui.h:248
-msgid "Character Search"
-msgstr "Поиск знака"
-
-#: zrcolagui.h:299
-msgid "Settings"
-msgstr "Настройки"
-
-#: zrcolagui.h:325
-msgid "About ZRCola"
-msgstr "О системе ZRCola"
-
 #: 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
--- a/ZRCola/locale/sl_SI.po
+++ b/ZRCola/locale/sl_SI.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2017-04-03 12:01+0200\n"
-"PO-Revision-Date: 2017-04-03 12:03+0200\n"
+"POT-Creation-Date: 2017-06-01 18:05+0200\n"
+"PO-Revision-Date: 2017-06-01 18:06+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.11\n"
+"X-Generator: Poedit 2.0.2\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"

-#: zrcolaapp.cpp:72 zrcolafrm.cpp:92 zrcolagui.cpp:980 zrcolagui.h:106
+#: 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.Release.Feature-2.idtx:4
@@ -28,15 +28,15 @@ msgstr "© 2004-%s ZRC SAZU"
 msgid "ZRCola"
 msgstr "ZRCola"

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

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

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

@@ -66,23 +66,27 @@ msgstr ", "
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"

-#: zrcolafrm.cpp:143
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
+msgstr "Pretvorba po meri ..."
+
+#: 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:143 zrcolafrm.cpp:145
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Opozorilo"

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

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

@@ -274,159 +278,159 @@ msgstr "Pošlji sestavljeno"
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"

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

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

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

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

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

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

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

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

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

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

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

-#: zrcolagui.cpp:455
+#: 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:459
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr "Možnosti iskanja"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: zrcolagui.cpp:790
+#: zrcolagui.cpp:794
 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."
@@ -434,55 +438,19 @@ msgstr ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."

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

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

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

-#: zrcolagui.cpp:816
-msgid ""
-"ZRCola offers multiple text transformations that can be arranged in a sequence.\n"
-"Please select desired transformations 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 jih uporabi."
-
-#: zrcolagui.cpp:831
-msgid "A&vailable:"
-msgstr "Na &voljo:"
-
-#: zrcolagui.cpp:844
-msgid ">"
-msgstr ">"
-
-#: zrcolagui.cpp:847
-msgid "<"
-msgstr "<"
-
-#: zrcolagui.cpp:856
-msgid "&Active:"
-msgstr "&Aktivni:"
-
-#: zrcolagui.cpp:872
-msgid "Up"
-msgstr "Gor"
-
-#: zrcolagui.cpp:875
-msgid "Down"
-msgstr "Dol"
-
-#: zrcolagui.cpp:885
-msgid "Transformation"
-msgstr "Pretvorba"
-
-#: zrcolagui.cpp:892
+#: 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."
@@ -490,15 +458,15 @@ 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."

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

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

-#: zrcolagui.cpp:991
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
@@ -512,48 +480,48 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"

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

-#: zrcolagui.cpp:1005
+#: 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:1009
+#: 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:1050
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Dnevnik"

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

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

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

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

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

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

 # Please use a double && for final "&" character
-#: zrcolagui.cpp:1123
+#: 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."
@@ -561,15 +529,15 @@ 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."

-#: zrcolagui.cpp:1133
+#: 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:1139
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"

-#: zrcolagui.cpp:1146
+#: 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."
@@ -577,19 +545,75 @@ 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."

+#: 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 jih uporabi."
+
+#: 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&zbrani:"
+
+#: 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."

-#: zrcolasettings.cpp:90
-#, c-format
-msgid "Unknown transformation (%u)"
-msgstr "Neznana pretvorba (%u)"
-
-#: zrcolasettings.cpp:181
+#: 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"
@@ -598,22 +622,6 @@ msgstr ""
 "Program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
 "Ali ste prepričani, da želite nadaljevati?"

-#: zrcolaupdater.cpp:94 zrcolagui.h:350
-msgid "Product Update"
-msgstr "Posodabljanje izdelka"
-
-#: zrcolagui.h:248
-msgid "Character Search"
-msgstr "Poišči znak"
-
-#: zrcolagui.h:299
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: zrcolagui.h:325
-msgid "About ZRCola"
-msgstr "O ZRColi"
-
 #: 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
@@ -688,3 +696,6 @@ msgstr "Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovni
 #: 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/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>
--- 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.

@@ -108,6 +108,12 @@ bool ZRColaApp::OnInit()
                            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()) {
@@ -165,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.

@@ -74,6 +74,7 @@ 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
--- 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.

--- 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.

--- 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.

--- 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.

--- 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.

--- 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.

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

    This file is part of ZRCola.

@@ -87,16 +87,17 @@ void wxZRColaComposerPanel::SynchronizePanels()
        m_timerSave.Stop();

        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-        wxZRColaFrame *mainWnd = dynamic_cast<wxZRColaFrame*>(wxGetActiveWindow());
-        wxASSERT_MSG(mainWnd, "main window missing");

        wxString src;
        size_t len = GetValue(m_source, src);
        std::wstring dst(src.data(), len), dst2;
        ZRCola::mapping_vector map;

+        const ZRCola::transetid_t *sets_begin, *sets_end;
+        GetTranslationSeq(sets_begin, sets_end);
+
        m_mapping.clear();
-        for (auto s = mainWnd->m_settings->m_transeq.cbegin(), s_end = mainWnd->m_settings->m_transeq.cend(); s != s_end; ++s) {
+        for (auto s = sets_begin; s != sets_end; ++s) {
            if (*s == 0) {
                // ZRCola Decomposed => ZRCola Composed should decompose first.
                app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), dst2, &map);
@@ -105,7 +106,7 @@ void wxZRColaComposerPanel::SynchronizePanels()
                app->m_t_db.Translate(*s, dst2.data(), dst2.size(), dst, &map);
                m_mapping.push_back(std::move(map));
            } else {
-                // Other transforms
+                // Other translates
                app->m_t_db.Translate(*s, dst.data(), dst.size(), dst2, &map);
                m_mapping.push_back(std::move(map));
                dst = std::move(dst2);
@@ -130,21 +131,22 @@ void wxZRColaComposerPanel::SynchronizePanels()
        m_timerSave.Stop();

        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-        wxZRColaFrame *mainWnd = dynamic_cast<wxZRColaFrame*>(wxGetActiveWindow());
-        wxASSERT_MSG(mainWnd, "main window missing");

        wxString src;
        size_t len = GetValue(m_destination, src);
        std::wstring dst(src.data(), len), dst2;
        ZRCola::mapping_vector map;

+        const ZRCola::transetid_t *sets_begin, *sets_end;
+        GetTranslationSeq(sets_begin, sets_end);
+
        m_mapping.clear();
-        for (auto s = mainWnd->m_settings->m_transeq.crbegin(), s_end = mainWnd->m_settings->m_transeq.crend(); s != s_end; ++s) {
+        for (auto s = sets_end; s != sets_begin; s--) {
            if (*s) {
                // ZRCola Decomposed => ZRCola Composed
-                app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), &app->m_lc_db, mainWnd->m_settings->m_lang, dst2, &map);
+                app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), &app->m_lc_db, app->m_mainWnd->m_settings->m_lang, dst2, &map);
            } else {
-                // Other transforms
+                // Other translates
                app->m_t_db.TranslateInv(*s, dst.data(), dst.size(), dst2, &map);
            }
            dst = std::move(dst2);
@@ -233,7 +235,7 @@ void wxZRColaComposerPanel::OnSourceText(wxCommandEvent& event)
 {
    event.Skip();

-    // Set the flag the source text changed to trigger idle-time transformation.
+    // Set the flag the source text changed to trigger idle-time translation.
    m_sourceChanged = true;
 }

@@ -296,7 +298,7 @@ void wxZRColaComposerPanel::OnDestinationText(wxCommandEvent& event)
 {
    event.Skip();

-    // Set the flag the destination text changed to trigger idle-time inverse transformation.
+    // Set the flag the destination text changed to trigger idle-time inverse translation.
    m_destinationChanged = true;
 }

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

    This file is part of ZRCola.

@@ -56,14 +56,15 @@ protected:
    virtual void OnSaveTimer(wxTimerEvent& event);
    inline size_t MapToDestination(_In_ size_t src) const;
    inline size_t MapToSource(_In_ size_t dst) const;
+    inline void GetTranslationSeq(_Out_ const ZRCola::transetid_t *&sets_begin, _Out_ const ZRCola::transetid_t *&sets_end) const;

    static wxString GetStateFileName();
    static size_t GetValue(wxTextCtrl *wnd, wxString &text);
    static void SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &range, ZRCola::mapping_vector &mapping, const wchar_t *src, size_t len, long from, long to);

 protected:
-    bool m_sourceChanged;                           ///< Boolean flag to mark source text "dirty" to trigger transformation
-    bool m_destinationChanged;                      ///< Boolean flag to mark destination text "dirty" to trigger inverse transformation
+    bool m_sourceChanged;                           ///< Boolean flag to mark source text "dirty" to trigger translation
+    bool m_destinationChanged;                      ///< Boolean flag to mark destination text "dirty" to trigger inverse translation
    std::vector<ZRCola::mapping_vector> m_mapping;  ///< Character index mapping vector between source and normalized text
    std::pair<long, long>
        m_selSource,                                ///< Character index of selected text in source text control
@@ -108,6 +109,27 @@ inline size_t wxZRColaComposerPanel::MapToSource(_In_ size_t dst) const
 }


+inline void wxZRColaComposerPanel::GetTranslationSeq(_Out_ const ZRCola::transetid_t *&sets_begin, _Out_ const ZRCola::transetid_t *&sets_end) const
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    if (app->m_mainWnd->m_transeq_id != ZRCOLA_TRANSEQID_CUSTOM) {
+        size_t start;
+        if (app->m_tsq_db.idxTranSeq.find(ZRCola::transeq_db::transeq(app->m_mainWnd->m_transeq_id), start)) {
+            const auto &ts = app->m_tsq_db.idxTranSeq[start];
+            sets_begin = ts.sets();
+            sets_end   = ts.sets_end();
+        } else {
+            sets_begin = NULL;
+            sets_end   = NULL;
+        }
+    } else {
+        sets_begin = app->m_mainWnd->m_transeq->m_transeq.data();
+        sets_end   = sets_begin + app->m_mainWnd->m_transeq->m_transeq.size();
+    }
+}
+
+
 inline wxPersistentObject *wxCreatePersistentObject(wxZRColaComposerPanel *wnd)
 {
    return new wxPersistentZRColaComposerPanel(wnd);
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -45,8 +45,8 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)

    EVT_UPDATE_UI      (wxID_TOOLBAR_EDIT                          , wxZRColaFrame::OnToolbarEditUpdate          )
    EVT_MENU           (wxID_TOOLBAR_EDIT                          , wxZRColaFrame::OnToolbarEdit                )
-    EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSFORM                     , wxZRColaFrame::OnToolbarTransformUpdate     )
-    EVT_MENU           (wxID_TOOLBAR_TRANSFORM                     , wxZRColaFrame::OnToolbarTransform           )
+    EVT_UPDATE_UI      (wxID_TOOLBAR_TRANSLATE                     , wxZRColaFrame::OnToolbarTranslateUpdate     )
+    EVT_MENU           (wxID_TOOLBAR_TRANSLATE                     , wxZRColaFrame::OnToolbarTranslate           )
    EVT_UPDATE_UI      (wxID_PANEL_CHRGRPS                         , wxZRColaFrame::OnPanelCharacterCatalogUpdate)
    EVT_MENU           (wxID_PANEL_CHRGRPS                         , wxZRColaFrame::OnPanelCharacterCatalog      )
    EVT_MENU           (wxID_FOCUS_CHARACTER_CATALOG               , wxZRColaFrame::OnPanelCharacterCatalogFocus )
@@ -65,16 +65,30 @@ wxZRColaFrame::wxZRColaFrame() :
    m_chrSelect(NULL),
    m_settings(NULL),
    m_chrReq(NULL),
+    m_transeq_id(0), // By default use predefined translation sequence 0 (ZRCola Decomposed >> Composed)
+    m_transeq(NULL),
    wxZRColaFrameBase(NULL)
 {
    {
        // wxFrameBuilder 3.5 does not support wxAUI_TB_HORIZONTAL flag. Add it manually.
-        wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarTransform);
+        wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarTranslate);
        paneInfo.LeftDockable(false);
        paneInfo.RightDockable(false);
-        m_toolbarTransform->SetWindowStyleFlag(m_toolbarTransform->GetWindowStyleFlag() | wxAUI_TB_HORIZONTAL);
+        m_toolbarTranslate->SetWindowStyleFlag(m_toolbarTranslate->GetWindowStyleFlag() | wxAUI_TB_HORIZONTAL);
    }

+    // Populate list of translation sequences.
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_toolTranslationSeq->Clear();
+    for (size_t i = 0, n = app->m_tsq_db.idxRank.size(); i < n; i++) {
+        const ZRCola::transeq_db::transeq &ts = app->m_tsq_db.idxRank[i];
+        wxString
+            name(ts.name(), ts.name_len()),
+            name_tran(wxGetTranslation(name, wxT("ZRCola-zrcdb")));
+        m_toolTranslationSeq->Append(name_tran, reinterpret_cast<void*>(ts.seq));
+    }
+    m_toolTranslationSeq->Append(_("Custom Translation..."), reinterpret_cast<void*>(ZRCOLA_TRANSEQID_CUSTOM));
+
    // Load main window icons.
 #ifdef __WINDOWS__
    wxIcon icon_small(wxT("00_zrcola.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
@@ -99,6 +113,9 @@ wxZRColaFrame::wxZRColaFrame() :
    m_settings = new wxZRColaSettings(this);
    wxPersistentRegisterAndRestore<wxZRColaSettings>(m_settings);

+    m_transeq = new wxZRColaTranslationSeq(this);
+    wxPersistentRegisterAndRestore<wxZRColaTranslationSeq>(m_transeq);
+
    m_chrSelect = new wxZRColaCharSelect(this);
    wxPersistentRegisterAndRestore<wxZRColaCharSelect>(m_chrSelect);

@@ -137,11 +154,26 @@ wxZRColaFrame::wxZRColaFrame() :

    // Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap.
    wxPersistentAuiManager(&m_mgr).Restore();
+    wxPersistentRegisterAndRestore<wxZRColaFrame>(this);
+
+    // Populate list of translation sequences.
+    for (unsigned int i = 0, n = m_toolTranslationSeq->GetCount(); ; i++) {
+        if (i < n) {
+            if (reinterpret_cast<ZRCola::transeqid_t>(m_toolTranslationSeq->GetClientData(i)) == m_transeq_id) {
+                m_toolTranslationSeq->SetSelection(i);
+                break;
+            }
+        } else {
+            m_transeq_id = reinterpret_cast<ZRCola::transeqid_t>(m_toolTranslationSeq->GetClientData(0));
+            m_toolTranslationSeq->SetSelection(0);
+            break;
+        }
+    }

    // Register global hotkey(s).
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSFORM, wxMOD_WIN, VK_F5))
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE, wxMOD_WIN, VK_F5))
        wxMessageBox(_("ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
-    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSFORM_INV, wxMOD_WIN, VK_F6))
+    if (!RegisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV, wxMOD_WIN, VK_F6))
        wxMessageBox(_("ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."), _("Warning"), wxOK | wxICON_WARNING);
 }

@@ -149,8 +181,8 @@ wxZRColaFrame::wxZRColaFrame() :
 wxZRColaFrame::~wxZRColaFrame()
 {
    // Unregister global hotkey(s).
-    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSFORM_INV);
-    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSFORM    );
+    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV);
+    UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE    );

 #if defined(__WXMSW__)
    if (m_tfSource) {
@@ -317,20 +349,36 @@ void wxZRColaFrame::OnToolbarEdit(wxCommandEvent& event)
 }


-void wxZRColaFrame::OnToolbarTransformUpdate(wxUpdateUIEvent& event)
+void wxZRColaFrame::OnToolbarTranslateUpdate(wxUpdateUIEvent& event)
 {
-    event.Check(m_mgr.GetPane(m_toolbarTransform).IsShown());
+    event.Check(m_mgr.GetPane(m_toolbarTranslate).IsShown());
 }


-void wxZRColaFrame::OnToolbarTransform(wxCommandEvent& event)
+void wxZRColaFrame::OnToolbarTranslate(wxCommandEvent& event)
 {
-    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarTransform);
+    wxAuiPaneInfo &paneInfo = m_mgr.GetPane(m_toolbarTranslate);
    paneInfo.Show(!paneInfo.IsShown());
    m_mgr.Update();
 }


+void wxZRColaFrame::OnTranslationSeqChoice(wxCommandEvent& event)
+{
+    ZRCola::transeqid_t transeq_id = reinterpret_cast<ZRCola::transeqid_t>(event.GetClientData());
+    if (m_transeq_id != transeq_id) {
+        m_transeq_id = transeq_id;
+
+        // Notify source text something changed and should re-translate.
+        wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+        m_panel->m_source->ProcessWindowEvent(event2);
+    }
+
+    if (m_transeq_id == ZRCOLA_TRANSEQID_CUSTOM)
+        m_transeq->ShowModal();
+}
+
+
 void wxZRColaFrame::OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event)
 {
    event.Check(m_mgr.GetPane(m_panelChrCat).IsShown());
@@ -527,8 +575,8 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
        WXHWND hWndSource = ::GetForegroundWindow();

        switch (wParam) {
-        case wxZRColaHKID_INVOKE_TRANSFORM    : m_panel->m_source     ->SetFocus(); break;
-        case wxZRColaHKID_INVOKE_TRANSFORM_INV: m_panel->m_destination->SetFocus(); break;
+        case wxZRColaHKID_INVOKE_TRANSLATE    : m_panel->m_source     ->SetFocus(); break;
+        case wxZRColaHKID_INVOKE_TRANSLATE_INV: m_panel->m_destination->SetFocus(); break;
        default:
            wxFAIL_MSG(wxT("not our registered shortcut"));
            return wxZRColaFrameBase::MSWWindowProc(message, wParam, lParam);
@@ -582,6 +630,8 @@ void wxPersistentZRColaFrame::Save() const

    auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.

+    SaveValue(wxT("transeqId"), static_cast<int>(wnd->m_transeq_id));
+
    wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
    wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
 }
@@ -594,5 +644,9 @@ bool wxPersistentZRColaFrame::Restore()
    wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Restore();
    wxPersistentZRColaComposerPanel(wnd->m_panel).Restore();

+    int num;
+    if (RestoreValue(wxT("transeqId"), &num))
+        wnd->m_transeq_id = num;
+
    return wxPersistentTLW::Restore();
 }
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -29,7 +29,9 @@ class wxZRColaFrame;
 #include "zrcolachrslct.h"
 #include "zrcolachrreq.h"
 #include "zrcolasettings.h"
+#include "zrcolatranseq.h"
 #include <zrcola/language.h>
+#include <zrcola/translate.h>
 #include <wx/taskbar.h>
 #include <wx/persist/toplevel.h>
 #if defined(__WXMSW__)
@@ -40,8 +42,8 @@ class wxZRColaFrame;
 ///
 /// Global hotkey message identifiers
 ///
-#define wxZRColaHKID_INVOKE_TRANSFORM       0
-#define wxZRColaHKID_INVOKE_TRANSFORM_INV   1
+#define wxZRColaHKID_INVOKE_TRANSLATE       0
+#define wxZRColaHKID_INVOKE_TRANSLATE_INV   1


 ///
@@ -83,8 +85,9 @@ protected:
    virtual void OnIconize(wxIconizeEvent& event);
    void OnToolbarEditUpdate(wxUpdateUIEvent& event);
    void OnToolbarEdit(wxCommandEvent& event);
-    void OnToolbarTransformUpdate(wxUpdateUIEvent& event);
-    void OnToolbarTransform(wxCommandEvent& event);
+    void OnToolbarTranslateUpdate(wxUpdateUIEvent& event);
+    void OnToolbarTranslate(wxCommandEvent& event);
+    virtual void OnTranslationSeqChoice(wxCommandEvent& event);
    void OnPanelCharacterCatalogUpdate(wxUpdateUIEvent& event);
    void OnPanelCharacterCatalog(wxCommandEvent& event);
    void OnPanelCharacterCatalogFocus(wxCommandEvent& event);
@@ -126,6 +129,8 @@ protected:
    wxZRColaCharSelect *m_chrSelect;    ///< Character selection dialog
    wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
    wxZRColaSettings *m_settings;       ///< Configuration dialog
+    ZRCola::transeqid_t m_transeq_id;   ///< Translation sequence ID
+    wxZRColaTranslationSeq *m_transeq;  ///< Custom translation sequence dialog
 };


--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -144,7 +144,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuView->Append( m_menuItemToolbarEdit );
 	
 	wxMenuItem* m_menuItemToolbarCompose;
-	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSFORM, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
+	m_menuItemToolbarCompose = new wxMenuItem( m_menuView, wxID_TOOLBAR_TRANSLATE, wxString( _("&Compose Toolbar") ) , _("Toggle compose toolbar"), wxITEM_CHECK );
 	m_menuView->Append( m_menuItemToolbarCompose );
 	
 	m_menuView->AppendSeparator();
@@ -194,15 +194,19 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_toolbarEdit->Realize();
 	m_mgr.AddPane( m_toolbarEdit, wxAuiPaneInfo().Name( wxT("toolbarEdit") ).Top().Caption( _("Edit") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 	
-	m_toolbarTransform = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
-	m_toolCharSelect = m_toolbarTransform->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Find Character"), _("Display character search to select character to insert into text"), NULL ); 
+	m_toolbarTranslate = new wxAuiToolBar( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT ); 
+	m_toolCharSelect = m_toolbarTranslate->AddTool( wxID_CHARACTER_SELECTOR, _("Find Character"), wxIcon( wxT("char_select.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Find Character"), _("Display character search to select character to insert into text"), NULL ); 
 	
-	m_toolSendDestination = m_toolbarTransform->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
+	m_toolSendDestination = m_toolbarTranslate->AddTool( wxID_SEND_DESTINATION, _("Send Composed"), wxIcon( wxT("send_destination.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Composed"), _("Send composed text to source window"), NULL ); 
 	
-	m_toolSendSource = m_toolbarTransform->AddTool( wxID_SEND_SOURCE, _("Send Decomposed"), wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); 
+	m_toolSendSource = m_toolbarTranslate->AddTool( wxID_SEND_SOURCE, _("Send Decomposed"), wxIcon( wxT("send_source.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 24, 24 ), wxNullBitmap, wxITEM_NORMAL, _("Send Decomposed"), _("Send decomposed text to source window"), NULL ); 
 	
-	m_toolbarTransform->Realize();
-	m_mgr.AddPane( m_toolbarTransform, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
+	wxArrayString m_toolTranslationSeqChoices;
+	m_toolTranslationSeq = new wxChoice( m_toolbarTranslate, wxID_ANY, wxDefaultPosition, wxSize( 170,-1 ), m_toolTranslationSeqChoices, 0 );
+	m_toolTranslationSeq->SetSelection( 0 );
+	m_toolbarTranslate->AddControl( m_toolTranslationSeq );
+	m_toolbarTranslate->Realize();
+	m_mgr.AddPane( m_toolbarTranslate, wxAuiPaneInfo().Name( wxT("toolbarCompose") ).Top().Caption( _("Compose") ).PinButton( true ).Dock().Resizable().FloatingSize( wxSize( -1,-1 ) ).LeftDockable( false ).RightDockable( false ).Row( 0 ).Layer( 1 ).ToolbarPane() );
 	
 	m_panelChrCat = new wxZRColaCharacterCatalogPanel( this );
 	
@@ -221,6 +225,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolTranslationSeq->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 }

 wxZRColaFrameBase::~wxZRColaFrameBase()
@@ -229,6 +234,7 @@ wxZRColaFrameBase::~wxZRColaFrameBase()
 	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxZRColaFrameBase::OnClose ) );
 	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxZRColaFrameBase::OnIconize ) );
 	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxZRColaFrameBase::OnIdle ) );
+	m_toolTranslationSeq->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( wxZRColaFrameBase::OnTranslationSeqChoice ), NULL, this );
 	
 	m_mgr.UnInit();
 	
@@ -804,79 +810,6 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con
 	m_panelLanguage->SetSizer( bSizerLanguage );
 	m_panelLanguage->Layout();
 	m_listbook->AddPage( m_panelLanguage, _("Text Language"), true );
-	m_panelTransformation = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, wxSize( 500,-1 ), wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizerTransformation;
-	bSizerTransformation = new wxBoxSizer( wxVERTICAL );
-	
-	m_transLabel = new wxStaticText( m_panelTransformation, wxID_ANY, _("ZRCola offers multiple text transformations that can be arranged in a sequence.\nPlease select desired transformations and the order they are applied."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_transLabel->Wrap( 490 );
-	bSizerTransformation->Add( m_transLabel, 0, wxALL|wxEXPAND, 5 );
-	
-	wxFlexGridSizer* fgSizerTransformation;
-	fgSizerTransformation = new wxFlexGridSizer( 2, 3, 0, 0 );
-	fgSizerTransformation->AddGrowableCol( 0 );
-	fgSizerTransformation->AddGrowableCol( 2 );
-	fgSizerTransformation->AddGrowableRow( 0 );
-	fgSizerTransformation->SetFlexibleDirection( wxBOTH );
-	fgSizerTransformation->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxBoxSizer* bSizerTransAvailable;
-	bSizerTransAvailable = new wxBoxSizer( wxVERTICAL );
-	
-	m_transAvailableLabel = new wxStaticText( m_panelTransformation, wxID_ANY, _("A&vailable:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_transAvailableLabel->Wrap( -1 );
-	bSizerTransAvailable->Add( m_transAvailableLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_transAvailable = new wxListBox( m_panelTransformation, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
-	bSizerTransAvailable->Add( m_transAvailable, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	fgSizerTransformation->Add( bSizerTransAvailable, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizerTransActivate;
-	bSizerTransActivate = new wxBoxSizer( wxVERTICAL );
-	
-	m_transActivate = new wxButton( m_panelTransformation, wxID_ANY, _(">"), wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizerTransActivate->Add( m_transActivate, 0, wxALL, 5 );
-	
-	m_transDeactivate = new wxButton( m_panelTransformation, wxID_ANY, _("<"), wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizerTransActivate->Add( m_transDeactivate, 0, wxALL, 5 );
-	
-	
-	fgSizerTransformation->Add( bSizerTransActivate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizerTransActive;
-	bSizerTransActive = new wxBoxSizer( wxVERTICAL );
-	
-	m_transActiveLabel = new wxStaticText( m_panelTransformation, wxID_ANY, _("&Active:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_transActiveLabel->Wrap( -1 );
-	bSizerTransActive->Add( m_transActiveLabel, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_transActive = new wxListBox( m_panelTransformation, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); 
-	bSizerTransActive->Add( m_transActive, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	fgSizerTransformation->Add( bSizerTransActive, 1, wxEXPAND, 5 );
-	
-	
-	bSizerTransformation->Add( fgSizerTransformation, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizerTransActiveReorder;
-	bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_transActiveUp = new wxButton( m_panelTransformation, wxID_ANY, _("Up"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
-	bSizerTransActiveReorder->Add( m_transActiveUp, 0, wxALL, 5 );
-	
-	m_transActiveDown = new wxButton( m_panelTransformation, wxID_ANY, _("Down"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
-	bSizerTransActiveReorder->Add( m_transActiveDown, 0, wxALL, 5 );
-	
-	
-	bSizerTransformation->Add( bSizerTransActiveReorder, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	m_panelTransformation->SetSizer( bSizerTransformation );
-	m_panelTransformation->Layout();
-	m_listbook->AddPage( m_panelTransformation, _("Transformation"), false );
 	m_panelAutoStart = new wxPanel( m_listbook, wxID_ANY, wxDefaultPosition, wxSize( 500,-1 ), wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizerAutoStart;
 	bSizerAutoStart = new wxBoxSizer( wxVERTICAL );
@@ -928,11 +861,6 @@ wxZRColaSettingsBase::wxZRColaSettingsBase( wxWindow* parent, wxWindowID id, con
 	// Connect Events
 	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaSettingsBase::OnInitDialog ) );
 	m_panelLanguage->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this );
-	m_panelTransformation->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnTransformationUpdate ), NULL, this );
-	m_transActivate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActivate ), NULL, this );
-	m_transDeactivate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransDeactivate ), NULL, this );
-	m_transActiveUp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActiveUp ), NULL, this );
-	m_transActiveDown->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActiveDown ), NULL, this );
 	m_sdbSizerButtonsApply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnApplyButtonClick ), NULL, this );
 	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnOKButtonClick ), NULL, this );
 }
@@ -942,11 +870,6 @@ wxZRColaSettingsBase::~wxZRColaSettingsBase()
 	// Disconnect Events
 	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaSettingsBase::OnInitDialog ) );
 	m_panelLanguage->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnLanguageUpdate ), NULL, this );
-	m_panelTransformation->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaSettingsBase::OnTransformationUpdate ), NULL, this );
-	m_transActivate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActivate ), NULL, this );
-	m_transDeactivate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransDeactivate ), NULL, this );
-	m_transActiveUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActiveUp ), NULL, this );
-	m_transActiveDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnTransActiveDown ), NULL, this );
 	m_sdbSizerButtonsApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnApplyButtonClick ), NULL, this );
 	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaSettingsBase::OnOKButtonClick ), NULL, this );
 	
@@ -1167,3 +1090,130 @@ wxZRColaCharRequestBase::~wxZRColaCharRequestBase()
 	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaCharRequestBase::OnOKButtonClick ), NULL, this );
 	
 }
+
+wxZRColaTranslationSeqBase::wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizerContent;
+	bSizerContent = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizerTranslationSet;
+	sbSizerTranslationSet = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Translation") ), wxVERTICAL );
+	
+	m_transLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("ZRCola offers multiple text translations that can be arranged in a sequence.\nPlease select desired translations and the order they are applied."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_transLbl->Wrap( 452 );
+	sbSizerTranslationSet->Add( m_transLbl, 0, wxALL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerTranslation;
+	bSizerTranslation = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizerTransAvailable;
+	bSizerTransAvailable = new wxBoxSizer( wxVERTICAL );
+	
+	m_availableLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("A&vailable:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_availableLbl->Wrap( -1 );
+	bSizerTransAvailable->Add( m_availableLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_available = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE|wxLB_SORT ); 
+	m_available->SetMinSize( wxSize( 200,150 ) );
+	
+	bSizerTransAvailable->Add( m_available, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizerTranslation->Add( bSizerTransAvailable, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerTransSelect;
+	bSizerTransSelect = new wxBoxSizer( wxVERTICAL );
+	
+	m_add = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _(">"), wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bSizerTransSelect->Add( m_add, 0, wxALL, 5 );
+	
+	m_remove = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("<"), wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bSizerTransSelect->Add( m_remove, 0, wxALL, 5 );
+	
+	
+	bSizerTranslation->Add( bSizerTransSelect, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizerTransSelected;
+	bSizerTransSelected = new wxBoxSizer( wxVERTICAL );
+	
+	m_selectedLbl = new wxStaticText( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("&Selected:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_selectedLbl->Wrap( -1 );
+	bSizerTransSelected->Add( m_selectedLbl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_selected = new wxListBox( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( 200,-1 ), 0, NULL, wxLB_SINGLE ); 
+	m_selected->SetMinSize( wxSize( 200,150 ) );
+	
+	bSizerTransSelected->Add( m_selected, 1, wxALL|wxEXPAND, 5 );
+	
+	
+	bSizerTranslation->Add( bSizerTransSelected, 1, wxEXPAND, 5 );
+	
+	
+	sbSizerTranslationSet->Add( bSizerTranslation, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizerTransActiveReorder;
+	bSizerTransActiveReorder = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_selectedUp = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Up"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
+	bSizerTransActiveReorder->Add( m_selectedUp, 0, wxALL, 5 );
+	
+	m_selectedDown = new wxButton( sbSizerTranslationSet->GetStaticBox(), wxID_ANY, _("Down"), wxDefaultPosition, wxSize( 70,-1 ), 0 );
+	bSizerTransActiveReorder->Add( m_selectedDown, 0, wxALL, 5 );
+	
+	
+	sbSizerTranslationSet->Add( bSizerTransActiveReorder, 0, wxALIGN_RIGHT, 5 );
+	
+	
+	bSizerContent->Add( sbSizerTranslationSet, 1, wxEXPAND|wxALL, 5 );
+	
+	
+	bSizerContent->Add( 0, 0, 0, wxEXPAND|wxALL, 5 );
+	
+	m_sdbSizerButtons = new wxStdDialogButtonSizer();
+	m_sdbSizerButtonsOK = new wxButton( this, wxID_OK );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsOK );
+	m_sdbSizerButtonsCancel = new wxButton( this, wxID_CANCEL );
+	m_sdbSizerButtons->AddButton( m_sdbSizerButtonsCancel );
+	m_sdbSizerButtons->Realize();
+	
+	bSizerContent->Add( m_sdbSizerButtons, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	this->SetSizer( bSizerContent );
+	this->Layout();
+	bSizerContent->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaTranslationSeqBase::OnInitDialog ) );
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaTranslationSeqBase::OnUpdate ) );
+	m_available->Connect( wxEVT_CHAR, wxKeyEventHandler( wxZRColaTranslationSeqBase::OnAvailableChar ), NULL, this );
+	m_available->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnAvailableDClick ), NULL, this );
+	m_add->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnAdd ), NULL, this );
+	m_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnRemove ), NULL, this );
+	m_selected->Connect( wxEVT_CHAR, wxKeyEventHandler( wxZRColaTranslationSeqBase::OnSelectedChar ), NULL, this );
+	m_selected->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDClick ), NULL, this );
+	m_selectedUp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedUp ), NULL, this );
+	m_selectedDown->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDown ), NULL, this );
+	m_sdbSizerButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnOKButtonClick ), NULL, this );
+}
+
+wxZRColaTranslationSeqBase::~wxZRColaTranslationSeqBase()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxZRColaTranslationSeqBase::OnInitDialog ) );
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxZRColaTranslationSeqBase::OnUpdate ) );
+	m_available->Disconnect( wxEVT_CHAR, wxKeyEventHandler( wxZRColaTranslationSeqBase::OnAvailableChar ), NULL, this );
+	m_available->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnAvailableDClick ), NULL, this );
+	m_add->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnAdd ), NULL, this );
+	m_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnRemove ), NULL, this );
+	m_selected->Disconnect( wxEVT_CHAR, wxKeyEventHandler( wxZRColaTranslationSeqBase::OnSelectedChar ), NULL, this );
+	m_selected->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDClick ), NULL, this );
+	m_selectedUp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedUp ), NULL, this );
+	m_selectedDown->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnSelectedDown ), NULL, this );
+	m_sdbSizerButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxZRColaTranslationSeqBase::OnOKButtonClick ), NULL, this );
+	
+}
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -25,6 +25,7 @@ class wxZRColaCharGrid;
 #include <wx/settings.h>
 #include <wx/aui/aui.h>
 #include <wx/aui/auibar.h>
+#include <wx/choice.h>
 class wxZRColaCharacterCatalogPanel;
 class wxZRColaComposerPanel;
 #include <wx/statusbr.h>
@@ -35,7 +36,6 @@ class wxZRColaComposerPanel;
 #include <wx/panel.h>
 #include <wx/splitter.h>
 #include <wx/timer.h>
-#include <wx/choice.h>
 #include <wx/grid.h>
 #include <wx/checkbox.h>
 #include <wx/srchctrl.h>
@@ -70,7 +70,7 @@ class wxZRColaFrameBase : public wxFrame
 			wxID_SEND_ABORT,
 			wxID_SETTINGS,
 			wxID_TOOLBAR_EDIT,
-			wxID_TOOLBAR_TRANSFORM,
+			wxID_TOOLBAR_TRANSLATE,
 			wxID_PANEL_CHRGRPS,
 			wxID_HELP_INSTRUCTIONS,
 			wxID_HELP_SHORTCUTS,
@@ -87,10 +87,11 @@ class wxZRColaFrameBase : public wxFrame
 		wxAuiToolBarItem* m_toolEditCut; 
 		wxAuiToolBarItem* m_toolEditCopy; 
 		wxAuiToolBarItem* m_toolEditPaste; 
-		wxAuiToolBar* m_toolbarTransform;
+		wxAuiToolBar* m_toolbarTranslate;
 		wxAuiToolBarItem* m_toolCharSelect; 
 		wxAuiToolBarItem* m_toolSendDestination; 
 		wxAuiToolBarItem* m_toolSendSource; 
+		wxChoice* m_toolTranslationSeq;
 		wxZRColaCharacterCatalogPanel* m_panelChrCat;
 		wxStatusBar* m_statusBar;
 		
@@ -98,6 +99,7 @@ class wxZRColaFrameBase : public wxFrame
 		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
 		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
 		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		virtual void OnTranslationSeqChoice( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
@@ -264,16 +266,6 @@ class wxZRColaSettingsBase : public wxDialog
 		wxRadioButton* m_langAuto;
 		wxRadioButton* m_langManual;
 		wxListBox* m_languages;
-		wxPanel* m_panelTransformation;
-		wxStaticText* m_transLabel;
-		wxStaticText* m_transAvailableLabel;
-		wxListBox* m_transAvailable;
-		wxButton* m_transActivate;
-		wxButton* m_transDeactivate;
-		wxStaticText* m_transActiveLabel;
-		wxListBox* m_transActive;
-		wxButton* m_transActiveUp;
-		wxButton* m_transActiveDown;
 		wxPanel* m_panelAutoStart;
 		wxStaticText* m_autoStartLabel;
 		wxCheckBox* m_autoStart;
@@ -285,11 +277,6 @@ class wxZRColaSettingsBase : public wxDialog
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
 		virtual void OnLanguageUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void OnTransformationUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
-		virtual void OnTransActivate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTransDeactivate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTransActiveUp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTransActiveDown( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnApplyButtonClick( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
 		
@@ -381,4 +368,46 @@ class wxZRColaCharRequestBase : public wxDialog
 	
 };

+///////////////////////////////////////////////////////////////////////////////
+/// Class wxZRColaTranslationSeqBase
+///////////////////////////////////////////////////////////////////////////////
+class wxZRColaTranslationSeqBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxStaticText* m_transLbl;
+		wxStaticText* m_availableLbl;
+		wxListBox* m_available;
+		wxButton* m_add;
+		wxButton* m_remove;
+		wxStaticText* m_selectedLbl;
+		wxListBox* m_selected;
+		wxButton* m_selectedUp;
+		wxButton* m_selectedDown;
+		wxStdDialogButtonSizer* m_sdbSizerButtons;
+		wxButton* m_sdbSizerButtonsOK;
+		wxButton* m_sdbSizerButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void OnUpdate( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnAvailableChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnAvailableDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAdd( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemove( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedChar( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedUp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSelectedDown( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxZRColaTranslationSeqBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Custom Translation Sequence"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxZRColaTranslationSeqBase();
+	
+};
+
 #endif //__ZRCOLAGUI_H__
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

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

    This file is part of ZRCola.

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

    This file is part of ZRCola.

@@ -27,7 +27,6 @@
 wxZRColaSettings::wxZRColaSettings(wxWindow* parent) :
    m_lang_auto(true),
    m_lang(ZRCola::langid_t::blank),
-    m_transeq(1, 0), // By default use translation set 0 (ZRCola Decomposed >> ZRCola Composed)
    wxZRColaSettingsBase(parent)
 {
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
@@ -39,18 +38,6 @@ wxZRColaSettings::wxZRColaSettings(wxWindow* parent) :
            label_tran(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
        m_languages->Insert(label_tran, i);
    }
-
-    m_transAvailable->Clear();
-    for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
-        const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[i];
-        wxString
-            src(ts.src(), ts.src_len()),
-            dst(ts.dst(), ts.dst_len()),
-            src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
-            dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
-            label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
-        m_transAvailable->Append(label_tran, (void*)ts.set);
-    }
 }


@@ -73,24 +60,6 @@ void wxZRColaSettings::OnInitDialog(wxInitDialogEvent& event)
    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
    ZRCola::language_db::indexLang::size_type start;
    m_languages->Select(app->m_lang_db.idxLang.find(ZRCola::language_db::language(m_lang), start) ? start : -1);
-
-    m_transActive->Clear();
-    for (auto s = m_transeq.cbegin(), s_end = m_transeq.cend(); s != s_end; ++s) {
-        ZRCola::transet_db::indexTranSet::size_type start;
-        if (app->m_ts_db.idxTranSet.find(ZRCola::transet_db::transet(*s), start)) {
-            const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[start];
-            wxString
-                src(ts.src(), ts.src_len()),
-                dst(ts.dst(), ts.dst_len()),
-                src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
-                dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
-                label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
-            m_transActive->Append(label_tran, (void*)ts.set);
-        } else {
-            wxString label_tran(wxString::Format(_("Unknown transformation (%u)"), (unsigned int)*s));
-            m_transActive->Append(label_tran, (void*)*s);
-        }
-    }
 }


@@ -102,69 +71,6 @@ void wxZRColaSettings::OnLanguageUpdate(wxUpdateUIEvent& event)
 }


-void wxZRColaSettings::OnTransformationUpdate(wxUpdateUIEvent& event)
-{
-    m_transActivate->Enable(m_transAvailable->GetSelection() != wxNOT_FOUND);
-
-    int idx = m_transActive->GetSelection();
-    m_transDeactivate->Enable(idx != wxNOT_FOUND);
-    m_transActiveUp  ->Enable(idx != wxNOT_FOUND && (unsigned int)idx > 0);
-    m_transActiveDown->Enable(idx != wxNOT_FOUND && (unsigned int)idx < m_transActive->GetCount() - 1);
-
-    wxZRColaSettingsBase::OnTransformationUpdate(event);
-}
-
-
-void wxZRColaSettings::OnTransActivate(wxCommandEvent& event)
-{
-    int idx = m_transAvailable->GetSelection();
-    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no available transformation selected"));
-    m_transActive->Append(
-        m_transAvailable->GetString(idx),
-        m_transAvailable->GetClientData(idx));
-
-    wxZRColaSettingsBase::OnTransActivate(event);
-}
-
-
-void wxZRColaSettings::OnTransDeactivate(wxCommandEvent& event)
-{
-    int idx = m_transActive->GetSelection();
-    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no active transformation selected"));
-    m_transActive->Delete(idx);
-
-    wxZRColaSettingsBase::OnTransDeactivate(event);
-}
-
-
-void wxZRColaSettings::OnTransActiveUp(wxCommandEvent& event)
-{
-    int idx = m_transActive->GetSelection();
-    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx > 0, wxT("no or first active transformation selected"));
-    wxString label = m_transActive->GetString(idx);
-    void *data = m_transActive->GetClientData(idx);
-    m_transActive->Delete(idx);
-    m_transActive->Insert(label, idx - 1, data);
-    m_transActive->Select(idx - 1);
-
-    wxZRColaSettingsBase::OnTransActiveUp(event);
-}
-
-
-void wxZRColaSettings::OnTransActiveDown(wxCommandEvent& event)
-{
-    int idx = m_transActive->GetSelection();
-    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx < m_transActive->GetCount() - 1, wxT("no or last active transformation selected"));
-    wxString label = m_transActive->GetString(idx);
-    void *data = m_transActive->GetClientData(idx);
-    m_transActive->Delete(idx);
-    m_transActive->Insert(label, idx + 1, data);
-    m_transActive->Select(idx + 1);
-
-    wxZRColaSettingsBase::OnTransActiveDown(event);
-}
-
-
 void wxZRColaSettings::OnApplyButtonClick(wxCommandEvent& event)
 {
    event.Skip();
@@ -215,19 +121,14 @@ void wxZRColaSettings::OnApplyButtonClick(wxCommandEvent& event)
        if (m_lang != lang.lang) {
            m_lang = lang.lang;

-            // Notify destination text something changed and should re-inverse transform.
+            // Notify destination text something changed and should re-inverse translate.
            wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
            app->m_mainWnd->m_panel->m_destination->ProcessWindowEvent(event2);
        }
    }
-
-    m_transeq.clear();
-    for (unsigned int i = 0, n = m_transActive->GetCount(); i < n; i++)
-        m_transeq.push_back((ZRCola::transetid_t)m_transActive->GetClientData(i));
 }


-
 void wxZRColaSettings::OnOKButtonClick(wxCommandEvent& event)
 {
    wxZRColaSettings::OnApplyButtonClick(event);
@@ -251,12 +152,6 @@ void wxPersistentZRColaSettings::Save() const

    SaveValue(wxT("langAuto"), wnd->m_lang_auto);
    SaveValue(wxT("lang"    ), wxString::FromAscii(wnd->m_lang.data, _countof(wnd->m_lang.data)));
-
-    wxString str;
-    bool first = true;
-    for (auto s = wnd->m_transeq.cbegin(), s_end = wnd->m_transeq.cend(); s != s_end; ++s, first = false)
-        str += wxString::Format(first ? wxT("%u") : wxT("|%u"), *s);
-    SaveValue(wxT("transeq"), str);
 }


@@ -283,22 +178,5 @@ bool wxPersistentZRColaSettings::Restore()
    } else
        wnd->m_lang = ZRCola::langid_t::blank;

-    wxString str;
-    if (RestoreValue(wxT("transeq"), &str)) {
-        std::vector<ZRCola::transetid_t> transeq;
-        for (wxStringTokenizer tok(str, wxT("|")); tok.HasMoreTokens(); ) {
-            unsigned long val = _tcstoul(tok.GetNextToken().c_str(), NULL, 10);
-            for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
-                const ZRCola::transet_db::transet &cg = app->m_ts_db.idxTranSet[i];
-                if (cg.set == val) {
-                    transeq.push_back(val);
-                    break;
-                }
-            }
-        }
-        if (!transeq.empty())
-            wnd->m_transeq = std::move(transeq);
-    }
-
    return wxPersistentDialog::Restore();
 }
--- a/ZRCola/zrcolasettings.h
+++ b/ZRCola/zrcolasettings.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -27,7 +27,6 @@ class wxPersistentZRColaSettings;
 #pragma once

 #include "zrcolagui.h"
-#include <zrcola/translate.h>
 #include <wxex/persist/dialog.h>
 #include <vector>

@@ -45,18 +44,12 @@ public:
 protected:
    virtual void OnInitDialog(wxInitDialogEvent& event);
    virtual void OnLanguageUpdate(wxUpdateUIEvent& event);
-    virtual void OnTransformationUpdate(wxUpdateUIEvent& event);
-    virtual void OnTransActivate(wxCommandEvent& event);
-    virtual void OnTransDeactivate(wxCommandEvent& event);
-    virtual void OnTransActiveUp(wxCommandEvent& event);
-    virtual void OnTransActiveDown(wxCommandEvent& event);
    virtual void OnApplyButtonClick(wxCommandEvent& event);
    virtual void OnOKButtonClick(wxCommandEvent& event);

 public:
-    bool m_lang_auto;                           ///< Is language for inverse translation resolved using currently selected keyboard
-    ZRCola::langid_t m_lang;                    ///< Language for inverse translation
-    std::vector<ZRCola::transetid_t> m_transeq; ///< Transformation set sequence
+    bool m_lang_auto;           ///< Is language for inverse translation resolved using currently selected keyboard
+    ZRCola::langid_t m_lang;    ///< Language for inverse translation
 };


--- a/ZRCola/zrcolatranseq.cpp
+++ b/ZRCola/zrcolatranseq.cpp
@@ -0,0 +1,253 @@
+/*
+    Copyright 2015-2017 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxZRColaTranslationSeq
+//////////////////////////////////////////////////////////////////////////
+
+wxZRColaTranslationSeq::wxZRColaTranslationSeq(wxWindow* parent) :
+    wxZRColaTranslationSeqBase(parent)
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_available->Clear();
+    for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
+        const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[i];
+        wxString
+            src(ts.src(), ts.src_len()),
+            dst(ts.dst(), ts.dst_len()),
+            src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
+            dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
+            label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
+        m_available->Append(label_tran, (void*)ts.set);
+    }
+}
+
+
+void wxZRColaTranslationSeq::OnInitDialog(wxInitDialogEvent& event)
+{
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_selected->Clear();
+    for (auto s = m_transeq.cbegin(), s_end = m_transeq.cend(); s != s_end; ++s) {
+        ZRCola::transet_db::indexTranSet::size_type start;
+        if (app->m_ts_db.idxTranSet.find(ZRCola::transet_db::transet(*s), start)) {
+            const ZRCola::transet_db::transet &ts = app->m_ts_db.idxTranSet[start];
+            wxString
+                src(ts.src(), ts.src_len()),
+                dst(ts.dst(), ts.dst_len()),
+                src_tran(wxGetTranslation(src, wxT("ZRCola-zrcdb"))),
+                dst_tran(wxGetTranslation(dst, wxT("ZRCola-zrcdb"))),
+                label_tran(wxString::Format(wxT("%s \x00bb %s"), src_tran.c_str(), dst_tran.c_str()));
+            m_selected->Append(label_tran, (void*)ts.set);
+        } else {
+            wxString label_tran(wxString::Format(_("Unknown translation (%u)"), (unsigned int)*s));
+            m_selected->Append(label_tran, (void*)*s);
+        }
+    }
+
+    wxZRColaTranslationSeqBase::OnInitDialog(event);
+}
+
+
+void wxZRColaTranslationSeq::OnUpdate(wxUpdateUIEvent& event)
+{
+    m_add->Enable(m_available->GetSelection() != wxNOT_FOUND);
+
+    int idx = m_selected->GetSelection();
+    m_remove      ->Enable(idx != wxNOT_FOUND);
+    m_selectedUp  ->Enable(idx != wxNOT_FOUND && (unsigned int)idx > 0);
+    m_selectedDown->Enable(idx != wxNOT_FOUND && (unsigned int)idx < m_selected->GetCount() - 1);
+
+    wxZRColaTranslationSeqBase::OnUpdate(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAvailableChar(wxKeyEvent& event)
+{
+    if (event.GetRawKeyCode() == VK_INSERT) {
+        int idx = m_available->GetSelection();
+        if (idx != wxNOT_FOUND) {
+            m_selected->Append(
+                m_available->GetString(idx),
+                m_available->GetClientData(idx));
+        }
+    }
+
+    wxZRColaTranslationSeqBase::OnAvailableChar(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAvailableDClick(wxCommandEvent& event)
+{
+    int idx = m_available->GetSelection();
+    if (idx != wxNOT_FOUND) {
+        m_selected->Append(
+            m_available->GetString(idx),
+            m_available->GetClientData(idx));
+    }
+
+    wxZRColaTranslationSeqBase::OnAvailableDClick(event);
+}
+
+
+void wxZRColaTranslationSeq::OnAdd(wxCommandEvent& event)
+{
+    int idx = m_available->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no available translation selected"));
+    m_selected->Append(
+        m_available->GetString(idx),
+        m_available->GetClientData(idx));
+
+    wxZRColaTranslationSeqBase::OnAdd(event);
+}
+
+
+void wxZRColaTranslationSeq::OnRemove(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND, wxT("no active translation selected"));
+    m_selected->Delete(idx);
+
+    wxZRColaTranslationSeqBase::OnRemove(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedChar(wxKeyEvent& event)
+{
+    if (event.GetRawKeyCode() == VK_DELETE) {
+        int idx = m_selected->GetSelection();
+        if (idx != wxNOT_FOUND)
+            m_selected->Delete(idx);
+    }
+
+    wxZRColaTranslationSeqBase::OnSelectedChar(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedDClick(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    if (idx != wxNOT_FOUND)
+        m_selected->Delete(idx);
+
+    wxZRColaTranslationSeqBase::OnSelectedDClick(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedUp(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx > 0, wxT("no or first active translation selected"));
+    wxString label = m_selected->GetString(idx);
+    void *data = m_selected->GetClientData(idx);
+    m_selected->Delete(idx);
+    m_selected->Insert(label, idx - 1, data);
+    m_selected->Select(idx - 1);
+
+    wxZRColaTranslationSeqBase::OnSelectedUp(event);
+}
+
+
+void wxZRColaTranslationSeq::OnSelectedDown(wxCommandEvent& event)
+{
+    int idx = m_selected->GetSelection();
+    wxASSERT_MSG(idx != wxNOT_FOUND && (unsigned int)idx < m_selected->GetCount() - 1, wxT("no or last active translation selected"));
+    wxString label = m_selected->GetString(idx);
+    void *data = m_selected->GetClientData(idx);
+    m_selected->Delete(idx);
+    m_selected->Insert(label, idx + 1, data);
+    m_selected->Select(idx + 1);
+
+    wxZRColaTranslationSeqBase::OnSelectedDown(event);
+}
+
+
+void wxZRColaTranslationSeq::OnApplyButtonClick(wxCommandEvent& event)
+{
+    event.Skip();
+
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    m_transeq.clear();
+    for (unsigned int i = 0, n = m_selected->GetCount(); i < n; i++)
+        m_transeq.push_back(reinterpret_cast<ZRCola::transetid_t>(m_selected->GetClientData(i)));
+
+    // Notify source text something changed and should re-translate.
+    wxCommandEvent event2(wxEVT_COMMAND_TEXT_UPDATED);
+    app->m_mainWnd->m_panel->m_source->ProcessWindowEvent(event2);
+}
+
+
+void wxZRColaTranslationSeq::OnOKButtonClick(wxCommandEvent& event)
+{
+    wxZRColaTranslationSeq::OnApplyButtonClick(event);
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// wxPersistentZRColaTranslationSeq
+//////////////////////////////////////////////////////////////////////////
+
+wxPersistentZRColaTranslationSeq::wxPersistentZRColaTranslationSeq(wxZRColaTranslationSeq *wnd) : wxPersistentDialog(wnd)
+{
+}
+
+
+void wxPersistentZRColaTranslationSeq::Save() const
+{
+    wxPersistentDialog::Save();
+
+    auto wnd = static_cast<const wxZRColaTranslationSeq*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
+
+    wxString str;
+    bool first = true;
+    for (auto s = wnd->m_transeq.cbegin(), s_end = wnd->m_transeq.cend(); s != s_end; ++s, first = false)
+        str += wxString::Format(first ? wxT("%u") : wxT("|%u"), *s);
+    SaveValue(wxT("transeq"), str);
+}
+
+
+bool wxPersistentZRColaTranslationSeq::Restore()
+{
+    auto wnd = dynamic_cast<wxZRColaTranslationSeq*>(GetWindow());
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+
+    wxString str;
+    if (RestoreValue(wxT("transeq"), &str)) {
+        std::vector<ZRCola::transetid_t> transet;
+        for (wxStringTokenizer tok(str, wxT("|")); tok.HasMoreTokens(); ) {
+            unsigned long val = _tcstoul(tok.GetNextToken().c_str(), NULL, 10);
+            for (size_t i = 0, n = app->m_ts_db.idxTranSet.size(); i < n; i++) {
+                const ZRCola::transet_db::transet &cg = app->m_ts_db.idxTranSet[i];
+                if (cg.set == val) {
+                    transet.push_back(val);
+                    break;
+                }
+            }
+        }
+        if (!transet.empty())
+            wnd->m_transeq = std::move(transet);
+    }
+
+    return wxPersistentDialog::Restore();
+}
--- a/ZRCola/zrcolatranseq.h
+++ b/ZRCola/zrcolatranseq.h
@@ -0,0 +1,80 @@
+/*
+    Copyright 2015-2017 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+///
+/// Forward declarations
+///
+class wxZRColaTranslationSeq;
+class wxPersistentZRColaTranslationSeq;
+
+
+#pragma once
+
+#include "zrcolagui.h"
+#include <zrcola/translate.h>
+#include <wxex/persist/dialog.h>
+#include <vector>
+
+
+///
+/// Configuration dialog
+///
+class wxZRColaTranslationSeq : public wxZRColaTranslationSeqBase
+{
+public:
+    wxZRColaTranslationSeq(wxWindow* parent);
+
+    friend class wxPersistentZRColaTranslationSeq;    // Allow saving/restoring window state.
+
+protected:
+    virtual void OnInitDialog(wxInitDialogEvent& event);
+    virtual void OnUpdate(wxUpdateUIEvent& event);
+    virtual void OnAvailableChar(wxKeyEvent& event);
+    virtual void OnAvailableDClick(wxCommandEvent& event);
+    virtual void OnAdd(wxCommandEvent& event);
+    virtual void OnRemove(wxCommandEvent& event);
+    virtual void OnSelectedChar(wxKeyEvent& event);
+    virtual void OnSelectedDClick(wxCommandEvent& event);
+    virtual void OnSelectedUp(wxCommandEvent& event);
+    virtual void OnSelectedDown(wxCommandEvent& event);
+    virtual void OnApplyButtonClick(wxCommandEvent& event);
+    virtual void OnOKButtonClick(wxCommandEvent& event);
+
+public:
+    std::vector<ZRCola::transetid_t> m_transeq; ///< Custom translation set sequence
+};
+
+
+///
+/// Supports saving/restoring wxZRColaTranslationSeq state
+///
+class wxPersistentZRColaTranslationSeq : public wxPersistentDialog
+{
+public:
+    wxPersistentZRColaTranslationSeq(wxZRColaTranslationSeq *wnd);
+
+    virtual void Save() const;
+    virtual bool Restore();
+};
+
+
+inline wxPersistentObject *wxCreatePersistentObject(wxZRColaTranslationSeq *wnd)
+{
+    return new wxPersistentZRColaTranslationSeq(wnd);
+}
--- a/ZRCola/zrcolaupdater.cpp
+++ b/ZRCola/zrcolaupdater.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

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

    This file is part of ZRCola.

--- a/ZRColaCompile/ZRColaCompile.vcxproj
+++ b/ZRColaCompile/ZRColaCompile.vcxproj
@@ -45,6 +45,7 @@
  <ItemGroup>
    <ClCompile Include="dbsource.cpp" />
    <ClCompile Include="main.cpp" />
+    <ClCompile Include="parse.cpp" />
    <ClCompile Include="stdafx.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -52,6 +53,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="dbsource.h" />
+    <ClInclude Include="parse.h" />
    <ClInclude Include="stdafx.h" />
  </ItemGroup>
  <ItemGroup>
--- a/ZRColaCompile/ZRColaCompile.vcxproj.filters
+++ b/ZRColaCompile/ZRColaCompile.vcxproj.filters
@@ -28,6 +28,9 @@
    <ClCompile Include="dbsource.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="parse.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="stdafx.h">
@@ -36,6 +39,9 @@
    <ClInclude Include="dbsource.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="parse.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="ZRColaCompile.rc">
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -249,6 +249,8 @@ ZRCola::DBSource::DBSource()
 ZRCola::DBSource::~DBSource()
 {
    // Manually release all COM objects related to the database before we close the database.
+    m_pTranslationSets1.free();
+    m_comTranslationSets.free();
    m_pTranslation1.free();
    m_comTranslation.free();
    m_pCharacterGroup1.free();
@@ -304,8 +306,8 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
            wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comTranslation)));
            wxVERIFY(SUCCEEDED(m_comTranslation->put_ActiveConnection(variant(m_db))));
            wxVERIFY(SUCCEEDED(m_comTranslation->put_CommandType(adCmdText)));
-            wxVERIFY(SUCCEEDED(m_comTranslation->put_CommandText(bstr(L"SELECT [Komb1] AS [komb], [rang_komb1] AS [rang_komb], [Komb2] AS [znak], [rang_komb2] AS [rang_znak] "
-                L"FROM [VRS_ScriptRepl] "
+            wxVERIFY(SUCCEEDED(m_comTranslation->put_CommandText(bstr(L"SELECT [Komb1] AS [komb], [rang_komb1] AS [rang_komb], '' AS [Kano], 0 AS [Kanoniziraj], [Komb2] AS [znak], [rang_komb2] AS [rang_znak] "
+                L"FROM [VRS_ScriptRepl2] "
                L"WHERE [Script]=? "
                L"ORDER BY [Komb2], [rang_komb2], [rang_komb1], [Komb1]"))));
            {
@@ -317,6 +319,23 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
                wxVERIFY(SUCCEEDED(params->Append(m_pTranslation1)));
            }

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


+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, string& val) const
+{
+    wxASSERT_MSG(f, wxT("field is empty"));
+
+    variant v;
+    wxVERIFY(SUCCEEDED(f->get_Value(&v)));
+    if (V_VT(&v) != VT_NULL) {
+        wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
+
+        WideCharToMultiByte(CP_ACP, 0, V_BSTR(&v), ::SysStringLen(V_BSTR(&v)), val, NULL, NULL);
+    } else
+        val.clear();
+
+    return true;
+}
+
+
 bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, wstring& val) const
 {
    wxASSERT_MSG(f, wxT("field is empty"));
@@ -480,6 +516,42 @@ bool ZRCola::DBSource::GetUnicodeString(const com_obj<ADOField>& f, wstring& str
 }


+bool ZRCola::DBSource::GetNormPerm(const winstd::com_obj<ADOField>& f, normperm& np) const
+{
+    wxASSERT_MSG(f, wxT("field is empty"));
+
+    variant v;
+    wxVERIFY(SUCCEEDED(f->get_Value(&v)));
+    np.clear();
+    if (V_VT(&v) != VT_NULL) {
+        wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
+
+        // Parse the field. Must be "nnnn,nnnn,nnnn..." sequence.
+        for (UINT i = 0, n = ::SysStringLen(V_BSTR(&v)); i < n && V_BSTR(&v)[i];) {
+            // Parse Unicode code.
+            UINT j = 0;
+            std::vector<size_t> p;
+            for (; i < n && V_BSTR(&v)[i]; i++, j++) {
+                if (L'0' <= V_BSTR(&v)[i] && V_BSTR(&v)[i] <= L'9') p.push_back(V_BSTR(&v)[i] - L'0');
+                else break;
+            }
+            if (j <= 0) {
+                bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+                _ftprintf(stderr, wxT("%s: error ZCC0150: Syntax error in \"%.*ls\" field (\"%.*ls\"). Permutation sequence must be at least one decimal digit long.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
+                return false;
+            }
+            np.insert(std::move(p));
+
+            // Skip delimiter(s) and whitespace.
+            for (; i < n && V_BSTR(&v)[i] && (V_BSTR(&v)[i] == L',' || _iswspace_l(V_BSTR(&v)[i], m_locale)); i++);
+        }
+    }
+
+    return true;
+}
+
+
+
 bool ZRCola::DBSource::GetLanguage(const com_obj<ADOField>& f, ZRCola::langid_t& lang) const
 {
    wxASSERT_MSG(f, wxT("field is empty"));
@@ -600,6 +672,59 @@ bool ZRCola::DBSource::GetTagNames(const winstd::com_obj<ADOField>& f, LCID lcid
 }


+bool ZRCola::DBSource::SelectNormPermSets(winstd::com_obj<ADORecordset>& rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
+
+    // Open it.
+    if (FAILED(rs->Open(variant(
+        L"SELECT [oblika], [oblike] "
+        L"FROM [VRS_CharCanoOblike] "
+        L"ORDER BY [oblika], [oblike]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+    {
+        _ftprintf(stderr, wxT("%s: error ZCC0160: Error loading normalization permutation sets from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetNormPerm(const winstd::com_obj<ADORecordset>& rs, std::string& norm, normperm& np) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"oblika"), &f)));
+        wxCHECK(GetValue(f, norm), false);
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"oblike"), &f)));
+        wxCHECK(GetNormPerm(f, np), false);
+    }
+
+    // Verify all lengths match.
+    size_t n = norm.length();
+    for (auto p = np.cbegin(), p_end = np.cend(); p != p_end; ++p) {
+        if (p->size() != n) {
+            _ftprintf(stderr, wxT("%s: error ZCC0170: Inconsistent normalization sequence \"%.*s\" permutation length. Please make sure all permutation lengths match normalization sequence length (%u).\n"), m_filename.c_str(), n, norm.c_str(), n);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
 bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const
 {
    // Create a new recordset.
@@ -608,7 +733,7 @@ bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const

    // Open it.
    if (FAILED(rs->Open(variant(
-        L"SELECT [komb], [rang_komb], [znak], [rang_znak] "
+        L"SELECT [komb], [rang_komb], [Kano], [Kanoniziraj], [znak], [rang_znak] "
        L"FROM [VRS_ReplChar] "
        L"WHERE [rang_komb]=1 "
        L"ORDER BY [znak], [rang_znak], [rang_komb], [komb]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
@@ -662,6 +787,19 @@ bool ZRCola::DBSource::GetTranslation(const com_obj<ADORecordset>& rs, ZRCola::D
        wxCHECK(GetValue(f, t.src.rank), false);
    }

+    {
+        bool norm;
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Kanoniziraj"), &f)));
+        wxCHECK(GetValue(f, norm), false);
+        if (norm) {
+            com_obj<ADOField> f;
+            wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Kano"), &f)));
+            wxCHECK(GetValue(f, t.norm), false);
+        } else
+            t.norm.clear();
+    }
+
    {
        com_obj<ADOField> f;
        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"rang_znak"), &f)));
@@ -687,7 +825,7 @@ bool ZRCola::DBSource::SelectTranlationSets(com_obj<ADORecordset> &rs) const
    // Open it.
    if (FAILED(rs->Open(variant(
        L"SELECT DISTINCT [entCode], [Src_En], [Dst_En] "
-        L"FROM [VRS_Script] "
+        L"FROM [VRS_Script2] "
        L"ORDER BY [entCode], [Src_En], [Dst_En]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
    {
        _ftprintf(stderr, wxT("%s: error ZCC0060: Error loading translation sets from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
@@ -728,6 +866,83 @@ bool ZRCola::DBSource::GetTranslationSet(const com_obj<ADORecordset>& rs, ZRCola
 }


+bool ZRCola::DBSource::SelectTranlationSeqs(com_obj<ADORecordset> &rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
+
+    // Open it.
+    if (FAILED(rs->Open(variant(
+        L"SELECT DISTINCT [ID], [Descr], [Rank] "
+        L"FROM [VRS_Script2Seq] "
+        L"ORDER BY [Rank], [Descr]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+    {
+        _ftprintf(stderr, wxT("%s: error ZCC0060: Error loading translation sequences from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetTranslationSeq(const com_obj<ADORecordset>& rs, ZRCola::DBSource::transeq& ts) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"ID"), &f)));
+        wxCHECK(GetValue(f, ts.seq), false);
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Rank"), &f)));
+        wxCHECK(GetValue(f, ts.rank), false);
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Descr"), &f)));
+        wxCHECK(GetValue(f, ts.name), false);
+    }
+
+    // Read translation sequence sets from database.
+    wxVERIFY(SUCCEEDED(m_pTranslationSets1->put_Value(variant(ts.seq))));
+    com_obj<ADORecordset> rs_chars;
+    wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs_chars)));
+    wxVERIFY(SUCCEEDED(rs_chars->put_CursorLocation(adUseClient)));
+    wxVERIFY(SUCCEEDED(rs_chars->put_CursorType(adOpenForwardOnly)));
+    wxVERIFY(SUCCEEDED(rs_chars->put_LockType(adLockReadOnly)));
+    if (FAILED(rs_chars->Open(variant(m_comTranslationSets), variant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
+        _ftprintf(stderr, wxT("%s: error ZCC0140: Error loading character group characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    {
+        ts.sets.clear();
+        com_obj<ADOFields> flds;
+        wxVERIFY(SUCCEEDED(rs_chars->get_Fields(&flds)));
+        com_obj<ADOField> f_set;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Script"), &f_set)));
+        size_t n = 0;
+        for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext(), n++) {
+            int set;
+            wxCHECK(GetValue(f_set, set), false);
+            ts.sets.push_back(set);
+        }
+    }
+
+    return true;
+}
+
+
 bool ZRCola::DBSource::SelectKeySequences(com_obj<ADORecordset> &rs) const
 {
    // Create a new recordset.
@@ -965,7 +1180,7 @@ bool ZRCola::DBSource::GetCharacterGroup(const com_obj<ADORecordset>& rs, chrgrp
    wxVERIFY(SUCCEEDED(rs_chars->put_CursorType(adOpenForwardOnly)));
    wxVERIFY(SUCCEEDED(rs_chars->put_LockType(adLockReadOnly)));
    if (FAILED(rs_chars->Open(variant(m_comCharacterGroup), variant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
-        _ftprintf(stderr, wxT("%s: error ZCC0100: Error loading character group characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        _ftprintf(stderr, wxT("%s: error ZCC0140: Error loading character group characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
        LogErrors();
        return false;
    }
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -66,6 +66,51 @@ namespace ZRCola {
                str (_str)
            {
            }
+
+            inline charseq(_In_ int _rank, _In_ const std::wstring &_str) :
+                rank(_rank),
+                str (_str)
+            {
+            }
+
+            inline charseq(_In_ int _rank, _Inout_ std::wstring &&_str) :
+                rank(_rank),
+                str (std::move(_str))
+            {
+            }
+
+            inline bool operator==(_In_ const charseq &other) const
+            {
+                return rank == other.rank && str == other.str;
+            }
+
+            inline bool operator!=(_In_ const charseq &other) const
+            {
+                return !operator==(other);
+            }
+
+            inline bool operator<(_In_ const charseq &other) const
+            {
+                     if (rank < other.rank) return true;
+                else if (rank > other.rank) return false;
+                else if (str  < other.str ) return true;
+                else                        return false;
+            }
+
+            inline bool operator<=(_In_ const charseq &other) const
+            {
+                return !operator>(other);
+            }
+
+            inline bool operator>(_In_ const charseq &other) const
+            {
+                return other.operator<(*this);
+            }
+
+            inline bool operator>=(_In_ const charseq &other) const
+            {
+                return !operator<(other);
+            }
        };


@@ -74,9 +119,10 @@ namespace ZRCola {
        ///
        class translation {
        public:
-            int set;        ///< Translation set ID
-            charseq src;    ///< Source sequence
-            charseq dst;    ///< Destination sequence
+            int set;            ///< Translation set ID
+            charseq src;        ///< Source sequence
+            std::string norm;   ///< Normalization footprint
+            charseq dst;        ///< Destination sequence
        };


@@ -91,6 +137,24 @@ namespace ZRCola {
        };


+        ///
+        /// Translation sequence
+        ///
+        class transeq {
+        public:
+            int seq;                ///< ID
+            int rank;               ///< Rank
+            std::wstring name;      ///< Name
+            std::vector<int> sets;  ///< Sets
+        };
+
+
+        ///
+        /// Normalization permutation set
+        ///
+        typedef std::set<std::vector<size_t> > normperm;
+
+
        ///
        /// Key sequence
        ///
@@ -409,6 +473,18 @@ namespace ZRCola {
        ///
        bool GetValue(const winstd::com_obj<ADOField>& f, int& val) const;

+        ///
+        /// Gets string from ZRCola.zrc database
+        ///
+        /// \param[in]  f    Data field
+        /// \param[out] val  Output string value
+        ///
+        /// \returns
+        /// - true when successful
+        /// - false otherwise
+        ///
+        bool GetValue(const winstd::com_obj<ADOField>& f, std::string& val) const;
+
        ///
        /// Gets string from ZRCola.zrc database
        ///
@@ -445,6 +521,18 @@ namespace ZRCola {
        ///
        bool GetUnicodeString(const winstd::com_obj<ADOField>& f, std::wstring& str) const;

+        ///
+        /// Gets encoded normalization permutations from ZRCola.zrc database
+        ///
+        /// \param[in]  f    Data field
+        /// \param[out] str  Output normalization permutation set
+        ///
+        /// \returns
+        /// - true when successful
+        /// - false otherwise
+        ///
+        bool GetNormPerm(const winstd::com_obj<ADOField>& f, normperm& np) const;
+
        ///
        /// Gets language ID from ZRCola.zrc database
        ///
@@ -481,6 +569,29 @@ namespace ZRCola {
        ///
        bool GetTagNames(const winstd::com_obj<ADOField>& f, LCID lcid, std::list<std::wstring>& names) const;

+        ///
+        /// Returns normalization permutation sets
+        ///
+        /// \param[out] rs  Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectNormPermSets(winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns normalization permutation set
+        ///
+        /// \param[in]  rs  Recordset with results
+        /// \param[out] np  Normalization permutation set
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetNormPerm(const winstd::com_obj<ADORecordset>& rs, std::string& norm, normperm& np) const;
+
        ///
        /// Returns character translations
        ///
@@ -539,6 +650,29 @@ namespace ZRCola {
        ///
        bool GetTranslationSet(const winstd::com_obj<ADORecordset>& rs, transet& ts) const;

+        ///
+        /// Returns translation sequences
+        ///
+        /// \param[out] rs  Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectTranlationSeqs(winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns translation sequence data
+        ///
+        /// \param[in]  rs    Recordset with results
+        /// \param[out] lang  Language
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetTranslationSeq(const winstd::com_obj<ADORecordset>& rs, transeq& ts) const;
+
        ///
        /// Returns key sequences
        ///
@@ -734,6 +868,9 @@ namespace ZRCola {
        winstd::com_obj<ADOCommand> m_comTranslation;       ///< ADO Command for SelectTranslations subquery
        winstd::com_obj<ADOParameter> m_pTranslation1;      ///< \c m_comTranslations parameter

+        winstd::com_obj<ADOCommand> m_comTranslationSets;   ///< ADO Command for GetTranslationSeq subquery
+        winstd::com_obj<ADOParameter> m_pTranslationSets1;  ///< \c m_comTranslationSets parameter
+
        std::set<std::wstring> m_terms_ignore;  ///< Terms to ignore when comparing characters
    };
 };
@@ -742,7 +879,7 @@ namespace ZRCola {
 inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _In_ const ZRCola::DBSource::translation &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.set && rec.set <= (int)0x00007fff, wxT("translation set index out of bounds"));
+    wxASSERT_MSG((int)0xffff8000 <= rec.set && rec.set <= (int)0x00007fff, wxT("translation set id out of bounds"));
    db.data.push_back((unsigned __int16)rec.set);
    wxASSERT_MSG((int)0xffff8000 <= rec.dst.rank && rec.dst.rank <= (int)0x00007fff, wxT("destination character rank out of bounds"));
    db.data.push_back((unsigned __int16)rec.dst.rank);
@@ -766,7 +903,7 @@ inline ZRCola::translation_db& operator<<(_Inout_ ZRCola::translation_db &db, _I
 inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const ZRCola::DBSource::transet &rec)
 {
    unsigned __int32 idx = db.data.size();
-    wxASSERT_MSG((int)0xffff8000 <= rec.set && rec.set <= (int)0x00007fff, wxT("translation set index out of bounds"));
+    wxASSERT_MSG((int)0xffff8000 <= rec.set && rec.set <= (int)0x00007fff, wxT("translation set id out of bounds"));
    db.data.push_back((unsigned __int16)rec.set);
    std::wstring::size_type n = rec.src.length();
    wxASSERT_MSG(n <= 0xffff, wxT("translation set source name overflow"));
@@ -782,6 +919,28 @@ inline ZRCola::transet_db& operator<<(_Inout_ ZRCola::transet_db &db, _In_ const
 }


+inline ZRCola::transeq_db& operator<<(_Inout_ ZRCola::transeq_db &db, _In_ const ZRCola::DBSource::transeq &rec)
+{
+    unsigned __int32 idx = db.data.size();
+    wxASSERT_MSG((int)0xffff8000 <= rec.seq && rec.seq <= (int)0x00007fff, wxT("translation sequence id out of bounds"));
+    db.data.push_back((unsigned __int16)rec.seq);
+    wxASSERT_MSG((int)0xffff8000 <= rec.rank && rec.rank <= (int)0x00007fff, wxT("translation rank id out of bounds"));
+    db.data.push_back((unsigned __int16)rec.rank);
+    std::wstring::size_type n = rec.name.length();
+    wxASSERT_MSG(n <= 0xffff, wxT("translation sequence name overflow"));
+    db.data.push_back((unsigned __int16)n);
+    n += rec.sets.size();
+    wxASSERT_MSG(n <= 0xffff, wxT("translation sequence sets overflow"));
+    db.data.push_back((unsigned __int16)n);
+    db.data.insert(db.data.end(), rec.name.cbegin(), rec.name.cend());
+    db.data.insert(db.data.end(), rec.sets.cbegin(), rec.sets.cend());
+    db.idxTranSeq.push_back(idx);
+    db.idxRank   .push_back(idx);
+
+    return db;
+}
+
+
 inline ZRCola::keyseq_db& operator<<(_Inout_ ZRCola::keyseq_db &db, _In_ const ZRCola::DBSource::keyseq &rec)
 {
    unsigned __int32 idx = db.data.size();
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

@@ -27,69 +27,195 @@ using namespace winstd;
 ///
 /// (destination character rank, (source character rank, source character)) data holder
 ///
-typedef pair<int, ZRCola::DBSource::charseq> com_translation;
+class com_translation
+{
+public:
+    int rank_src;                   ///< Source sequence rank
+    int rank_dst;                   ///< Destination character rank
+    string norm;                    ///< Normalization footprint

-
-///
-/// Functor to compare two translations
-///
-struct translation_set_less {
-    inline bool operator()(_In_ const com_translation& a, _In_ const com_translation& b) const
+    inline com_translation()
    {
-             if (a.first       < b.first      ) return true;
-        else if (a.first       > b.first      ) return false;
-        else if (a.second.rank < b.second.rank) return true;
-        else if (a.second.rank > b.second.rank) return false;
-        else if (a.second.str  < b.second.str ) return true;
-        else                                    return false;
+    }
+
+    inline com_translation(int _rank_src, int _rank_dst) :
+        rank_src(_rank_src),
+        rank_dst(_rank_dst)
+    {
+    }
+
+    inline com_translation(int _rank_src, int _rank_dst, const char *_norm) :
+        rank_src(_rank_src),
+        rank_dst(_rank_dst),
+        norm    (_norm    )
+    {
+    }
+
+    inline com_translation(int _rank_src, int _rank_dst, string &&_norm) :
+        rank_src(          _rank_src ),
+        rank_dst(          _rank_dst ),
+        norm    (std::move(_norm    ))
+    {
+    }
+
+    inline com_translation(const com_translation &other) :
+        rank_src(other.rank_src),
+        rank_dst(other.rank_dst),
+        norm    (other.norm    )
+    {
+    }
+
+    inline com_translation(com_translation &&other) :
+        rank_src(          other.rank_src ),
+        rank_dst(          other.rank_dst ),
+        norm    (std::move(other.norm    ))
+    {
+    }
+
+    inline com_translation& operator=(const com_translation &other)
+    {
+        if (this != std::addressof(other)) {
+            rank_src = other.rank_src;
+            rank_dst = other.rank_dst;
+            norm     = other.norm    ;
+        }
+        return *this;
+    }
+
+    inline com_translation& operator=(com_translation &&other)
+    {
+        if (this != std::addressof(other)) {
+            rank_src =           other.rank_src ;
+            rank_dst =           other.rank_dst ;
+            norm     = std::move(other.norm    );
+        }
+        return *this;
+    }
+
+    inline bool operator==(_In_ const com_translation& other) const
+    {
+        return
+            rank_src == other.rank_src &&
+            rank_dst == other.rank_dst &&
+            norm     == other.norm;
+    }
+
+    inline bool operator!=(_In_ const com_translation &other) const
+    {
+        return !operator==(other);
+    }
+
+    inline bool operator<(_In_ const com_translation& other) const
+    {
+             if (rank_src < other.rank_src) return true;
+        else if (rank_src > other.rank_src) return false;
+        else if (rank_dst < other.rank_dst) return true;
+        else if (rank_dst > other.rank_dst) return false;
+        else if (norm     < other.norm    ) return true;
+        else                                return false;
+    }
+
+    inline bool operator<=(_In_ const com_translation &other) const
+    {
+        return !operator>(other);
+    }
+
+    inline bool operator>(_In_ const com_translation &other) const
+    {
+        return other.operator<(*this);
+    }
+
+    inline bool operator>=(_In_ const com_translation &other) const
+    {
+        return !operator<(other);
    }
 };


-typedef map<wstring, set<com_translation, translation_set_less> > translation_db;
+typedef map<wstring, map<wstring, com_translation> > translation_db;
+typedef map<string, ZRCola::DBSource::normperm> normperm_db;


-static set<wstring> translate_inv(_In_ const translation_db &db, _In_z_ const wchar_t *str, _Inout_ set<translation_db::key_type> &path)
+static        set<ZRCola::DBSource::charseq>               translate_inv(_In_ const translation_db &db_trans, _In_ const normperm_db &db_np, _In_z_ const wchar_t *str,                          _Inout_ set<translation_db::key_type> &path);
+static inline set<ZRCola::DBSource::charseq> permutate_and_translate_inv(_In_ const translation_db &db_trans, _In_ const normperm_db &db_np, _In_z_ const wchar_t *str, _In_z_ const char *norm, _Inout_ set<translation_db::key_type> &path);
+
+
+static set<ZRCola::DBSource::charseq> translate_inv(_In_ const translation_db &db_trans, _In_ const normperm_db &db_np, _In_z_ const wchar_t *str, _Inout_ set<translation_db::key_type> &path)
 {
-    set<wstring> res;
+    set<ZRCola::DBSource::charseq> res;

-    if (*str) {
-        // Inverse translate remainder first.
-        auto rem = translate_inv(db, str + 1, path);
-        if (rem.empty())
-            return res;
-
-        translation_db::key_type _str(1, *str);
-        auto const t = db.find(_str);
-        if (t != db.end()) {
-            // Current characted inverse translated. Iterate all possible inverse translations and combine them with the remainder.
-            auto p = path.insert(_str);
-            if (!p.second) {
-                // Path already contains this character: Cycle detected!
-                return res;
-            }
-            for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
-                auto src = translate_inv(db, d->second.str.c_str(), path);
-                if (!src.empty()) {
-                    for (auto dd = src.cbegin(), dd_end = src.cend(); dd != dd_end; ++dd) {
-                        for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
-                            res.insert(*dd + *r);
-                    }
-                } else {
-                    // Cycle detected. Do not continue inverse translation.
-                    for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
-                        res.insert(_str + *r);
-                }
-            }
-            path.erase(p.first);
-        } else {
-            // Current character is non-inverse translatable. Combine it with the remainder(s).
-            for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
-                res.insert(_str + *r);
-        }
-    } else {
+    if (!*str) {
        // Empty string results in empty inverse translation.
-        res.insert(L"");
+        res.insert(ZRCola::DBSource::charseq(0, L""));
+        return res;
+    }
+
+    // Prepare inverse translate of the remainder string (without the first character).
+    auto res_rem = translate_inv(db_trans, db_np, str + 1, path);
+    if (res_rem.empty())
+        return res;
+
+    // See if first character is inverse translatable.
+    translation_db::key_type chr(1, *str);
+    auto const hit_trans = db_trans.find(chr);
+    if (hit_trans != db_trans.end()) {
+        // Current character is inverse translatable.
+
+        // Add the current character to the path before recursing.
+        auto hit_path = path.insert(chr);
+        if (!hit_path.second) {
+            // Path already contains this character: Cycle detected!
+            return res;
+        }
+
+        // Iterate all possible character inverse translations and combine them with the remainder string inverse translations.
+        for (auto d = hit_trans->second.cbegin(), d_end = hit_trans->second.cend(); d != d_end; ++d) {
+            auto res_chr = d->second.norm.empty() ?
+                                  translate_inv(db_trans, db_np, d->first.c_str(),                         path) :
+                    permutate_and_translate_inv(db_trans, db_np, d->first.c_str(), d->second.norm.c_str(), path);
+            if (!res_chr.empty()) {
+                for (auto r_chr = res_chr.cbegin(), r_chr_end = res_chr.cend(); r_chr != r_chr_end; ++r_chr) {
+                    for (auto r_rem = res_rem.cbegin(), r_rem_end = res_rem.cend(); r_rem != r_rem_end; ++r_rem)
+                        res.insert(ZRCola::DBSource::charseq(d->second.rank_src + r_chr->rank + r_rem->rank, r_chr->str + r_rem->str));
+                }
+            } else {
+                // Cycle detected. Do not continue inverse translation.
+                for (auto r_rem = res_rem.cbegin(), r_end = res_rem.cend(); r_rem != r_end; ++r_rem)
+                    res.insert(ZRCola::DBSource::charseq(r_rem->rank, chr + r_rem->str));
+            }
+        }
+
+        // Remove the current character from the path.
+        path.erase(hit_path.first);
+    } else {
+        // First character is non-inverse translatable. Combine it with the remainder(s).
+        for (auto r_rem = res_rem.cbegin(), r_end = res_rem.cend(); r_rem != r_end; ++r_rem)
+            res.insert(ZRCola::DBSource::charseq(r_rem->rank, chr + r_rem->str));
+    }
+
+    return res;
+}
+
+
+static inline set<ZRCola::DBSource::charseq> permutate_and_translate_inv(_In_ const translation_db &db_trans, _In_ const normperm_db &db_np, _In_z_ const wchar_t *str, _In_z_ const char *norm, _Inout_ set<translation_db::key_type> &path)
+{
+    // Primary permutation inverse translate.
+    auto res = translate_inv(db_trans, db_np, str, path);
+
+    // Secondary permutation(s).
+    auto const hit_np = db_np.find(norm);
+    if (hit_np != db_np.end()) {
+        for (auto perm = hit_np->second.cbegin(), perm_end = hit_np->second.cend(); perm != perm_end; ++perm) {
+            // Prepare permutated string.
+            translation_db::mapped_type::key_type str_perm;
+            for (auto idx = perm->cbegin(), idx_end = perm->cend(); idx != idx_end; ++idx)
+                str_perm += str[*idx];
+
+            // Secondary permutation inverse translate.
+            auto res_perm = translate_inv(db_trans, db_np, str_perm.c_str(), path);
+            for (auto r = res_perm.begin(), r_end = res_perm.end(); r != r_end; ++r)
+                res.insert(ZRCola::DBSource::charseq(r->rank + 1, std::move(r->str)));
+        }
    }

    return res;
@@ -175,6 +301,35 @@ int _tmain(int argc, _TCHAR *argv[])
    streamoff dst_start = idrec::open<ZRCola::recordid_t, ZRCola::recordsize_t>(dst, ZRCOLA_DB_ID);

    ZRCola::translation_db db_trans;
+    normperm_db db_np;
+
+    {
+        // Get normalization permutation sets.
+        com_obj<ADORecordset> rs;
+        if (src.SelectNormPermSets(rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                string norm;
+                ZRCola::DBSource::normperm np;
+
+                // Parse normalization permutation sets.
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read normalization permutation set from the database.
+                    if (src.GetNormPerm(rs, norm, np)) {
+                        if (!np.empty())
+                            db_np.insert(pair<string, ZRCola::DBSource::normperm>(norm, std::move(np)));
+                    } else
+                        has_errors = true;
+                }
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0009: Error getting translation set count from database or too many translation sets.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0008: Error getting translation sets from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }

    {
        // Get translations.
@@ -189,13 +344,14 @@ int _tmain(int argc, _TCHAR *argv[])
                    ZRCola::DBSource::translation trans;
                    if (src.GetTranslation(rs, trans)) {
                        // Add translation to temporary database.
-                        auto const t = db_temp1.find(trans.dst.str);
-                        if (t != db_temp1.end())
-                            t->second.insert(com_translation(trans.dst.rank, std::move(trans.src)));
+                        pair<translation_db::mapped_type::key_type, translation_db::mapped_type::mapped_type> ctp(std::move(trans.src.str), translation_db::mapped_type::mapped_type(trans.src.rank, trans.dst.rank, std::move(trans.norm)));
+                        auto hit = db_temp1.find(trans.dst.str);
+                        if (hit != db_temp1.end())
+                            hit->second.insert(std::move(ctp));
                        else {
-                            translation_db::mapped_type d;
-                            d.insert(com_translation(trans.dst.rank, std::move(trans.src)));
-                            db_temp1.insert(std::move(pair<translation_db::key_type, translation_db::mapped_type>(trans.dst.str, std::move(d))));
+                            translation_db::mapped_type t;
+                            t.insert(std::move(ctp));
+                            db_temp1.insert(pair<translation_db::key_type, translation_db::mapped_type>(std::move(trans.dst.str), std::move(t)));
                        }
                    } else
                        has_errors = true;
@@ -204,22 +360,25 @@ int _tmain(int argc, _TCHAR *argv[])
                // Inverse translate source sequences down to non-inverse translatable characters.
                translation_db db_temp2;
                for (auto t1 = db_temp1.cbegin(), t1_end = db_temp1.cend(); t1 != t1_end; ++t1) {
+                    auto t2 = db_temp2.insert(pair<translation_db::key_type, translation_db::mapped_type>(t1->first, translation_db::mapped_type())).first;
+
                    for (auto d1 = t1->second.cbegin(), d1_end = t1->second.cend(); d1 != d1_end; ++d1) {
                        set<translation_db::key_type> path;
                        path.insert(t1->first);
-                        auto str = translate_inv(db_temp1, d1->second.str.c_str(), path);
-                        assert(!str.empty());
+                        auto res = d1->second.norm.empty() ?
+                                          translate_inv(db_temp1, db_np, d1->first.c_str(),                          path) :
+                            permutate_and_translate_inv(db_temp1, db_np, d1->first.c_str(), d1->second.norm.c_str(), path);
+                        assert(!res.empty());

                        // Add translation to temporary database.
-                        auto const t2 = db_temp2.find(t1->first);
-                        if (t2 != db_temp2.end()) {
-                            for (auto s = str.cbegin(), s_end = str.cend(); s != s_end; ++s)
-                                t2->second.insert(com_translation(d1->first, std::move(ZRCola::DBSource::charseq(d1->second.rank, s->c_str()))));
-                        } else {
-                            translation_db::mapped_type d2;
-                            for (auto s = str.cbegin(), s_end = str.cend(); s != s_end; ++s)
-                                d2.insert(com_translation(d1->first, std::move(ZRCola::DBSource::charseq(d1->second.rank, s->c_str()))));
-                            db_temp2.insert(std::move(pair<translation_db::key_type, translation_db::mapped_type>(t1->first, std::move(d2))));
+                        for (auto r = res.begin(), r_end = res.end(); r != r_end; ++r) {
+                            translation_db::mapped_type::mapped_type ct(d1->second.rank_src + r->rank, d1->second.rank_dst);
+                            auto hit = t2->second.find(r->str);
+                            if (hit != t2->second.end()) {
+                                hit->second.rank_src = std::min<int>(hit->second.rank_src, ct.rank_src);
+                                hit->second.rank_dst = std::max<int>(hit->second.rank_dst, ct.rank_dst);
+                            } else
+                                t2->second.insert(pair<translation_db::mapped_type::key_type, translation_db::mapped_type::mapped_type>(std::move(r->str), std::move(ct)));
                        }
                    }
                }
@@ -236,9 +395,9 @@ int _tmain(int argc, _TCHAR *argv[])
                    // Add translation to index and data.
                    trans.dst.str = std::move(t->first);
                    for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
-                        trans.dst.rank = d->first;
-                        trans.src.rank = d->second.rank;
-                        trans.src.str  = std::move(d->second.str);
+                        trans.dst.rank = d->second.rank_dst;
+                        trans.src.rank = d->second.rank_src;
+                        trans.src.str  = std::move(d->first);
                        db_trans << trans;
                    }
                }
@@ -262,8 +421,8 @@ int _tmain(int argc, _TCHAR *argv[])
                ZRCola::transet_db db;

                // Preallocate memory.
-                db.idxTranSet.reserve(count);
-                db.data      .reserve(count*4);
+                db.idxTranSet.reserve((count+1));
+                db.data      .reserve((count+1)*4);

                // Add (de)composing translation set to index and data.
                ts.set = 0;
@@ -337,6 +496,58 @@ int _tmain(int argc, _TCHAR *argv[])
    // Write translations to file.
    dst << ZRCola::translation_rec(db_trans);

+    {
+        // Get translation sequences.
+        com_obj<ADORecordset> rs;
+        if (src.SelectTranlationSeqs(rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                ZRCola::DBSource::transeq ts;
+                ZRCola::transeq_db db;
+
+                // Preallocate memory.
+                db.idxTranSeq.reserve((count+1));
+                db.idxRank   .reserve((count+1));
+                db.data      .reserve((count+1)*4);
+
+                // Add basic ZRCola translation sequence to index and data.
+                ts.seq  = 0;
+                ts.rank = 0;
+                ts.name = L"ZRCola (De)composition";
+                ts.sets.push_back(0);
+                db << ts;
+                if (build_pot)
+                    pot.insert(ts.name);
+
+                // Parse translation sequences and build index and data.
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read translation sequence from the database.
+                    if (src.GetTranslationSeq(rs, ts)) {
+                        if (build_pot)
+                            pot.insert(ts.name);
+
+                        // Add translation sequence to index and data.
+                        db << ts;
+                    } else
+                        has_errors = true;
+                }
+
+                // Sort indices.
+                db.idxTranSeq.sort();
+                db.idxRank   .sort();
+
+                // Write translation sequences to file.
+                dst << ZRCola::transeq_rec(db);
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0025: Error getting translation sequence count from database or too many translation sequences.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0024: Error getting translation sequences from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
    {
        // Get key sequences.
        com_obj<ADORecordset> rs;
--- a/ZRColaCompile/parse.cpp
+++ b/ZRColaCompile/parse.cpp
@@ -0,0 +1,212 @@
+/*
+    Copyright 2017 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
+
+using namespace std;
+using namespace stdex;
+using namespace winstd;
+
+
+//////////////////////////////////////////////////////////////////////////
+// ZRCola::DecompParser
+//////////////////////////////////////////////////////////////////////////
+
+ZRCola::DecompParser::DecompParser(_In_ const std::wstring &decomposed) : m_decomposed(decomposed)
+{
+    if (m_decomposed.empty()) {
+        m_sym = 0;
+        m_idx = 0;
+    } else {
+        m_sym = m_decomposed[0];
+        m_idx = 1;
+    }
+}
+
+
+void ZRCola::DecompParser::ParsePrefixes(_Inout_ std::vector<wchar_t> &prefix)
+{
+    for (;;) {
+        if (
+            m_sym == 0x203F                    || // Undertie
+            0xE0F0 <= m_sym && m_sym <= 0xE0F3 || // 1st Set of Prefix Modifiers
+            m_sym == 0xE0F6                    || // Above
+            m_sym == 0xE0F7                    || // Below
+            0xE0F8 <= m_sym && m_sym <= 0xE0FC)   // 2nd Set of Prefix Modifiers
+        {
+            // Prefix modifier
+            prefix.push_back(m_sym);
+            NextChar();
+        } else
+            break;
+    }
+}
+
+
+void ZRCola::DecompParser::ParseModifiers(_Inout_ std::vector<wchar_t> &mod)
+{
+    for (;;) {
+        if (0xE000 <= m_sym && m_sym <= 0xE05B || // 1st Set of Modifiers
+            0xE063 <= m_sym && m_sym <= 0xE0BE || // 2nd Set of Modifiers
+            m_sym == 0x0023                    || // Number Sign
+            m_sym == 0x003A                    || // Colon
+            m_sym == 0x02DE                    || // Rhotic Hook
+            m_sym == 0x2019                    || // Right Single Quotation Mark
+            0x02B0 <= m_sym && m_sym <= 0x02FF || // Standard Unicode Modifiers
+            m_sym == 0xE0C0                    || // Circle
+            m_sym == 0xE0C2                    || // Square
+            m_sym == 0xE0CA                    || // Diamond
+            m_sym == 0xE0CD)                      // Not Circle
+        {
+            mod.push_back(m_sym);
+            NextChar();
+        } else
+            break;
+    }
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseParentheses(_In_ wchar_t open, _In_ wchar_t close)
+{
+    if (m_sym == open) {
+        // Parenthesis Start
+        NextChar();
+        if (m_sym == 0xE037) {
+            // EVA Parenthesis End
+            unique_ptr<Character> res(new Character(close));
+            NextChar();
+            return res.release();
+        } else {
+            unique_ptr<Parentheses> res(new Parentheses(open, close, ParseExpression()));
+            if (m_sym == close) {
+                // Parenthesis End
+                NextChar();
+            } else if (m_sym == open && m_idx < m_decomposed.length() && m_decomposed[m_idx] == 0xE037) {
+                // Decomposed Parenthesis End
+                NextChar();
+                NextChar();
+            } else
+                throw invalid_argument(string_printf("%lc is unexpected. Should end with %lc.", m_sym, close));
+            return res.release();
+        }
+    } else
+        return NULL;
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseCharacter()
+{
+    Expression *res_p;
+    if ((res_p = ParseParentheses(0xE0C5, 0xE0C6)) != NULL || // Superscript
+        (res_p = ParseParentheses(0xE0CE, 0xE0CF)) != NULL || // Subscript
+        (res_p = ParseParentheses(0xE2E0, 0xE2E1)) != NULL || // EVA Double
+        (res_p = ParseParentheses(0xE2E2, 0xE2E3)) != NULL || // EVA Condensed
+        (res_p = ParseParentheses(0xE2E4, 0xE2E5)) != NULL || // EVA Emphasis
+        (res_p = ParseParentheses(0xE2E6, 0xE2E7)) != NULL || // EVA Strike
+        (res_p = ParseParentheses(0xE2E8, 0xE2E9)) != NULL || // EVA Undeal
+        (res_p = ParseParentheses(0xE2EA, 0xE2EB)) != NULL || // EVA Italic
+        (res_p = ParseParentheses(0xE2EC, 0xE2ED)) != NULL || // EVA Superscript
+        (res_p = ParseParentheses(0xE2EE, 0xE2EF)) != NULL)   // EVA Subscript
+    {
+        return res_p;
+    }
+
+    unique_ptr<Character> res(new Character());
+
+    ParsePrefixes(res->m_prefix);
+
+    if (m_sym < 0xE000 || 0xE0FC < m_sym ||
+        m_sym == 0xE0D6 ||                      // Clockwise Top Semicircle Arrow
+        m_sym == 0xE0D7)                        // Anticlockwise Top Semicircle Arrow
+    {
+        // Base Character
+        res->m_char = m_sym;
+        NextChar();
+    }
+
+    ParseModifiers(res->m_mod);
+
+    return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseTerm()
+{
+    unique_ptr<Ligature> res(new Ligature(ParseCharacter()));
+    while (m_sym == 0xE0C4) {
+        // Ligature
+        std::unique_ptr<Ligature::Element> res2(new Ligature::Element(m_sym));
+        NextChar();
+        ParseModifiers(res2->m_mod);
+        res2->m_el.reset(ParseCharacter());
+        res->m_rest.push_back(std::move(res2));
+    }
+
+    if (res->m_rest.empty()) {
+        // A ligature of, well one single character, is rather a character alone.
+        return res->m_first.release();
+    } else
+        return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::ParseExpression()
+{
+    unique_ptr<Expression> res(ParseTerm());
+    if (0xE05C <= m_sym && m_sym <= 0xE062 ||
+        m_sym == 0xE0C1                    || // Two Characters in Circle
+        m_sym == 0xE0C3                    || // Two Characters in Square
+        m_sym == 0xE0C7                    || // Breved below
+        m_sym == 0xE0CB                    || // Inverse tilded
+        m_sym == 0xE0CC                    || // Diagonally Barred
+        0xE0D0 <= m_sym && m_sym <= 0xE0D5)
+    {
+        // Joiner of two terms
+        unique_ptr<Joined2> res_j(new Joined2(m_sym, res.release()));
+        NextChar();
+
+        ParseModifiers(res_j->m_mod);
+
+        res_j->m_second.reset(ParseTerm());
+        return res_j.release();
+    } else if (
+        m_sym == 0xE0C8 || // Inverse breved
+        m_sym == 0xE0C9)   // Breved below
+    {
+        // Joiner of three terms
+        unique_ptr<Joined3> res_j(new Joined3(m_sym, res.release()));
+        NextChar();
+
+        ParseModifiers(res_j->m_mod);
+
+        res_j->m_second.reset(ParseTerm());
+        res_j->m_third.reset(ParseTerm());
+        return res_j.release();
+    } else
+        return res.release();
+}
+
+
+ZRCola::DecompParser::Expression* ZRCola::DecompParser::Parse()
+{
+    unique_ptr<Expression> res(ParseExpression());
+    if (m_sym)
+        throw invalid_argument("Unexpected trailing character(s).");
+    return res.release();
+}
--- a/ZRColaCompile/parse.h
+++ b/ZRColaCompile/parse.h
@@ -0,0 +1,154 @@
+/*
+    Copyright 2017 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <sal.h>
+#include <list>
+#include <memory>
+#include <string>
+#include <vector>
+
+
+namespace ZRCola {
+    ///
+    /// Decomposed sequence parser
+    ///
+    class DecompParser
+    {
+    public:
+        ///
+        /// Base class for expressions
+        ///
+        class Expression
+        {
+        };
+
+
+        ///
+        /// Expression in "parentheses"
+        ///
+        class Parentheses : public Expression
+        {
+        public:
+            inline Parentheses(_In_opt_ wchar_t open = 0, _In_opt_ wchar_t close = 0, _In_opt_ Expression *expr = NULL) : m_open(open), m_close(close), m_expr(expr) {}
+
+        public:
+            wchar_t m_open, m_close;
+            std::unique_ptr<Expression> m_expr;
+        };
+
+
+        ///
+        /// Operator
+        ///
+        class Operator : public Expression
+        {
+        public:
+            inline Operator(_In_opt_ wchar_t chr = 0) : m_char(chr) {}
+
+            wchar_t m_char;
+            std::vector<wchar_t> m_mod;
+        };
+
+
+        ///
+        /// Character
+        ///
+        class Character : public Operator
+        {
+        public:
+            inline Character(_In_opt_ wchar_t chr = 0) : Operator(chr) {}
+
+            std::vector<wchar_t> m_prefix;
+        };
+
+
+        ///
+        /// Ligature
+        ///
+        class Ligature : public Expression
+        {
+        public:
+            class Element : public Operator
+            {
+            public:
+                inline Element(_In_opt_ wchar_t chr = 0) : Operator(chr) {}
+
+                std::unique_ptr<Expression> m_el;
+            };
+
+            inline Ligature(_In_opt_ Expression *first = NULL) : m_first(first) {}
+
+            std::unique_ptr<Expression> m_first;
+            std::list<std::unique_ptr<Element> > m_rest;
+        };
+
+
+        ///
+        /// Two joined terms
+        ///
+        class Joined2 : public Operator
+        {
+        public:
+            Joined2(_In_opt_ wchar_t chr = 0, _In_opt_ Expression *first = NULL) : Operator(chr), m_first(first) {}
+
+            std::unique_ptr<Expression> m_first, m_second;
+        };
+
+
+        ///
+        /// Three joined terms
+        ///
+        class Joined3 : public Joined2
+        {
+        public:
+            Joined3(_In_opt_ wchar_t chr = 0, _In_opt_ Expression *first = NULL) : Joined2(chr, first) {}
+
+            std::unique_ptr<Expression> m_third;
+        };
+
+
+    public:
+        DecompParser(_In_ const std::wstring &decomposed);
+
+    protected:
+        inline void NextChar();
+        void ParsePrefixes(_Inout_ std::vector<wchar_t> &prefix);
+        void ParseModifiers(_Inout_ std::vector<wchar_t> &mod);
+        Expression* ParseParentheses(_In_ wchar_t open, _In_ wchar_t close);
+        Expression* ParseCharacter();
+        Expression* ParseTerm();
+        Expression* ParseExpression();
+
+    public:
+        Expression* Parse();
+
+    protected:
+        std::wstring::size_type m_idx;      ///< Index of current character
+        const std::wstring &m_decomposed;   ///< Decomposed character sequence to analyse
+        wchar_t m_sym;                      ///< Current character
+    };
+}
+
+
+inline void ZRCola::DecompParser::NextChar()
+{
+    m_sym = m_idx < m_decomposed.length() ? m_decomposed[m_idx++] : 0;
+}
--- a/ZRColaCompile/stdafx.cpp
+++ b/ZRColaCompile/stdafx.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

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

    This file is part of ZRCola.

@@ -21,6 +21,7 @@

 #include "../include/version.h"
 #include "dbsource.h"
+#include "parse.h"

 #include <wx/app.h>
 #include <wx/cmdline.h>
--- a/ZRColaInstall/main.cpp
+++ b/ZRColaInstall/main.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis

    This file is part of ZRCola.

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

    This file is part of ZRCola.

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

    This file is part of ZRCola.

--- a/bin/InstFont.wsf
+++ b/bin/InstFont.wsf
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of InstFont.

@@ -48,189 +48,216 @@ InstFont.wsf &quot;My Font.ttf&quot;
 	</job>

 <signature>
-** SIG ** MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQExCzAJBgUr
+** SIG ** MIIbHwYJKoZIhvcNAQcCoIIbEDCCGwwCAQExCzAJBgUr
 ** SIG ** DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 ** SIG ** gjcCAR4wJAIBAQQQcAVhGs441BGiowAQS9NQkAIBAAIB
-** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFNL+bGyMrtii
-** SIG ** oST8R/nqIRfyOmVJoIISyDCCA+4wggNXoAMCAQICEH6T
-** SIG ** 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
-** SIG ** CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
-** SIG ** cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
-** SIG ** EwZUaGF3dGUxHTAbBgNVBAsTFFRoYXd0ZSBDZXJ0aWZp
-** SIG ** Y2F0aW9uMR8wHQYDVQQDExZUaGF3dGUgVGltZXN0YW1w
-** SIG ** aW5nIENBMB4XDTEyMTIyMTAwMDAwMFoXDTIwMTIzMDIz
-** SIG ** NTk1OVowXjELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBUaW1lIFN0YW1waW5nIFNlcnZpY2VzIENBIC0g
-** SIG ** RzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-** SIG ** AQCxrLNJVEuXHBIK2CV5kSJXKm/cuCbEQ3Nrwr8uUFr7
-** SIG ** FMJ2jkMBJUO0oeJF9Oi3e8N0zCLXtJQAAvdN7b+0t0Qk
-** SIG ** a81fRTvRRM5DEnMXgotptCvLmR6schsmTXEfsTHd+1Fh
-** SIG ** AlOmqvVJLAV4RaUvic7nmef+jOJXPz3GktxK+Hsz5HkK
-** SIG ** +/B1iEGc/8UDUZmq12yfk2mHZSmDhcJgFMTIyTsU2sCB
-** SIG ** 8B8NdN6SIqvK9/t0fCfm90obf6fDni2uiuqm5qonFn1h
-** SIG ** 95hxEbziUKFL5V365Q6nLJ+qZSDT2JboyHylTkhE/xni
-** SIG ** RAeSC9dohIBdanhkRc1gRn5UwRN8xXnxycFxAgMBAAGj
-** SIG ** gfowgfcwHQYDVR0OBBYEFF+a9W5czMx0mtTdfe8/2+xM
-** SIG ** gC7dMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYW
-** SIG ** aHR0cDovL29jc3AudGhhd3RlLmNvbTASBgNVHRMBAf8E
-** SIG ** CDAGAQH/AgEAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6
-** SIG ** Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVUaW1lc3RhbXBp
-** SIG ** bmdDQS5jcmwwEwYDVR0lBAwwCgYIKwYBBQUHAwgwDgYD
-** SIG ** VR0PAQH/BAQDAgEGMCgGA1UdEQQhMB+kHTAbMRkwFwYD
-** SIG ** VQQDExBUaW1lU3RhbXAtMjA0OC0xMA0GCSqGSIb3DQEB
-** SIG ** BQUAA4GBAAMJm495739ZMKrvaLX64wkdu0+CBl03X6ZS
-** SIG ** nxaN6hySCURu9W3rWHww6PlpjSNzCxJvR6muORH4KrGb
-** SIG ** sBrDjutZlgCtzgxNstAxpghcKnr84nodV0yoZRjpeUBi
-** SIG ** JZZux8c3aoMhCI5B6t3ZVz8dd0mHKhYGXqY4aiISo1EZ
-** SIG ** g362MIIEozCCA4ugAwIBAgIQDs/0OMj+vzVuBNhqmBsa
-** SIG ** UDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEd
-** SIG ** MBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xMDAu
-** SIG ** BgNVBAMTJ1N5bWFudGVjIFRpbWUgU3RhbXBpbmcgU2Vy
-** SIG ** dmljZXMgQ0EgLSBHMjAeFw0xMjEwMTgwMDAwMDBaFw0y
-** SIG ** MDEyMjkyMzU5NTlaMGIxCzAJBgNVBAYTAlVTMR0wGwYD
-** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjE0MDIGA1UE
-** SIG ** AxMrU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
-** SIG ** cyBTaWduZXIgLSBHNDCCASIwDQYJKoZIhvcNAQEBBQAD
-** SIG ** ggEPADCCAQoCggEBAKJjCzlEuLsjp0RJuw7/ofBhClOT
-** SIG ** sJjbrSwPSsVu/4Y8U1UPFc4EPyv9qZaW2b5heQtbyUyG
-** SIG ** duXgQ0sile7CK0PBn9hotI5AT+6FOLkRxSPyZFjwFTJv
-** SIG ** TlehroikAtcqHs1L4d1j1ReJMluwXplaqJ0oUA4X7pbb
-** SIG ** YTtFUR3PElYLkkf8q672Zj1HrHBy55LnX80QucSDZJQZ
-** SIG ** vSWA4ejSIqXQugJ6oXeTW2XD7hd0vEGGKtwITIySjJEt
-** SIG ** nndEH2jWqHR32w5bMotWizO92WPISZ06xcXqMwvS8aMb
-** SIG ** 9Iu+2bNXizveBKd6IrIkri7HcMW+ToMmCPsLvalPmQjh
-** SIG ** EChyqs0CAwEAAaOCAVcwggFTMAwGA1UdEwEB/wQCMAAw
-** SIG ** FgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/
-** SIG ** BAQDAgeAMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcw
-** SIG ** AYYeaHR0cDovL3RzLW9jc3Aud3Muc3ltYW50ZWMuY29t
-** SIG ** MDcGCCsGAQUFBzAChitodHRwOi8vdHMtYWlhLndzLnN5
-** SIG ** bWFudGVjLmNvbS90c3MtY2EtZzIuY2VyMDwGA1UdHwQ1
-** SIG ** MDMwMaAvoC2GK2h0dHA6Ly90cy1jcmwud3Muc3ltYW50
-** SIG ** ZWMuY29tL3Rzcy1jYS1nMi5jcmwwKAYDVR0RBCEwH6Qd
-** SIG ** MBsxGTAXBgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTIwHQYD
-** SIG ** VR0OBBYEFEbGaaMOShQe1UzaUmMXP142vA3mMB8GA1Ud
-** SIG ** IwQYMBaAFF+a9W5czMx0mtTdfe8/2+xMgC7dMA0GCSqG
-** SIG ** SIb3DQEBBQUAA4IBAQB4O7SRKgBM8I9iMDd4o4QnB28Y
-** SIG ** st4l3KDUlAOqhk4ln5pAAxzdzuN5yyFoBtq2MrRtv/Qs
-** SIG ** JmMz5ElkbQ3mw2cO9wWkNWx8iRbG6bLfsundIMZxD82V
-** SIG ** dNy2XN69Nx9DeOZ4tc0oBCCjqvFLxIgpkQ6A0RH83Vx2
-** SIG ** bk9eDkVGQW4NsOo4mrE62glxEPwcebSAe6xp9P2ctgwW
-** SIG ** K/F/Wwk9m1viFsoTgW0ALjgNqCmPLOGy9FqpAa8VnCwv
-** SIG ** SRvbIrvD/niUUcOGsYKIXfA9tFGheTMrLnu53CAJE3Hr
-** SIG ** ahlbz+ilMFcsiUk/uc9/yb8+ImhjU5q9aXSsxR08f5Lg
-** SIG ** w7wc2AR1MIIEzjCCA7agAwIBAgIQMHo2eqo+aIGm+U8I
-** SIG ** yzs5ZDANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
+** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFEBWxSAOwkGf
+** SIG ** 9dI+P2ELuLz+DxeroIIKLzCCBM4wggO2oAMCAQICEDB6
+** SIG ** NnqqPmiBpvlPCMs7OWQwDQYJKoZIhvcNAQELBQAwfzEL
+** SIG ** MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENv
+** SIG ** cnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVz
+** SIG ** dCBOZXR3b3JrMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFz
+** SIG ** cyAzIFNIQTI1NiBDb2RlIFNpZ25pbmcgQ0EwHhcNMTUx
+** SIG ** MDA5MDAwMDAwWhcNMTgxMTA3MjM1OTU5WjBhMQswCQYD
+** SIG ** VQQGEwJTSTERMA8GA1UECBMIU2xvdmVuaWExDzANBgNV
+** SIG ** BAcTBkthbW5pazEWMBQGA1UEChQNQW1lYmlzIGQuby5v
+** SIG ** LjEWMBQGA1UEAxQNQW1lYmlzIGQuby5vLjCCASIwDQYJ
+** SIG ** KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfy6Bdwx2kq
+** SIG ** yGhtaYAZgcA8pWLe7EbyLqBHRq/8jIVfUX1CH7fsbEz1
+** SIG ** UDgIq74BvilG3BNyjJxh/lbiu2Pr2M0ad3WEy4p0kM9T
+** SIG ** SmABC8k3Vc5pmJlNy1++uMpNwAbUmbGcD6Igsvk1xPWb
+** SIG ** ApLoAdnO0KfTfzvRI40A0cGZVGt5y6GPemN6jT8JAp9O
+** SIG ** KaWIqj3iF00c/FwS7ODZf2w/cMphLjUle+b86GyewVGE
+** SIG ** MEVO5ZjS9ksEWBDWn9A6XYshSwbDWnx4xmIl0B4DcWVA
+** SIG ** aY+zqEQzQbzEGC/izPDq44RiCtbhi+QqgQ/6fNXm3hbA
+** SIG ** GVcYPYa4J5D1UMO+1NC2cPMCAwEAAaOCAWIwggFeMAkG
+** SIG ** A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMCsGA1UdHwQk
+** SIG ** MCIwIKAeoByGGmh0dHA6Ly9zdi5zeW1jYi5jb20vc3Yu
+** SIG ** Y3JsMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAj
+** SIG ** BggrBgEFBQcCARYXaHR0cHM6Ly9kLnN5bWNiLmNvbS9j
+** SIG ** cHMwJQYIKwYBBQUHAgIwGQwXaHR0cHM6Ly9kLnN5bWNi
+** SIG ** LmNvbS9ycGEwEwYDVR0lBAwwCgYIKwYBBQUHAwMwVwYI
+** SIG ** KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8v
+** SIG ** c3Yuc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8v
+** SIG ** c3Yuc3ltY2IuY29tL3N2LmNydDAfBgNVHSMEGDAWgBSW
+** SIG ** O1PweTOXr32D7y4rzMq3hh5yZjAdBgNVHQ4EFgQU9we9
+** SIG ** loCaLXTEfww9PSfd1JAKn8wwDQYJKoZIhvcNAQELBQAD
+** SIG ** ggEBAIpxL0AvtcrbShLKgI7dmLn6WJbpdzkB9e2Cm1Mu
+** SIG ** AAIiogLFF1n07l0VXZE+gqxGHB8ji2h33t+o1R8PLyyI
+** SIG ** kdnMhHAd78HsqyZzabfmWuCP12TKBv77wiZkpbTo/Av+
+** SIG ** z0SlpJRoMpzzXhyPPtHdby80bSu+4RXlewiDCH56aGE4
+** SIG ** SSk0i8Xa9JJ/ozPKLX3Szdmg6J58XtDH/tq5K1/ABSCB
+** SIG ** z6SF2Y9l9lRJpGXchSDYCPipSVUGP0WPQRTDNobSwCJD
+** SIG ** XAz9UFcxWo4Rh8o/gvlLWUH+T3HhmLSRzXqt3JuqJo5x
+** SIG ** H8s4vPzcGBZZFob8yRB98KD6ioFK2pjRRSw9FucwggVZ
+** SIG ** MIIEQaADAgECAhA9eNf5dklgsmF99PAeyoYqMA0GCSqG
+** SIG ** SIb3DQEBCwUAMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UE
+** SIG ** ChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+** SIG ** aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAy
+** SIG ** MDA2IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6
+** SIG ** ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENs
+** SIG ** YXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
+** SIG ** biBBdXRob3JpdHkgLSBHNTAeFw0xMzEyMTAwMDAwMDBa
+** SIG ** Fw0yMzEyMDkyMzU5NTlaMH8xCzAJBgNVBAYTAlVTMR0w
+** SIG ** GwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0G
+** SIG ** A1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4G
+** SIG ** A1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBTSEEyNTYgQ29k
+** SIG ** ZSBTaWduaW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+** SIG ** AQ8AMIIBCgKCAQEAl4MeABavLLHSCMTXaJNRYB5x9uJH
+** SIG ** tNtYTSNiarS/WhtR96MNGHdou9g2qy8hUNqe8+dfJ04L
+** SIG ** wpfICXCTqdpcDU6kDZGgtOwUzpFyVC7Oo9tE6VIbP0E8
+** SIG ** ykrkqsDoOatTzCHQzM9/m+bCzFhqghXuPTbPHMWXBySO
+** SIG ** 8Xu+MS09bty1mUKfS2GVXxxw7hd924vlYYl4x2gbrxF4
+** SIG ** GpiuxFVHU9mzMtahDkZAxZeSitFTp5lbhTVX0+qTYmEg
+** SIG ** CscwdyQRTWKDtrp7aIIx7mXK3/nVjbI13Iwrb2pyXGCE
+** SIG ** nPIMlF7AVlIASMzT+KV93i/XE+Q4qITVRrgThsIbnepa
+** SIG ** ON2b2wIDAQABo4IBgzCCAX8wLwYIKwYBBQUHAQEEIzAh
+** SIG ** MB8GCCsGAQUFBzABhhNodHRwOi8vczIuc3ltY2IuY29t
+** SIG ** MBIGA1UdEwEB/wQIMAYBAf8CAQAwbAYDVR0gBGUwYzBh
+** SIG ** BgtghkgBhvhFAQcXAzBSMCYGCCsGAQUFBwIBFhpodHRw
+** SIG ** Oi8vd3d3LnN5bWF1dGguY29tL2NwczAoBggrBgEFBQcC
+** SIG ** AjAcGhpodHRwOi8vd3d3LnN5bWF1dGguY29tL3JwYTAw
+** SIG ** BgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vczEuc3ltY2Iu
+** SIG ** Y29tL3BjYTMtZzUuY3JsMB0GA1UdJQQWMBQGCCsGAQUF
+** SIG ** BwMCBggrBgEFBQcDAzAOBgNVHQ8BAf8EBAMCAQYwKQYD
+** SIG ** VR0RBCIwIKQeMBwxGjAYBgNVBAMTEVN5bWFudGVjUEtJ
+** SIG ** LTEtNTY3MB0GA1UdDgQWBBSWO1PweTOXr32D7y4rzMq3
+** SIG ** hh5yZjAfBgNVHSMEGDAWgBR/02Wnwt3su/AwCfNDOfoC
+** SIG ** rzMxMzANBgkqhkiG9w0BAQsFAAOCAQEAE4UaHmmpN/eg
+** SIG ** vaSvfh1hU/6djF4MpnUeeBcj3f3sGgNVOftxlcdlWqeO
+** SIG ** MNJEWmHbcG/aIQXCLnO6SfHRk/5dyc1eA+CJnj90Htf3
+** SIG ** OIup1s+7NS8zWKiSVtHITTuC5nmEFvwosLFH8x2iPu6H
+** SIG ** 2aZ/pFalP62ELinefLyoqqM9BAHqupOiDlAiKRdMh+Q6
+** SIG ** EV/WpCWJmwVrL7TJAUwnewusGQUioGAVP9rJ+01Mj/ty
+** SIG ** Z3f9J5THujUOiEn+jf0or0oSvQ2zlwXeRAwV+jYrA9zB
+** SIG ** UAHxoRFdFOXivSdLVL4rhF4PpsN0BQrvl8OJIrEfd/O9
+** SIG ** zUPU8UypP7WLhK9k8tAUITGCEFwwghBYAgEBMIGTMH8x
+** SIG ** CzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBD
+** SIG ** b3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1
+** SIG ** c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xh
+** SIG ** c3MgMyBTSEEyNTYgQ29kZSBTaWduaW5nIENBAhAwejZ6
+** SIG ** qj5ogab5TwjLOzlkMAkGBSsOAwIaBQCgcDAQBgorBgEE
+** SIG ** AYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGC
+** SIG ** NwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIB
+** SIG ** FTAjBgkqhkiG9w0BCQQxFgQUhbkItGJ7IwanoGmf2+D4
+** SIG ** Mp5JZMMwDQYJKoZIhvcNAQEBBQAEggEAj/hbqjgcyKPJ
+** SIG ** ZcIYVjpfyyMaT9bkrFUArI1W/QPCEcS2xCG6h1lbe4Fu
+** SIG ** dZ1sp0xrKPirGXXAW6H1ZXbMRKXqGmmgdl5q8H3BtEMu
+** SIG ** xEcL2W80//kYL3847GYvUTBViD5I1NLC9mnskN8e3ok3
+** SIG ** HQhPdwXwMJ+2JdqG8GzYlpJe4xJ7mnU5m3lUvhlIoydD
+** SIG ** xZFJL3Pjs9jwCW9f1A7FgrQPpXi+hnVpciXZHL5pkSjf
+** SIG ** WGr1evGxhrHVRQpyF7sPrv3A1sSa4JbxtL+IQ9GGqVf9
+** SIG ** Xu5i3s9vDnfLSN6ZSZfwxZwIlTMmbGyN/lMYgBzdrAM5
+** SIG ** vUAhRibJy8uDaY82F48otqGCDiswgg4nBgorBgEEAYI3
+** SIG ** AwMBMYIOFzCCDhMGCSqGSIb3DQEHAqCCDgQwgg4AAgED
+** SIG ** MQ0wCwYJYIZIAWUDBAIBMIH+BgsqhkiG9w0BCRABBKCB
+** SIG ** 7gSB6zCB6AIBAQYLYIZIAYb4RQEHFwMwITAJBgUrDgMC
+** SIG ** GgUABBQtpvAkgc5L99fuVf1QYBxu6EjXaAIUTZOA6vF5
+** SIG ** BBSaesQcbr6p7GoNlG0YDzIwMTcwNDE4MTI0MzU5WjAD
+** SIG ** AgEeoIGGpIGDMIGAMQswCQYDVQQGEwJVUzEdMBsGA1UE
+** SIG ** ChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsT
+** SIG ** FlN5bWFudGVjIFRydXN0IE5ldHdvcmsxMTAvBgNVBAMT
+** SIG ** KFN5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcgU2ln
+** SIG ** bmVyIC0gRzKgggqLMIIFODCCBCCgAwIBAgIQewWx1Elo
+** SIG ** UUT3yYnSnBmdEjANBgkqhkiG9w0BAQsFADCBvTELMAkG
+** SIG ** A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMu
+** SIG ** MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3Jr
+** SIG ** MTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5j
+** SIG ** LiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYD
+** SIG ** VQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0
+** SIG ** aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNjAxMTIwMDAw
+** SIG ** MDBaFw0zMTAxMTEyMzU5NTlaMHcxCzAJBgNVBAYTAlVT
+** SIG ** MR0wGwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEf
+** SIG ** MB0GA1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEo
+** SIG ** MCYGA1UEAxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFt
+** SIG ** cGluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+** SIG ** AQoCggEBALtZnVlVT52Mcl0agaLrVfOwAa08cawyjwVr
+** SIG ** hponADKXak3JZBRLKbvC2Sm5Luxjs+HPPwtWkPhiG37r
+** SIG ** pgfi3n9ebUA41JEG50F8eRzLy60bv9iVkfPw7mz4rZY5
+** SIG ** Ln/BJ7h4OcWEpe3tr4eOzo3HberSmLU6Hx45ncP0mqj0
+** SIG ** hOHE0XxxxgYptD/kgw0mw3sIPk35CrczSf/KO9T1sptL
+** SIG ** 4YiZGvXA6TMU1t/HgNuR7v68kldyd/TNqMz+CfWTN76V
+** SIG ** iGrF3PSxS9TO6AmRX7WEeTWKeKwZMo8jwTJBG1kOqT6x
+** SIG ** zPnWK++32OTVHW0ROpL2k8mc40juu1MO1DaXhnjFoTcC
+** SIG ** AwEAAaOCAXcwggFzMA4GA1UdDwEB/wQEAwIBBjASBgNV
+** SIG ** HRMBAf8ECDAGAQH/AgEAMGYGA1UdIARfMF0wWwYLYIZI
+** SIG ** AYb4RQEHFwMwTDAjBggrBgEFBQcCARYXaHR0cHM6Ly9k
+** SIG ** LnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoXaHR0
+** SIG ** cHM6Ly9kLnN5bWNiLmNvbS9ycGEwLgYIKwYBBQUHAQEE
+** SIG ** IjAgMB4GCCsGAQUFBzABhhJodHRwOi8vcy5zeW1jZC5j
+** SIG ** b20wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL3Muc3lt
+** SIG ** Y2IuY29tL3VuaXZlcnNhbC1yb290LmNybDATBgNVHSUE
+** SIG ** DDAKBggrBgEFBQcDCDAoBgNVHREEITAfpB0wGzEZMBcG
+** SIG ** A1UEAxMQVGltZVN0YW1wLTIwNDgtMzAdBgNVHQ4EFgQU
+** SIG ** r2PWyqNOhXLgp7xB8ymiOH+AdWIwHwYDVR0jBBgwFoAU
+** SIG ** tnf6aUhHn1MS1cLqBzJ2B9GXBxkwDQYJKoZIhvcNAQEL
+** SIG ** BQADggEBAHXqsC3VNBlcMkX+DuHUT6Z4wW/X6t3cT/Oh
+** SIG ** yIGI96ePFeZAKa3mXfSi2VZkhHEwKt0eYRdmIFYGmBmN
+** SIG ** XXHy+Je8Cf0ckUfJ4uiNA/vMkC/WCmxOM+zWtJPITJBj
+** SIG ** SDlAIcTd1m6JmDy1mJfoqQa3CcmPU1dBkC/hHk1O3MoQ
+** SIG ** eGxCbvC2xfhhXFL1TvZrjfdKer7zzf0D19n2A6gP41P3
+** SIG ** CnXsxnUuqmaFBJm3+AZX4cYO9uiv2uybGB+queM6AL/O
+** SIG ** ipTLAduexzi7D1Kr0eOUA2AKTaD+J20UMvw/l0Dhv5mJ
+** SIG ** 2+Q5FL3a5NPD6itas5VYVQR9x5rsIwONhSrS/66pYYEw
+** SIG ** ggVLMIIEM6ADAgECAhBUWPKq10HWRLyEqXugllLmMA0G
+** SIG ** CSqGSIb3DQEBCwUAMHcxCzAJBgNVBAYTAlVTMR0wGwYD
+** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0GA1UE
+** SIG ** CxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEoMCYGA1UE
+** SIG ** AxMfU3ltYW50ZWMgU0hBMjU2IFRpbWVTdGFtcGluZyBD
+** SIG ** QTAeFw0xNzAxMDIwMDAwMDBaFw0yODA0MDEyMzU5NTla
+** SIG ** MIGAMQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50
+** SIG ** ZWMgQ29ycG9yYXRpb24xHzAdBgNVBAsTFlN5bWFudGVj
+** SIG ** IFRydXN0IE5ldHdvcmsxMTAvBgNVBAMTKFN5bWFudGVj
+** SIG ** IFNIQTI1NiBUaW1lU3RhbXBpbmcgU2lnbmVyIC0gRzIw
+** SIG ** ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZ
+** SIG ** 8/zYBAkDhvnXXKaTwEJ86nxjz10A4o7zwJDfjyn1GOqU
+** SIG ** t5Ll17Cgc4Ho6QqbSnwB/52PpDmnDupF9CIMOnDtOUWL
+** SIG ** 5MUbXPBFaEYkBWN2mxz8nmwqsVblin9Sca7yNdVGIwYc
+** SIG ** z0gtHbTNuNl2I44c/z6/uwZcaQemZQ74Xq59Lu1NrjXv
+** SIG ** ydcAQv0olQ6fXXJCCbzD2kTS7cxHhOT8yi2sWL6u967Z
+** SIG ** RA0It8J31hpDcNFuA95SksQQCHHZuiJV8h+87ZudO+Je
+** SIG ** HUyD/5cPewvnVYNO0g3rvtfsrm5HuZ/fpdZRvARV7f8n
+** SIG ** cEzJ7SpLE+GxuUwPyQHuVWVfaQJ4Zss/AgMBAAGjggHH
+** SIG ** MIIBwzAMBgNVHRMBAf8EAjAAMGYGA1UdIARfMF0wWwYL
+** SIG ** YIZIAYb4RQEHFwMwTDAjBggrBgEFBQcCARYXaHR0cHM6
+** SIG ** Ly9kLnN5bWNiLmNvbS9jcHMwJQYIKwYBBQUHAgIwGRoX
+** SIG ** aHR0cHM6Ly9kLnN5bWNiLmNvbS9ycGEwQAYDVR0fBDkw
+** SIG ** NzA1oDOgMYYvaHR0cDovL3RzLWNybC53cy5zeW1hbnRl
+** SIG ** Yy5jb20vc2hhMjU2LXRzcy1jYS5jcmwwFgYDVR0lAQH/
+** SIG ** BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMHcG
+** SIG ** CCsGAQUFBwEBBGswaTAqBggrBgEFBQcwAYYeaHR0cDov
+** SIG ** L3RzLW9jc3Aud3Muc3ltYW50ZWMuY29tMDsGCCsGAQUF
+** SIG ** BzAChi9odHRwOi8vdHMtYWlhLndzLnN5bWFudGVjLmNv
+** SIG ** bS9zaGEyNTYtdHNzLWNhLmNlcjAoBgNVHREEITAfpB0w
+** SIG ** GzEZMBcGA1UEAxMQVGltZVN0YW1wLTIwNDgtNTAdBgNV
+** SIG ** HQ4EFgQUCbXB/pZylylDmsngArqu+P0vuvYwHwYDVR0j
+** SIG ** BBgwFoAUr2PWyqNOhXLgp7xB8ymiOH+AdWIwDQYJKoZI
+** SIG ** hvcNAQELBQADggEBABezCojpXFpeIGs7ChWybMWpijKH
+** SIG ** 07H0HFOuhb4/m//XvLeUhbTHUn6U6L3tYbLUp5nkw8mT
+** SIG ** wTU9C+hoCl1WmL2xIjvRRHrXv/BtUTKK1SPfOAE39uJT
+** SIG ** K3orEY+3TWx6MwMbfGsJlBe75NtY1CETZefs0SXKLHWa
+** SIG ** nH/8ybsqaKvEfbTPo8lsp9nEAJyJCneR9E2i+zE7hm72
+** SIG ** 5h9QA4abv8tCq+Z2m3JaEQGKxu+lb5Xn3a665iJl8BhZ
+** SIG ** GxHJzYC32JdHH0II+KxxH7BGU7PUstWjq1B1SBIXgq3P
+** SIG ** 4EFPMn7NlRy/kYoIPaSnZwKW3yRMpdBBwIJgo4oXMkvT
+** SIG ** vM+ktIwxggJaMIICVgIBATCBizB3MQswCQYDVQQGEwJV
 ** SIG ** UzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24x
 ** SIG ** HzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsx
-** SIG ** MDAuBgNVBAMTJ1N5bWFudGVjIENsYXNzIDMgU0hBMjU2
-** SIG ** IENvZGUgU2lnbmluZyBDQTAeFw0xNTEwMDkwMDAwMDBa
-** SIG ** Fw0xODExMDcyMzU5NTlaMGExCzAJBgNVBAYTAlNJMREw
-** SIG ** DwYDVQQIEwhTbG92ZW5pYTEPMA0GA1UEBxMGS2Ftbmlr
-** SIG ** MRYwFAYDVQQKFA1BbWViaXMgZC5vLm8uMRYwFAYDVQQD
-** SIG ** FA1BbWViaXMgZC5vLm8uMIIBIjANBgkqhkiG9w0BAQEF
-** SIG ** AAOCAQ8AMIIBCgKCAQEAl/LoF3DHaSrIaG1pgBmBwDyl
-** SIG ** Yt7sRvIuoEdGr/yMhV9RfUIft+xsTPVQOAirvgG+KUbc
-** SIG ** E3KMnGH+VuK7Y+vYzRp3dYTLinSQz1NKYAELyTdVzmmY
-** SIG ** mU3LX764yk3ABtSZsZwPoiCy+TXE9ZsCkugB2c7Qp9N/
-** SIG ** O9EjjQDRwZlUa3nLoY96Y3qNPwkCn04ppYiqPeIXTRz8
-** SIG ** XBLs4Nl/bD9wymEuNSV75vzobJ7BUYQwRU7lmNL2SwRY
-** SIG ** ENaf0DpdiyFLBsNafHjGYiXQHgNxZUBpj7OoRDNBvMQY
-** SIG ** L+LM8OrjhGIK1uGL5CqBD/p81ebeFsAZVxg9hrgnkPVQ
-** SIG ** w77U0LZw8wIDAQABo4IBYjCCAV4wCQYDVR0TBAIwADAO
-** SIG ** BgNVHQ8BAf8EBAMCB4AwKwYDVR0fBCQwIjAgoB6gHIYa
-** SIG ** aHR0cDovL3N2LnN5bWNiLmNvbS9zdi5jcmwwZgYDVR0g
-** SIG ** BF8wXTBbBgtghkgBhvhFAQcXAzBMMCMGCCsGAQUFBwIB
-** SIG ** FhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEF
-** SIG ** BQcCAjAZDBdodHRwczovL2Quc3ltY2IuY29tL3JwYTAT
-** SIG ** BgNVHSUEDDAKBggrBgEFBQcDAzBXBggrBgEFBQcBAQRL
-** SIG ** MEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9zdi5zeW1jZC5j
-** SIG ** b20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9zdi5zeW1jYi5j
-** SIG ** b20vc3YuY3J0MB8GA1UdIwQYMBaAFJY7U/B5M5evfYPv
-** SIG ** LivMyreGHnJmMB0GA1UdDgQWBBT3B72WgJotdMR/DD09
-** SIG ** J93UkAqfzDANBgkqhkiG9w0BAQsFAAOCAQEAinEvQC+1
-** SIG ** yttKEsqAjt2YufpYlul3OQH17YKbUy4AAiKiAsUXWfTu
-** SIG ** XRVdkT6CrEYcHyOLaHfe36jVHw8vLIiR2cyEcB3vweyr
-** SIG ** JnNpt+Za4I/XZMoG/vvCJmSltOj8C/7PRKWklGgynPNe
-** SIG ** HI8+0d1vLzRtK77hFeV7CIMIfnpoYThJKTSLxdr0kn+j
-** SIG ** M8otfdLN2aDonnxe0Mf+2rkrX8AFIIHPpIXZj2X2VEmk
-** SIG ** ZdyFINgI+KlJVQY/RY9BFMM2htLAIkNcDP1QVzFajhGH
-** SIG ** yj+C+UtZQf5PceGYtJHNeq3cm6omjnEfyzi8/NwYFlkW
-** SIG ** hvzJEH3woPqKgUramNFFLD0W5zCCBVkwggRBoAMCAQIC
-** SIG ** ED141/l2SWCyYX308B7KhiowDQYJKoZIhvcNAQELBQAw
-** SIG ** gcoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-** SIG ** biwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3Qg
-** SIG ** TmV0d29yazE6MDgGA1UECxMxKGMpIDIwMDYgVmVyaVNp
-** SIG ** Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-** SIG ** eTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMyBQdWJs
-** SIG ** aWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-** SIG ** eSAtIEc1MB4XDTEzMTIxMDAwMDAwMFoXDTIzMTIwOTIz
-** SIG ** NTk1OVowfzELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h
-** SIG ** bnRlYyBUcnVzdCBOZXR3b3JrMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBDbGFzcyAzIFNIQTI1NiBDb2RlIFNpZ25pbmcg
-** SIG ** Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-** SIG ** AQCXgx4AFq8ssdIIxNdok1FgHnH24ke021hNI2JqtL9a
-** SIG ** G1H3ow0Yd2i72DarLyFQ2p7z518nTgvCl8gJcJOp2lwN
-** SIG ** TqQNkaC07BTOkXJULs6j20TpUhs/QTzKSuSqwOg5q1PM
-** SIG ** IdDMz3+b5sLMWGqCFe49Ns8cxZcHJI7xe74xLT1u3LWZ
-** SIG ** Qp9LYZVfHHDuF33bi+VhiXjHaBuvEXgamK7EVUdT2bMy
-** SIG ** 1qEORkDFl5KK0VOnmVuFNVfT6pNiYSAKxzB3JBFNYoO2
-** SIG ** untogjHuZcrf+dWNsjXcjCtvanJcYISc8gyUXsBWUgBI
-** SIG ** zNP4pX3eL9cT5DiohNVGuBOGwhud6lo43ZvbAgMBAAGj
-** SIG ** ggGDMIIBfzAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUH
-** SIG ** MAGGE2h0dHA6Ly9zMi5zeW1jYi5jb20wEgYDVR0TAQH/
-** SIG ** BAgwBgEB/wIBADBsBgNVHSAEZTBjMGEGC2CGSAGG+EUB
-** SIG ** BxcDMFIwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc3lt
-** SIG ** YXV0aC5jb20vY3BzMCgGCCsGAQUFBwICMBwaGmh0dHA6
-** SIG ** Ly93d3cuc3ltYXV0aC5jb20vcnBhMDAGA1UdHwQpMCcw
-** SIG ** JaAjoCGGH2h0dHA6Ly9zMS5zeW1jYi5jb20vcGNhMy1n
-** SIG ** NS5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-** SIG ** BwMDMA4GA1UdDwEB/wQEAwIBBjApBgNVHREEIjAgpB4w
-** SIG ** HDEaMBgGA1UEAxMRU3ltYW50ZWNQS0ktMS01NjcwHQYD
-** SIG ** VR0OBBYEFJY7U/B5M5evfYPvLivMyreGHnJmMB8GA1Ud
-** SIG ** IwQYMBaAFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-** SIG ** SIb3DQEBCwUAA4IBAQAThRoeaak396C9pK9+HWFT/p2M
-** SIG ** XgymdR54FyPd/ewaA1U5+3GVx2Vap44w0kRaYdtwb9oh
-** SIG ** BcIuc7pJ8dGT/l3JzV4D4ImeP3Qe1/c4i6nWz7s1LzNY
-** SIG ** qJJW0chNO4LmeYQW/CiwsUfzHaI+7ofZpn+kVqU/rYQu
-** SIG ** Kd58vKiqoz0EAeq6k6IOUCIpF0yH5DoRX9akJYmbBWsv
-** SIG ** tMkBTCd7C6wZBSKgYBU/2sn7TUyP+3Jnd/0nlMe6NQ6I
-** SIG ** Sf6N/SivShK9DbOXBd5EDBX6NisD3MFQAfGhEV0U5eK9
-** SIG ** J0tUviuEXg+mw3QFCu+Xw4kisR93873NQ9TxTKk/tYuE
-** SIG ** r2Ty0BQhMYIEPDCCBDgCAQEwgZMwfzELMAkGA1UEBhMC
-** SIG ** VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9u
-** SIG ** MR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3Jr
-** SIG ** MTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIFNIQTI1
-** SIG ** NiBDb2RlIFNpZ25pbmcgQ0ECEDB6NnqqPmiBpvlPCMs7
-** SIG ** OWQwCQYFKw4DAhoFAKBwMBAGCisGAQQBgjcCAQwxAjAA
-** SIG ** MBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisG
-** SIG ** AQQBgjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqGSIb3
-** SIG ** DQEJBDEWBBRdGsCsEDnEdoOqRhhTeaLEBl3IEjANBgkq
-** SIG ** hkiG9w0BAQEFAASCAQA4xj8S48C6Sy/T1LtTkza0Dk2l
-** SIG ** Vav/+7v5JiJ1o/K4nHO8tTrdEybxQX+j9406UdtTYXWL
-** SIG ** Vf4Jsa1RS2cwE9gM0ciS9+X1n0e8zF7PNl92Et9ReZm1
-** SIG ** qi/6ckcGEfbnT4hBB1BrvziM5lcUyxFpYOKoO3ZS8x8K
-** SIG ** /tkx9ypkV9MZcotwsrvofmVjN3iUzR8qmF1TNK5oGVhE
-** SIG ** BoI3iwuX/WY8P/v2q4g0xxinOQpRZsLMmFNwnPtxKM3z
-** SIG ** oqZSgaIv9AMNxzCVJmPkj7DPssi1kI+4QmxUw97uoQLz
-** SIG ** U6g/04qNF2AgfbeXKVPrb0YZ90Q6wH+8fwBScRpRwpvX
-** SIG ** bp8SGZ2KoYICCzCCAgcGCSqGSIb3DQEJBjGCAfgwggH0
-** SIG ** AgEBMHIwXjELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBUaW1lIFN0YW1waW5nIFNlcnZpY2VzIENBIC0g
-** SIG ** RzICEA7P9DjI/r81bgTYapgbGlAwCQYFKw4DAhoFAKBd
-** SIG ** MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZI
-** SIG ** hvcNAQkFMQ8XDTE2MDMxODEyNTMxM1owIwYJKoZIhvcN
-** SIG ** AQkEMRYEFLIL8tc1vFkMvG2cy2MMSbMFNS9sMA0GCSqG
-** SIG ** SIb3DQEBAQUABIIBAHhBsF+of6N+6I4duYaMadVV3IBL
-** SIG ** dfG7jhV9c2TJoOmFs5VG0reP7qd02Q+BzygjOeXbYzYj
-** SIG ** THBlF3W6R/YGzD0RAAB8d+pwpXiUpc5iy6BangEIfMS6
-** SIG ** /Gm6ilXTH49B5m1td1HejMjtV0qncV0KZ5pU4VXhCg3P
-** SIG ** CS2hlpiuK88j3Q3R5EGHBp1uCBK96yoWx/SrsDUvU/gC
-** SIG ** wr4Gn1rd3HmLBV6/15/ZclWi/UN8oo3LSmdTkevjU7Lm
-** SIG ** idQjbiDbByq6d0TVYUT/PlFEuUsWwqCNg+xSe2rlSLpO
-** SIG ** Ss7hpud6uCGFGP04XlyUrTEcaNvUUD7hav0zxErYwnPU
-** SIG ** ZEqtHPY=
+** SIG ** KDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3Rh
+** SIG ** bXBpbmcgQ0ECEFRY8qrXQdZEvISpe6CWUuYwCwYJYIZI
+** SIG ** AWUDBAIBoIGkMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0B
+** SIG ** CRABBDAcBgkqhkiG9w0BCQUxDxcNMTcwNDE4MTI0MzU5
+** SIG ** WjAvBgkqhkiG9w0BCQQxIgQgKhTtKk9Ooi1gb1eC/Hcy
+** SIG ** IZVyZTtIoalALNn39GL54zIwNwYLKoZIhvcNAQkQAi8x
+** SIG ** KDAmMCQwIgQgz3rBetBH7NX9w2giAxsS1O8Hi28rTF5r
+** SIG ** pB+P8s9LrWcwCwYJKoZIhvcNAQEBBIIBAH1XiJUxrAWs
+** SIG ** 2r+e1unwxqCO2/tO3X0f1IftZtZrWaErmBlk609PSx7D
+** SIG ** 0dKjvUL7RCJpZMiZWuTS/TRNIjMWvP4XLjzvZlRkSfET
+** SIG ** T272f3oUm9NBSSaMlaFhoqVDlCK6rOcinQ7EnHuP4lXO
+** SIG ** ellRCLI1uAt3fmnopu3Qnx2Q7BwZA2H1H16QYlf5ZyHj
+** SIG ** okQsmQIv9LEMBIMj8G/zGAERAu3KS0SCpOMHuY50DEDw
+** SIG ** pmnIrTbQU++fZ3XDvIiS3hILMoHCH7m3qCIldjOqBjHE
+** SIG ** GRap0p3ApfFeMtm4lR/8kibaaAd/JQXlUwpf8WE+1btN
+** SIG ** je2WincBIwL4kuzHxrFfzB8=
 </signature>
 </package>
--- a/bin/MkLnk.wsf
+++ b/bin/MkLnk.wsf
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    Copyright 1991-2015 Amebis
+    Copyright 1991-2017 Amebis

    This file is part of MkLink.

@@ -84,201 +84,216 @@ MkLnk.wsf &quot;%USERPROFILE%\Desktop\My shortcut.lnk&quot; &quot;%windir%\notep
 	</job>

 <signature>
-** SIG ** MIIZKwYJKoZIhvcNAQcCoIIZHDCCGRgCAQExCzAJBgUr
+** SIG ** MIIbIAYJKoZIhvcNAQcCoIIbETCCGw0CAQExCzAJBgUr
 ** SIG ** DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 ** SIG ** gjcCAR4wJAIBAQQQcAVhGs441BGiowAQS9NQkAIBAAIB
-** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFMH67hpbFt5K
-** SIG ** CSnD9RSD/SRyKRZSoIIUJTCCA+4wggNXoAMCAQICEH6T
-** SIG ** 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
-** SIG ** CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
-** SIG ** cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
-** SIG ** EwZUaGF3dGUxHTAbBgNVBAsTFFRoYXd0ZSBDZXJ0aWZp
-** SIG ** Y2F0aW9uMR8wHQYDVQQDExZUaGF3dGUgVGltZXN0YW1w
-** SIG ** aW5nIENBMB4XDTEyMTIyMTAwMDAwMFoXDTIwMTIzMDIz
-** SIG ** NTk1OVowXjELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBUaW1lIFN0YW1waW5nIFNlcnZpY2VzIENBIC0g
-** SIG ** RzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-** SIG ** AQCxrLNJVEuXHBIK2CV5kSJXKm/cuCbEQ3Nrwr8uUFr7
-** SIG ** FMJ2jkMBJUO0oeJF9Oi3e8N0zCLXtJQAAvdN7b+0t0Qk
-** SIG ** a81fRTvRRM5DEnMXgotptCvLmR6schsmTXEfsTHd+1Fh
-** SIG ** AlOmqvVJLAV4RaUvic7nmef+jOJXPz3GktxK+Hsz5HkK
-** SIG ** +/B1iEGc/8UDUZmq12yfk2mHZSmDhcJgFMTIyTsU2sCB
-** SIG ** 8B8NdN6SIqvK9/t0fCfm90obf6fDni2uiuqm5qonFn1h
-** SIG ** 95hxEbziUKFL5V365Q6nLJ+qZSDT2JboyHylTkhE/xni
-** SIG ** RAeSC9dohIBdanhkRc1gRn5UwRN8xXnxycFxAgMBAAGj
-** SIG ** gfowgfcwHQYDVR0OBBYEFF+a9W5czMx0mtTdfe8/2+xM
-** SIG ** gC7dMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYW
-** SIG ** aHR0cDovL29jc3AudGhhd3RlLmNvbTASBgNVHRMBAf8E
-** SIG ** CDAGAQH/AgEAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6
-** SIG ** Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVUaW1lc3RhbXBp
-** SIG ** bmdDQS5jcmwwEwYDVR0lBAwwCgYIKwYBBQUHAwgwDgYD
-** SIG ** VR0PAQH/BAQDAgEGMCgGA1UdEQQhMB+kHTAbMRkwFwYD
-** SIG ** VQQDExBUaW1lU3RhbXAtMjA0OC0xMA0GCSqGSIb3DQEB
-** SIG ** BQUAA4GBAAMJm495739ZMKrvaLX64wkdu0+CBl03X6ZS
-** SIG ** nxaN6hySCURu9W3rWHww6PlpjSNzCxJvR6muORH4KrGb
-** SIG ** sBrDjutZlgCtzgxNstAxpghcKnr84nodV0yoZRjpeUBi
-** SIG ** JZZux8c3aoMhCI5B6t3ZVz8dd0mHKhYGXqY4aiISo1EZ
-** SIG ** g362MIIEozCCA4ugAwIBAgIQDs/0OMj+vzVuBNhqmBsa
-** SIG ** UDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEd
-** SIG ** MBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xMDAu
-** SIG ** BgNVBAMTJ1N5bWFudGVjIFRpbWUgU3RhbXBpbmcgU2Vy
-** SIG ** dmljZXMgQ0EgLSBHMjAeFw0xMjEwMTgwMDAwMDBaFw0y
-** SIG ** MDEyMjkyMzU5NTlaMGIxCzAJBgNVBAYTAlVTMR0wGwYD
-** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjE0MDIGA1UE
-** SIG ** AxMrU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
-** SIG ** cyBTaWduZXIgLSBHNDCCASIwDQYJKoZIhvcNAQEBBQAD
-** SIG ** ggEPADCCAQoCggEBAKJjCzlEuLsjp0RJuw7/ofBhClOT
-** SIG ** sJjbrSwPSsVu/4Y8U1UPFc4EPyv9qZaW2b5heQtbyUyG
-** SIG ** duXgQ0sile7CK0PBn9hotI5AT+6FOLkRxSPyZFjwFTJv
-** SIG ** TlehroikAtcqHs1L4d1j1ReJMluwXplaqJ0oUA4X7pbb
-** SIG ** YTtFUR3PElYLkkf8q672Zj1HrHBy55LnX80QucSDZJQZ
-** SIG ** vSWA4ejSIqXQugJ6oXeTW2XD7hd0vEGGKtwITIySjJEt
-** SIG ** nndEH2jWqHR32w5bMotWizO92WPISZ06xcXqMwvS8aMb
-** SIG ** 9Iu+2bNXizveBKd6IrIkri7HcMW+ToMmCPsLvalPmQjh
-** SIG ** EChyqs0CAwEAAaOCAVcwggFTMAwGA1UdEwEB/wQCMAAw
-** SIG ** FgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/
-** SIG ** BAQDAgeAMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcw
-** SIG ** AYYeaHR0cDovL3RzLW9jc3Aud3Muc3ltYW50ZWMuY29t
-** SIG ** MDcGCCsGAQUFBzAChitodHRwOi8vdHMtYWlhLndzLnN5
-** SIG ** bWFudGVjLmNvbS90c3MtY2EtZzIuY2VyMDwGA1UdHwQ1
-** SIG ** MDMwMaAvoC2GK2h0dHA6Ly90cy1jcmwud3Muc3ltYW50
-** SIG ** ZWMuY29tL3Rzcy1jYS1nMi5jcmwwKAYDVR0RBCEwH6Qd
-** SIG ** MBsxGTAXBgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTIwHQYD
-** SIG ** VR0OBBYEFEbGaaMOShQe1UzaUmMXP142vA3mMB8GA1Ud
-** SIG ** IwQYMBaAFF+a9W5czMx0mtTdfe8/2+xMgC7dMA0GCSqG
-** SIG ** SIb3DQEBBQUAA4IBAQB4O7SRKgBM8I9iMDd4o4QnB28Y
-** SIG ** st4l3KDUlAOqhk4ln5pAAxzdzuN5yyFoBtq2MrRtv/Qs
-** SIG ** JmMz5ElkbQ3mw2cO9wWkNWx8iRbG6bLfsundIMZxD82V
-** SIG ** dNy2XN69Nx9DeOZ4tc0oBCCjqvFLxIgpkQ6A0RH83Vx2
-** SIG ** bk9eDkVGQW4NsOo4mrE62glxEPwcebSAe6xp9P2ctgwW
-** SIG ** K/F/Wwk9m1viFsoTgW0ALjgNqCmPLOGy9FqpAa8VnCwv
-** SIG ** SRvbIrvD/niUUcOGsYKIXfA9tFGheTMrLnu53CAJE3Hr
-** SIG ** ahlbz+ilMFcsiUk/uc9/yb8+ImhjU5q9aXSsxR08f5Lg
-** SIG ** w7wc2AR1MIIFejCCBGKgAwIBAgIQQIeLZ2eQpZcEKJ6U
-** SIG ** AwIaGzANBgkqhkiG9w0BAQUFADCBtDELMAkGA1UEBhMC
-** SIG ** VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYD
-** SIG ** VQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYD
-** SIG ** VQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cu
-** SIG ** dmVyaXNpZ24uY29tL3JwYSAoYykxMDEuMCwGA1UEAxMl
-** SIG ** VmVyaVNpZ24gQ2xhc3MgMyBDb2RlIFNpZ25pbmcgMjAx
-** SIG ** MCBDQTAeFw0xMjA5MjYwMDAwMDBaFw0xNTEwMTEyMzU5
-** SIG ** NTlaMIG9MQswCQYDVQQGEwJTSTERMA8GA1UECBMIU2xv
-** SIG ** dmVuaWExDzANBgNVBAcTBkthbW5pazEWMBQGA1UEChQN
-** SIG ** QW1lYmlzIGQuby5vLjE+MDwGA1UECxM1RGlnaXRhbCBJ
-** SIG ** RCBDbGFzcyAzIC0gTWljcm9zb2Z0IFNvZnR3YXJlIFZh
-** SIG ** bGlkYXRpb24gdjIxGjAYBgNVBAsUEXByb2dyYW1za2Eg
-** SIG ** b3ByZW1hMRYwFAYDVQQDFA1BbWViaXMgZC5vLm8uMIIB
-** SIG ** IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9QZF
-** SIG ** QzscW51y/Ermb72+gkWUJ6ExfOS1UHvNAcefWdFm4yVX
-** SIG ** wqi8TRT+P5czX+UjKbh77d00CxODQK7rdLb8+EgKybFT
-** SIG ** /bVfT2y8RMtEdG0qI84ZSwh2POazD0PyiHb9XORN2yKH
-** SIG ** ykqLiO+6cJvZXjfNpGqf/LxkXVJvyxaemN1XTR91ohhc
-** SIG ** 97bNyGCP0M8PNKRZ6Hr5uKlZyr7QLYoYAkaENYdXHrOc
-** SIG ** l5CmBAIL56Ngc8vIlLF2lLPmDYf1qWrPpJyXfj7p3iUf
-** SIG ** AewtEpbC5FfhCaeHwgg41NfxhRWCXEBTewLHQJtpSo2k
-** SIG ** mwv5Q1ZuWMDUjPeuHZ3F/ofBoJTE4wIDAQABo4IBezCC
-** SIG ** AXcwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCB4AwQAYD
-** SIG ** VR0fBDkwNzA1oDOgMYYvaHR0cDovL2NzYzMtMjAxMC1j
-** SIG ** cmwudmVyaXNpZ24uY29tL0NTQzMtMjAxMC5jcmwwRAYD
-** SIG ** VR0gBD0wOzA5BgtghkgBhvhFAQcXAzAqMCgGCCsGAQUF
-** SIG ** BwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBh
-** SIG ** MBMGA1UdJQQMMAoGCCsGAQUFBwMDMHEGCCsGAQUFBwEB
-** SIG ** BGUwYzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVy
-** SIG ** aXNpZ24uY29tMDsGCCsGAQUFBzAChi9odHRwOi8vY3Nj
-** SIG ** My0yMDEwLWFpYS52ZXJpc2lnbi5jb20vQ1NDMy0yMDEw
-** SIG ** LmNlcjAfBgNVHSMEGDAWgBTPmanqeyb0S8mOj9fwBSbv
-** SIG ** 49KnnTARBglghkgBhvhCAQEEBAMCBBAwFgYKKwYBBAGC
-** SIG ** NwIBGwQIMAYBAQABAf8wDQYJKoZIhvcNAQEFBQADggEB
-** SIG ** AOMOvRZGpbGuLiIAaqp22r2WAOzxinLpe0O/pJCmBoU0
-** SIG ** lK/Es/Jyc4Y90QyvvhoSVKoZ2hMQ2Y6N7oSkhHjKo/n8
-** SIG ** WIQwNvaqZu4JpO9IgH1WkfqJWnpVcaVGPA0uHhuDhPe9
-** SIG ** gH6Z6I3HC5GL7sc+z4n0kzy1f3AyD+DihQhD0J/i/sgF
-** SIG ** iEaFmwwlJHMv6b4xmERMff050y15k875cdRpeFvSjHko
-** SIG ** IUbY2bfPlnvhWd/4eidkT3KY5Lpm4cqUO20166p2Cjxf
-** SIG ** i9kEGuDPYEYiX94hQmjWwZfIYxdYdD9f+gVcyPpiMspq
-** SIG ** n5QwKHOenweisG6BwXs4H5q45SLx1oJ9PUQwggYKMIIE
-** SIG ** 8qADAgECAhBSAOWqJVb8GobtlsnUSzPHMA0GCSqGSIb3
-** SIG ** DQEBBQUAMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO
-** SIG ** VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWdu
-** SIG ** IFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA2
-** SIG ** IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQg
-** SIG ** dXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNz
-** SIG ** IDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBB
-** SIG ** dXRob3JpdHkgLSBHNTAeFw0xMDAyMDgwMDAwMDBaFw0y
-** SIG ** MDAyMDcyMzU5NTlaMIG0MQswCQYDVQQGEwJVUzEXMBUG
-** SIG ** A1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-** SIG ** cmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRl
-** SIG ** cm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2ln
-** SIG ** bi5jb20vcnBhIChjKTEwMS4wLAYDVQQDEyVWZXJpU2ln
-** SIG ** biBDbGFzcyAzIENvZGUgU2lnbmluZyAyMDEwIENBMIIB
-** SIG ** IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9SNL
-** SIG ** XqXXirsy6dRX9+/kxyZ+rRmY/qidfZT2NmsQ13WBMH8E
-** SIG ** aH/LK3UezR0IjN9plKc3o5x7gOCZ4e43TV/OOxTuhtTQ
-** SIG ** 9Sc1vCULOKeMY50Xowilq7D7zWpigkzVIdob2fHjhDuK
-** SIG ** Kk+FW5ABT8mndhB/JwN8vq5+fcHd+QW8G0icaefApDw8
-** SIG ** QQA+35blxeSUcdZVAccAJkpAPLWhJqkMp22AjpAle8+/
-** SIG ** PxzrL5b65Yd3xrVWsno7VDBTG99iNP8e0fRakyiF5UwX
-** SIG ** Tn5b/aSTmX/fze+kde/vFfZH5/gZctguNBqmtKdMfr27
-** SIG ** Tww9V/Ew1qY2jtaAdtcZLqXNfjQtiQIDAQABo4IB/jCC
-** SIG ** AfowEgYDVR0TAQH/BAgwBgEB/wIBADBwBgNVHSAEaTBn
-** SIG ** MGUGC2CGSAGG+EUBBxcDMFYwKAYIKwYBBQUHAgEWHGh0
-** SIG ** dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMwKgYIKwYB
-** SIG ** BQUHAgIwHhocaHR0cHM6Ly93d3cudmVyaXNpZ24uY29t
-** SIG ** L3JwYTAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwE
-** SIG ** YTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAHBgUr
-** SIG ** DgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0
-** SIG ** cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYw
-** SIG ** NAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC52ZXJp
-** SIG ** c2lnbi5jb20vcGNhMy1nNS5jcmwwNAYIKwYBBQUHAQEE
-** SIG ** KDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC52ZXJp
-** SIG ** c2lnbi5jb20wHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-** SIG ** AQUFBwMDMCgGA1UdEQQhMB+kHTAbMRkwFwYDVQQDExBW
-** SIG ** ZXJpU2lnbk1QS0ktMi04MB0GA1UdDgQWBBTPmanqeyb0
-** SIG ** S8mOj9fwBSbv49KnnTAfBgNVHSMEGDAWgBR/02Wnwt3s
-** SIG ** u/AwCfNDOfoCrzMxMzANBgkqhkiG9w0BAQUFAAOCAQEA
-** SIG ** ViLmNKTEYctIuQGtVqhkD9mMkcS7zAzlrXqgIn/fRzhK
-** SIG ** LWzRf3EafOxwqbHwT+QPDFP6FV7+dJhJJIWBJhyRFEew
-** SIG ** TGOMu6E01MZF6A2FJnMD0KmMZG3ccZLmRQVgFVlROfxY
-** SIG ** FGv+1KTteWsIDEFy5zciBgm+I+k/RJoe6WGdzLGQXPw9
-** SIG ** 0o2sQj1lNtS0PUAoj5sQzyMmzEsgy5AfXYxMNMo82OU3
-** SIG ** 1m+lIL006ybZrg3nxZr3obQhkTNvhuhYuyV8dA5Y/nUb
-** SIG ** Yz/OMXybjxuWnsVTdoRbnK2R+qztk7pdyCFTwoJTY68S
-** SIG ** DVCHERs9VFKWiiycPZIaCJoFLseTpUiR0zGCBHIwggRu
-** SIG ** AgEBMIHJMIG0MQswCQYDVQQGEwJVUzEXMBUGA1UEChMO
-** SIG ** VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWdu
-** SIG ** IFRydXN0IE5ldHdvcmsxOzA5BgNVBAsTMlRlcm1zIG9m
-** SIG ** IHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20v
-** SIG ** cnBhIChjKTEwMS4wLAYDVQQDEyVWZXJpU2lnbiBDbGFz
-** SIG ** cyAzIENvZGUgU2lnbmluZyAyMDEwIENBAhBAh4tnZ5Cl
-** SIG ** lwQonpQDAhobMAkGBSsOAwIaBQCgcDAQBgorBgEEAYI3
-** SIG ** AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGCNwIB
-** SIG ** BDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIBFTAj
-** SIG ** BgkqhkiG9w0BCQQxFgQUo0XIWEliS73GY2JUwO4mY7Vo
-** SIG ** A8MwDQYJKoZIhvcNAQEBBQAEggEAE9VEPAaBwp2sFl8I
-** SIG ** K/xN2uQFkV70yEWp6yL2vqUC4RXVKL03gNIdjAo2nSD5
-** SIG ** /hGnPJfgohxkXYwX856kUpaqBuQg9ipHBdED9VVFvOZt
-** SIG ** WbyGa0YKlXMeGmh8tMXbDB2iPxdYpi8/yd94hhH3AOuP
-** SIG ** dtp+VIxj9NyXvgVXsZgZxOATw8Lp0tDKu0l8bKUJI3aB
-** SIG ** K7kwGqwBpeFRTLxvAKvHVUBB3yh13WSZPJRdLSr3xWZB
-** SIG ** Hd9Lgd82tcKQtLtOR+qD9Yiy52EBvztc8KuafJg7zme2
-** SIG ** wLjAMqgNqJGJaQBpCckUUwqj0yq6b6jDU0SoXwtpGhBv
-** SIG ** UI2hMesTx2W1wNVsP6GCAgswggIHBgkqhkiG9w0BCQYx
-** SIG ** ggH4MIIB9AIBATByMF4xCzAJBgNVBAYTAlVTMR0wGwYD
-** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEwMC4GA1UE
-** SIG ** AxMnU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
-** SIG ** cyBDQSAtIEcyAhAOz/Q4yP6/NW4E2GqYGxpQMAkGBSsO
-** SIG ** AwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
-** SIG ** MBwGCSqGSIb3DQEJBTEPFw0xNTAyMjUwODA3NTZaMCMG
-** SIG ** CSqGSIb3DQEJBDEWBBSrTeWj/s+8idpt/o21ULaKmPhi
-** SIG ** jDANBgkqhkiG9w0BAQEFAASCAQChWhzPUW+SFZWpvasx
-** SIG ** s9OtZB+VWXTTA1pCx9m/JkEon9B+kakUVF+X8TyolR2H
-** SIG ** YS7Z4k2NNnHg8SW3jOU8+gvbcZBnx/5c6c6N4VWCsg89
-** SIG ** BofJ8kMU82zS/bQFQLs/OG82cjgJu52N0T2zGsc5V2LY
-** SIG ** e915NPlBo2SdI4VkBimXfgyBeUPom07bqRgM47o4NRiF
-** SIG ** DWtEsYzuG9IrwRp/LJcH+lQfh5mFbJ0f895/7Oj9ifG3
-** SIG ** YB5XE3BtMfX3kB9skXxmZqQI/YDJdCaIPytWfbX6MKjg
-** SIG ** tB2tsnV6MDtG8XvSEzQiLCzeSNvjs8+64Q7E4VS21Hvz
-** SIG ** pXI1ABSnlaWUaAhA
+** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFFdHeRozDEj2
+** SIG ** yO1NZYotDVj37pO0oIIKLzCCBM4wggO2oAMCAQICEDB6
+** SIG ** NnqqPmiBpvlPCMs7OWQwDQYJKoZIhvcNAQELBQAwfzEL
+** SIG ** MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENv
+** SIG ** cnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVz
+** SIG ** dCBOZXR3b3JrMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFz
+** SIG ** cyAzIFNIQTI1NiBDb2RlIFNpZ25pbmcgQ0EwHhcNMTUx
+** SIG ** MDA5MDAwMDAwWhcNMTgxMTA3MjM1OTU5WjBhMQswCQYD
+** SIG ** VQQGEwJTSTERMA8GA1UECBMIU2xvdmVuaWExDzANBgNV
+** SIG ** BAcTBkthbW5pazEWMBQGA1UEChQNQW1lYmlzIGQuby5v
+** SIG ** LjEWMBQGA1UEAxQNQW1lYmlzIGQuby5vLjCCASIwDQYJ
+** SIG ** KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfy6Bdwx2kq
+** SIG ** yGhtaYAZgcA8pWLe7EbyLqBHRq/8jIVfUX1CH7fsbEz1
+** SIG ** UDgIq74BvilG3BNyjJxh/lbiu2Pr2M0ad3WEy4p0kM9T
+** SIG ** SmABC8k3Vc5pmJlNy1++uMpNwAbUmbGcD6Igsvk1xPWb
+** SIG ** ApLoAdnO0KfTfzvRI40A0cGZVGt5y6GPemN6jT8JAp9O
+** SIG ** KaWIqj3iF00c/FwS7ODZf2w/cMphLjUle+b86GyewVGE
+** SIG ** MEVO5ZjS9ksEWBDWn9A6XYshSwbDWnx4xmIl0B4DcWVA
+** SIG ** aY+zqEQzQbzEGC/izPDq44RiCtbhi+QqgQ/6fNXm3hbA
+** SIG ** GVcYPYa4J5D1UMO+1NC2cPMCAwEAAaOCAWIwggFeMAkG
+** SIG ** A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMCsGA1UdHwQk
+** SIG ** MCIwIKAeoByGGmh0dHA6Ly9zdi5zeW1jYi5jb20vc3Yu
+** SIG ** Y3JsMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAj
+** SIG ** BggrBgEFBQcCARYXaHR0cHM6Ly9kLnN5bWNiLmNvbS9j
+** SIG ** cHMwJQYIKwYBBQUHAgIwGQwXaHR0cHM6Ly9kLnN5bWNi
+** SIG ** LmNvbS9ycGEwEwYDVR0lBAwwCgYIKwYBBQUHAwMwVwYI
+** SIG ** KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8v
+** SIG ** c3Yuc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8v
+** SIG ** c3Yuc3ltY2IuY29tL3N2LmNydDAfBgNVHSMEGDAWgBSW
+** SIG ** O1PweTOXr32D7y4rzMq3hh5yZjAdBgNVHQ4EFgQU9we9
+** SIG ** loCaLXTEfww9PSfd1JAKn8wwDQYJKoZIhvcNAQELBQAD
+** SIG ** ggEBAIpxL0AvtcrbShLKgI7dmLn6WJbpdzkB9e2Cm1Mu
+** SIG ** AAIiogLFF1n07l0VXZE+gqxGHB8ji2h33t+o1R8PLyyI
+** SIG ** kdnMhHAd78HsqyZzabfmWuCP12TKBv77wiZkpbTo/Av+
+** SIG ** z0SlpJRoMpzzXhyPPtHdby80bSu+4RXlewiDCH56aGE4
+** SIG ** SSk0i8Xa9JJ/ozPKLX3Szdmg6J58XtDH/tq5K1/ABSCB
+** SIG ** z6SF2Y9l9lRJpGXchSDYCPipSVUGP0WPQRTDNobSwCJD
+** SIG ** XAz9UFcxWo4Rh8o/gvlLWUH+T3HhmLSRzXqt3JuqJo5x
+** SIG ** H8s4vPzcGBZZFob8yRB98KD6ioFK2pjRRSw9FucwggVZ
+** SIG ** MIIEQaADAgECAhA9eNf5dklgsmF99PAeyoYqMA0GCSqG
+** SIG ** SIb3DQEBCwUAMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UE
+** SIG ** ChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+** SIG ** aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAy
+** SIG ** MDA2IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6
+** SIG ** ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENs
+** SIG ** YXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
+** SIG ** biBBdXRob3JpdHkgLSBHNTAeFw0xMzEyMTAwMDAwMDBa
+** SIG ** Fw0yMzEyMDkyMzU5NTlaMH8xCzAJBgNVBAYTAlVTMR0w
+** SIG ** GwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0G
+** SIG ** A1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4G
+** SIG ** A1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBTSEEyNTYgQ29k
+** SIG ** ZSBTaWduaW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+** SIG ** AQ8AMIIBCgKCAQEAl4MeABavLLHSCMTXaJNRYB5x9uJH
+** SIG ** tNtYTSNiarS/WhtR96MNGHdou9g2qy8hUNqe8+dfJ04L
+** SIG ** wpfICXCTqdpcDU6kDZGgtOwUzpFyVC7Oo9tE6VIbP0E8
+** SIG ** ykrkqsDoOatTzCHQzM9/m+bCzFhqghXuPTbPHMWXBySO
+** SIG ** 8Xu+MS09bty1mUKfS2GVXxxw7hd924vlYYl4x2gbrxF4
+** SIG ** GpiuxFVHU9mzMtahDkZAxZeSitFTp5lbhTVX0+qTYmEg
+** SIG ** CscwdyQRTWKDtrp7aIIx7mXK3/nVjbI13Iwrb2pyXGCE
+** SIG ** nPIMlF7AVlIASMzT+KV93i/XE+Q4qITVRrgThsIbnepa
+** SIG ** ON2b2wIDAQABo4IBgzCCAX8wLwYIKwYBBQUHAQEEIzAh
+** SIG ** MB8GCCsGAQUFBzABhhNodHRwOi8vczIuc3ltY2IuY29t
+** SIG ** MBIGA1UdEwEB/wQIMAYBAf8CAQAwbAYDVR0gBGUwYzBh
+** SIG ** BgtghkgBhvhFAQcXAzBSMCYGCCsGAQUFBwIBFhpodHRw
+** SIG ** Oi8vd3d3LnN5bWF1dGguY29tL2NwczAoBggrBgEFBQcC
+** SIG ** AjAcGhpodHRwOi8vd3d3LnN5bWF1dGguY29tL3JwYTAw
+** SIG ** BgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vczEuc3ltY2Iu
+** SIG ** Y29tL3BjYTMtZzUuY3JsMB0GA1UdJQQWMBQGCCsGAQUF
+** SIG ** BwMCBggrBgEFBQcDAzAOBgNVHQ8BAf8EBAMCAQYwKQYD
+** SIG ** VR0RBCIwIKQeMBwxGjAYBgNVBAMTEVN5bWFudGVjUEtJ
+** SIG ** LTEtNTY3MB0GA1UdDgQWBBSWO1PweTOXr32D7y4rzMq3
+** SIG ** hh5yZjAfBgNVHSMEGDAWgBR/02Wnwt3su/AwCfNDOfoC
+** SIG ** rzMxMzANBgkqhkiG9w0BAQsFAAOCAQEAE4UaHmmpN/eg
+** SIG ** vaSvfh1hU/6djF4MpnUeeBcj3f3sGgNVOftxlcdlWqeO
+** SIG ** MNJEWmHbcG/aIQXCLnO6SfHRk/5dyc1eA+CJnj90Htf3
+** SIG ** OIup1s+7NS8zWKiSVtHITTuC5nmEFvwosLFH8x2iPu6H
+** SIG ** 2aZ/pFalP62ELinefLyoqqM9BAHqupOiDlAiKRdMh+Q6
+** SIG ** EV/WpCWJmwVrL7TJAUwnewusGQUioGAVP9rJ+01Mj/ty
+** SIG ** Z3f9J5THujUOiEn+jf0or0oSvQ2zlwXeRAwV+jYrA9zB
+** SIG ** UAHxoRFdFOXivSdLVL4rhF4PpsN0BQrvl8OJIrEfd/O9
+** SIG ** zUPU8UypP7WLhK9k8tAUITGCEF0wghBZAgEBMIGTMH8x
+** SIG ** CzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBD
+** SIG ** b3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1
+** SIG ** c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xh
+** SIG ** c3MgMyBTSEEyNTYgQ29kZSBTaWduaW5nIENBAhAwejZ6
+** SIG ** qj5ogab5TwjLOzlkMAkGBSsOAwIaBQCgcDAQBgorBgEE
+** SIG ** AYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGC
+** SIG ** NwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIB
+** SIG ** FTAjBgkqhkiG9w0BCQQxFgQUh5Ng4RHmAAAyrsnJEsPP
+** SIG ** lmD0Y5AwDQYJKoZIhvcNAQEBBQAEggEABk6clvJdfSma
+** SIG ** NyYvNtHIe1SjhsXZEcE8l3C57Xq2W4mfUsBjvK/e/sQM
+** SIG ** gwvJraeIBG5z4em89zCWlWPZ+0XLoUKVA4Y/r5DdjuGQ
+** SIG ** sag75KmkRVDaIUoR5yGl5x/UuZmCZv/N1dKzD+er2XMS
+** SIG ** VYlzQr4RrciKHcewspIikVlM3x5UAhuxCWob+/xZivyr
+** SIG ** bx6Burt213CWfAdS8gA9oIjhZSDyn8Ov+UEfM6GNCc2Y
+** SIG ** ZVjeMs592YKhtV95/+Wjgka4idGVU0kyNF1Aa6KnjdOZ
+** SIG ** E1T+Y5GWXJqzGZ0pwCOmkzqY6bf9yTVbBg+/Akfrgjr3
+** SIG ** JZXbQ9I+Ty6HcYykXBhdXqGCDiwwgg4oBgorBgEEAYI3
+** SIG ** AwMBMYIOGDCCDhQGCSqGSIb3DQEHAqCCDgUwgg4BAgED
+** SIG ** MQ0wCwYJYIZIAWUDBAIBMIH/BgsqhkiG9w0BCRABBKCB
+** SIG ** 7wSB7DCB6QIBAQYLYIZIAYb4RQEHFwMwITAJBgUrDgMC
+** SIG ** GgUABBTyBQT1RIvviW/L5kIDS2bbcMxhAAIVAMyeUKFl
+** SIG ** YE0HTEopw0cbT7jR4mVzGA8yMDE3MDQxODEyNDQwMlow
+** SIG ** AwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNV
+** SIG ** BAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQL
+** SIG ** ExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEwLwYDVQQD
+** SIG ** EyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNp
+** SIG ** Z25lciAtIEcyoIIKizCCBTgwggQgoAMCAQICEHsFsdRJ
+** SIG ** aFFE98mJ0pwZnRIwDQYJKoZIhvcNAQELBQAwgb0xCzAJ
+** SIG ** BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j
+** SIG ** LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
+** SIG ** azE6MDgGA1UECxMxKGMpIDIwMDggVmVyaVNpZ24sIElu
+** SIG ** Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE4MDYG
+** SIG ** A1UEAxMvVmVyaVNpZ24gVW5pdmVyc2FsIFJvb3QgQ2Vy
+** SIG ** dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTYwMTEyMDAw
+** SIG ** MDAwWhcNMzEwMTExMjM1OTU5WjB3MQswCQYDVQQGEwJV
+** SIG ** UzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24x
+** SIG ** HzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsx
+** SIG ** KDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3Rh
+** SIG ** bXBpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+** SIG ** ggEKAoIBAQC7WZ1ZVU+djHJdGoGi61XzsAGtPHGsMo8F
+** SIG ** a4aaJwAyl2pNyWQUSym7wtkpuS7sY7Phzz8LVpD4Yht+
+** SIG ** 66YH4t5/Xm1AONSRBudBfHkcy8utG7/YlZHz8O5s+K2W
+** SIG ** OS5/wSe4eDnFhKXt7a+Hjs6Nx23q0pi1Oh8eOZ3D9Jqo
+** SIG ** 9IThxNF8ccYGKbQ/5IMNJsN7CD5N+Qq3M0n/yjvU9bKb
+** SIG ** S+GImRr1wOkzFNbfx4Dbke7+vJJXcnf0zajM/gn1kze+
+** SIG ** lYhqxdz0sUvUzugJkV+1hHk1inisGTKPI8EyQRtZDqk+
+** SIG ** scz51ivvt9jk1R1tETqS9pPJnONI7rtTDtQ2l4Z4xaE3
+** SIG ** AgMBAAGjggF3MIIBczAOBgNVHQ8BAf8EBAMCAQYwEgYD
+** SIG ** VR0TAQH/BAgwBgEB/wIBADBmBgNVHSAEXzBdMFsGC2CG
+** SIG ** SAGG+EUBBxcDMEwwIwYIKwYBBQUHAgEWF2h0dHBzOi8v
+** SIG ** ZC5zeW1jYi5jb20vY3BzMCUGCCsGAQUFBwICMBkaF2h0
+** SIG ** dHBzOi8vZC5zeW1jYi5jb20vcnBhMC4GCCsGAQUFBwEB
+** SIG ** BCIwIDAeBggrBgEFBQcwAYYSaHR0cDovL3Muc3ltY2Qu
+** SIG ** Y29tMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9zLnN5
+** SIG ** bWNiLmNvbS91bml2ZXJzYWwtcm9vdC5jcmwwEwYDVR0l
+** SIG ** BAwwCgYIKwYBBQUHAwgwKAYDVR0RBCEwH6QdMBsxGTAX
+** SIG ** BgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTMwHQYDVR0OBBYE
+** SIG ** FK9j1sqjToVy4Ke8QfMpojh/gHViMB8GA1UdIwQYMBaA
+** SIG ** FLZ3+mlIR59TEtXC6gcydgfRlwcZMA0GCSqGSIb3DQEB
+** SIG ** CwUAA4IBAQB16rAt1TQZXDJF/g7h1E+meMFv1+rd3E/z
+** SIG ** ociBiPenjxXmQCmt5l30otlWZIRxMCrdHmEXZiBWBpgZ
+** SIG ** jV1x8viXvAn9HJFHyeLojQP7zJAv1gpsTjPs1rSTyEyQ
+** SIG ** Y0g5QCHE3dZuiZg8tZiX6KkGtwnJj1NXQZAv4R5NTtzK
+** SIG ** EHhsQm7wtsX4YVxS9U72a433Snq+8839A9fZ9gOoD+NT
+** SIG ** 9wp17MZ1LqpmhQSZt/gGV+HGDvbor9rsmxgfqrnjOgC/
+** SIG ** zoqUywHbnsc4uw9Sq9HjlANgCk2g/idtFDL8P5dA4b+Z
+** SIG ** idvkORS92uTTw+orWrOVWFUEfcea7CMDjYUq0v+uqWGB
+** SIG ** MIIFSzCCBDOgAwIBAgIQVFjyqtdB1kS8hKl7oJZS5jAN
+** SIG ** BgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJVUzEdMBsG
+** SIG ** A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNV
+** SIG ** BAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxKDAmBgNV
+** SIG ** BAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcg
+** SIG ** Q0EwHhcNMTcwMTAyMDAwMDAwWhcNMjgwNDAxMjM1OTU5
+** SIG ** WjCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFu
+** SIG ** dGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRl
+** SIG ** YyBUcnVzdCBOZXR3b3JrMTEwLwYDVQQDEyhTeW1hbnRl
+** SIG ** YyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcy
+** SIG ** MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+** SIG ** mfP82AQJA4b511ymk8BCfOp8Y89dAOKO88CQ348p9Rjq
+** SIG ** lLeS5dewoHOB6OkKm0p8Af+dj6Q5pw7qRfQiDDpw7TlF
+** SIG ** i+TFG1zwRWhGJAVjdpsc/J5sKrFW5Yp/UnGu8jXVRiMG
+** SIG ** HM9ILR20zbjZdiOOHP8+v7sGXGkHpmUO+F6ufS7tTa41
+** SIG ** 78nXAEL9KJUOn11yQgm8w9pE0u3MR4Tk/MotrFi+rveu
+** SIG ** 2UQNCLfCd9YaQ3DRbgPeUpLEEAhx2boiVfIfvO2bnTvi
+** SIG ** Xh1Mg/+XD3sL51WDTtIN677X7K5uR7mf36XWUbwEVe3/
+** SIG ** J3BMye0qSxPhsblMD8kB7lVlX2kCeGbLPwIDAQABo4IB
+** SIG ** xzCCAcMwDAYDVR0TAQH/BAIwADBmBgNVHSAEXzBdMFsG
+** SIG ** C2CGSAGG+EUBBxcDMEwwIwYIKwYBBQUHAgEWF2h0dHBz
+** SIG ** Oi8vZC5zeW1jYi5jb20vY3BzMCUGCCsGAQUFBwICMBka
+** SIG ** F2h0dHBzOi8vZC5zeW1jYi5jb20vcnBhMEAGA1UdHwQ5
+** SIG ** MDcwNaAzoDGGL2h0dHA6Ly90cy1jcmwud3Muc3ltYW50
+** SIG ** ZWMuY29tL3NoYTI1Ni10c3MtY2EuY3JsMBYGA1UdJQEB
+** SIG ** /wQMMAoGCCsGAQUFBwMIMA4GA1UdDwEB/wQEAwIHgDB3
+** SIG ** BggrBgEFBQcBAQRrMGkwKgYIKwYBBQUHMAGGHmh0dHA6
+** SIG ** Ly90cy1vY3NwLndzLnN5bWFudGVjLmNvbTA7BggrBgEF
+** SIG ** BQcwAoYvaHR0cDovL3RzLWFpYS53cy5zeW1hbnRlYy5j
+** SIG ** b20vc2hhMjU2LXRzcy1jYS5jZXIwKAYDVR0RBCEwH6Qd
+** SIG ** MBsxGTAXBgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTUwHQYD
+** SIG ** VR0OBBYEFAm1wf6WcpcpQ5rJ4AK6rvj9L7r2MB8GA1Ud
+** SIG ** IwQYMBaAFK9j1sqjToVy4Ke8QfMpojh/gHViMA0GCSqG
+** SIG ** SIb3DQEBCwUAA4IBAQAXswqI6VxaXiBrOwoVsmzFqYoy
+** SIG ** h9Ox9BxTroW+P5v/17y3lIW0x1J+lOi97WGy1KeZ5MPJ
+** SIG ** k8E1PQvoaApdVpi9sSI70UR617/wbVEyitUj3zgBN/bi
+** SIG ** Uyt6KxGPt01sejMDG3xrCZQXu+TbWNQhE2Xn7NElyix1
+** SIG ** mpx//Mm7KmirxH20z6PJbKfZxACciQp3kfRNovsxO4Zu
+** SIG ** 9uYfUAOGm7/LQqvmdptyWhEBisbvpW+V592uuuYiZfAY
+** SIG ** WRsRyc2At9iXRx9CCPiscR+wRlOz1LLVo6tQdUgSF4Kt
+** SIG ** z+BBTzJ+zZUcv5GKCD2kp2cClt8kTKXQQcCCYKOKFzJL
+** SIG ** 07zPpLSMMYICWjCCAlYCAQEwgYswdzELMAkGA1UEBhMC
+** SIG ** VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9u
+** SIG ** MR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3Jr
+** SIG ** MSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0
+** SIG ** YW1waW5nIENBAhBUWPKq10HWRLyEqXugllLmMAsGCWCG
+** SIG ** SAFlAwQCAaCBpDAaBgkqhkiG9w0BCQMxDQYLKoZIhvcN
+** SIG ** AQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTE3MDQxODEyNDQw
+** SIG ** MlowLwYJKoZIhvcNAQkEMSIEILHqBzTscF8lh+FK7g2t
+** SIG ** 9A0O6rHk8j/L3MJ11/EMxA96MDcGCyqGSIb3DQEJEAIv
+** SIG ** MSgwJjAkMCIEIM96wXrQR+zV/cNoIgMbEtTvB4tvK0xe
+** SIG ** a6Qfj/LPS61nMAsGCSqGSIb3DQEBAQSCAQBURpMMWBM+
+** SIG ** Kdzjmvg/btSpl0lZ6oVobdcn9w7dAw4EOTXWfrnNt9qI
+** SIG ** afs2g5ZflDnanEBu42yiWkPt75tV49Zar5y6Nh8UfIe7
+** SIG ** 7fgXnyABWAoD/L8kxAcmC1XG2QF/5M9bnTpHGn/In4za
+** SIG ** 369lOomXWXJo5GAkZQlwU9v8Y4YuT2BJEVX9XELBjSTN
+** SIG ** 4hMOY3WqPr/pMcEC48N+27LTQbR4S1HHcHe3Jh/QILnZ
+** SIG ** +XRSvWj6SWI34oL1VcHVEaGT+25SJ+mL8kvN/60pv9p4
+** SIG ** IuMou3rHazqswdZbgMJS5owBAxea1EKcnQWIcpl9VQXj
+** SIG ** Ty/vnpoPcGdDRPPVMN4Czfmc
 </signature>
 </package>
--- a/bin/ZRCUpdate.wsf
+++ b/bin/ZRCUpdate.wsf
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

@@ -3975,189 +3975,216 @@
 	</job>

 <signature>
-** SIG ** MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQExCzAJBgUr
+** SIG ** MIIbIAYJKoZIhvcNAQcCoIIbETCCGw0CAQExCzAJBgUr
 ** SIG ** DgMCGgUAMGcGCisGAQQBgjcCAQSgWTBXMDIGCisGAQQB
 ** SIG ** gjcCAR4wJAIBAQQQcAVhGs441BGiowAQS9NQkAIBAAIB
-** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFE+sYSc97fGB
-** SIG ** RLlC6RYtLXbnQgj5oIISyDCCA+4wggNXoAMCAQICEH6T
-** SIG ** 6/t8xk5Z6kuad9QG/DswDQYJKoZIhvcNAQEFBQAwgYsx
-** SIG ** CzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENh
-** SIG ** cGUxFDASBgNVBAcTC0R1cmJhbnZpbGxlMQ8wDQYDVQQK
-** SIG ** EwZUaGF3dGUxHTAbBgNVBAsTFFRoYXd0ZSBDZXJ0aWZp
-** SIG ** Y2F0aW9uMR8wHQYDVQQDExZUaGF3dGUgVGltZXN0YW1w
-** SIG ** aW5nIENBMB4XDTEyMTIyMTAwMDAwMFoXDTIwMTIzMDIz
-** SIG ** NTk1OVowXjELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBUaW1lIFN0YW1waW5nIFNlcnZpY2VzIENBIC0g
-** SIG ** RzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-** SIG ** AQCxrLNJVEuXHBIK2CV5kSJXKm/cuCbEQ3Nrwr8uUFr7
-** SIG ** FMJ2jkMBJUO0oeJF9Oi3e8N0zCLXtJQAAvdN7b+0t0Qk
-** SIG ** a81fRTvRRM5DEnMXgotptCvLmR6schsmTXEfsTHd+1Fh
-** SIG ** AlOmqvVJLAV4RaUvic7nmef+jOJXPz3GktxK+Hsz5HkK
-** SIG ** +/B1iEGc/8UDUZmq12yfk2mHZSmDhcJgFMTIyTsU2sCB
-** SIG ** 8B8NdN6SIqvK9/t0fCfm90obf6fDni2uiuqm5qonFn1h
-** SIG ** 95hxEbziUKFL5V365Q6nLJ+qZSDT2JboyHylTkhE/xni
-** SIG ** RAeSC9dohIBdanhkRc1gRn5UwRN8xXnxycFxAgMBAAGj
-** SIG ** gfowgfcwHQYDVR0OBBYEFF+a9W5czMx0mtTdfe8/2+xM
-** SIG ** gC7dMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcwAYYW
-** SIG ** aHR0cDovL29jc3AudGhhd3RlLmNvbTASBgNVHRMBAf8E
-** SIG ** CDAGAQH/AgEAMD8GA1UdHwQ4MDYwNKAyoDCGLmh0dHA6
-** SIG ** Ly9jcmwudGhhd3RlLmNvbS9UaGF3dGVUaW1lc3RhbXBp
-** SIG ** bmdDQS5jcmwwEwYDVR0lBAwwCgYIKwYBBQUHAwgwDgYD
-** SIG ** VR0PAQH/BAQDAgEGMCgGA1UdEQQhMB+kHTAbMRkwFwYD
-** SIG ** VQQDExBUaW1lU3RhbXAtMjA0OC0xMA0GCSqGSIb3DQEB
-** SIG ** BQUAA4GBAAMJm495739ZMKrvaLX64wkdu0+CBl03X6ZS
-** SIG ** nxaN6hySCURu9W3rWHww6PlpjSNzCxJvR6muORH4KrGb
-** SIG ** sBrDjutZlgCtzgxNstAxpghcKnr84nodV0yoZRjpeUBi
-** SIG ** JZZux8c3aoMhCI5B6t3ZVz8dd0mHKhYGXqY4aiISo1EZ
-** SIG ** g362MIIEozCCA4ugAwIBAgIQDs/0OMj+vzVuBNhqmBsa
-** SIG ** UDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEd
-** SIG ** MBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xMDAu
-** SIG ** BgNVBAMTJ1N5bWFudGVjIFRpbWUgU3RhbXBpbmcgU2Vy
-** SIG ** dmljZXMgQ0EgLSBHMjAeFw0xMjEwMTgwMDAwMDBaFw0y
-** SIG ** MDEyMjkyMzU5NTlaMGIxCzAJBgNVBAYTAlVTMR0wGwYD
-** SIG ** VQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjE0MDIGA1UE
-** SIG ** AxMrU3ltYW50ZWMgVGltZSBTdGFtcGluZyBTZXJ2aWNl
-** SIG ** cyBTaWduZXIgLSBHNDCCASIwDQYJKoZIhvcNAQEBBQAD
-** SIG ** ggEPADCCAQoCggEBAKJjCzlEuLsjp0RJuw7/ofBhClOT
-** SIG ** sJjbrSwPSsVu/4Y8U1UPFc4EPyv9qZaW2b5heQtbyUyG
-** SIG ** duXgQ0sile7CK0PBn9hotI5AT+6FOLkRxSPyZFjwFTJv
-** SIG ** TlehroikAtcqHs1L4d1j1ReJMluwXplaqJ0oUA4X7pbb
-** SIG ** YTtFUR3PElYLkkf8q672Zj1HrHBy55LnX80QucSDZJQZ
-** SIG ** vSWA4ejSIqXQugJ6oXeTW2XD7hd0vEGGKtwITIySjJEt
-** SIG ** nndEH2jWqHR32w5bMotWizO92WPISZ06xcXqMwvS8aMb
-** SIG ** 9Iu+2bNXizveBKd6IrIkri7HcMW+ToMmCPsLvalPmQjh
-** SIG ** EChyqs0CAwEAAaOCAVcwggFTMAwGA1UdEwEB/wQCMAAw
-** SIG ** FgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/
-** SIG ** BAQDAgeAMHMGCCsGAQUFBwEBBGcwZTAqBggrBgEFBQcw
-** SIG ** AYYeaHR0cDovL3RzLW9jc3Aud3Muc3ltYW50ZWMuY29t
-** SIG ** MDcGCCsGAQUFBzAChitodHRwOi8vdHMtYWlhLndzLnN5
-** SIG ** bWFudGVjLmNvbS90c3MtY2EtZzIuY2VyMDwGA1UdHwQ1
-** SIG ** MDMwMaAvoC2GK2h0dHA6Ly90cy1jcmwud3Muc3ltYW50
-** SIG ** ZWMuY29tL3Rzcy1jYS1nMi5jcmwwKAYDVR0RBCEwH6Qd
-** SIG ** MBsxGTAXBgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTIwHQYD
-** SIG ** VR0OBBYEFEbGaaMOShQe1UzaUmMXP142vA3mMB8GA1Ud
-** SIG ** IwQYMBaAFF+a9W5czMx0mtTdfe8/2+xMgC7dMA0GCSqG
-** SIG ** SIb3DQEBBQUAA4IBAQB4O7SRKgBM8I9iMDd4o4QnB28Y
-** SIG ** st4l3KDUlAOqhk4ln5pAAxzdzuN5yyFoBtq2MrRtv/Qs
-** SIG ** JmMz5ElkbQ3mw2cO9wWkNWx8iRbG6bLfsundIMZxD82V
-** SIG ** dNy2XN69Nx9DeOZ4tc0oBCCjqvFLxIgpkQ6A0RH83Vx2
-** SIG ** bk9eDkVGQW4NsOo4mrE62glxEPwcebSAe6xp9P2ctgwW
-** SIG ** K/F/Wwk9m1viFsoTgW0ALjgNqCmPLOGy9FqpAa8VnCwv
-** SIG ** SRvbIrvD/niUUcOGsYKIXfA9tFGheTMrLnu53CAJE3Hr
-** SIG ** ahlbz+ilMFcsiUk/uc9/yb8+ImhjU5q9aXSsxR08f5Lg
-** SIG ** w7wc2AR1MIIEzjCCA7agAwIBAgIQMHo2eqo+aIGm+U8I
-** SIG ** yzs5ZDANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
+** SIG ** AAIBAAIBAAIBADAhMAkGBSsOAwIaBQAEFOjAK2fMh9fJ
+** SIG ** WmNxFll+i7wGG1PhoIIKLzCCBM4wggO2oAMCAQICEDB6
+** SIG ** NnqqPmiBpvlPCMs7OWQwDQYJKoZIhvcNAQELBQAwfzEL
+** SIG ** MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENv
+** SIG ** cnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVz
+** SIG ** dCBOZXR3b3JrMTAwLgYDVQQDEydTeW1hbnRlYyBDbGFz
+** SIG ** cyAzIFNIQTI1NiBDb2RlIFNpZ25pbmcgQ0EwHhcNMTUx
+** SIG ** MDA5MDAwMDAwWhcNMTgxMTA3MjM1OTU5WjBhMQswCQYD
+** SIG ** VQQGEwJTSTERMA8GA1UECBMIU2xvdmVuaWExDzANBgNV
+** SIG ** BAcTBkthbW5pazEWMBQGA1UEChQNQW1lYmlzIGQuby5v
+** SIG ** LjEWMBQGA1UEAxQNQW1lYmlzIGQuby5vLjCCASIwDQYJ
+** SIG ** KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfy6Bdwx2kq
+** SIG ** yGhtaYAZgcA8pWLe7EbyLqBHRq/8jIVfUX1CH7fsbEz1
+** SIG ** UDgIq74BvilG3BNyjJxh/lbiu2Pr2M0ad3WEy4p0kM9T
+** SIG ** SmABC8k3Vc5pmJlNy1++uMpNwAbUmbGcD6Igsvk1xPWb
+** SIG ** ApLoAdnO0KfTfzvRI40A0cGZVGt5y6GPemN6jT8JAp9O
+** SIG ** KaWIqj3iF00c/FwS7ODZf2w/cMphLjUle+b86GyewVGE
+** SIG ** MEVO5ZjS9ksEWBDWn9A6XYshSwbDWnx4xmIl0B4DcWVA
+** SIG ** aY+zqEQzQbzEGC/izPDq44RiCtbhi+QqgQ/6fNXm3hbA
+** SIG ** GVcYPYa4J5D1UMO+1NC2cPMCAwEAAaOCAWIwggFeMAkG
+** SIG ** A1UdEwQCMAAwDgYDVR0PAQH/BAQDAgeAMCsGA1UdHwQk
+** SIG ** MCIwIKAeoByGGmh0dHA6Ly9zdi5zeW1jYi5jb20vc3Yu
+** SIG ** Y3JsMGYGA1UdIARfMF0wWwYLYIZIAYb4RQEHFwMwTDAj
+** SIG ** BggrBgEFBQcCARYXaHR0cHM6Ly9kLnN5bWNiLmNvbS9j
+** SIG ** cHMwJQYIKwYBBQUHAgIwGQwXaHR0cHM6Ly9kLnN5bWNi
+** SIG ** LmNvbS9ycGEwEwYDVR0lBAwwCgYIKwYBBQUHAwMwVwYI
+** SIG ** KwYBBQUHAQEESzBJMB8GCCsGAQUFBzABhhNodHRwOi8v
+** SIG ** c3Yuc3ltY2QuY29tMCYGCCsGAQUFBzAChhpodHRwOi8v
+** SIG ** c3Yuc3ltY2IuY29tL3N2LmNydDAfBgNVHSMEGDAWgBSW
+** SIG ** O1PweTOXr32D7y4rzMq3hh5yZjAdBgNVHQ4EFgQU9we9
+** SIG ** loCaLXTEfww9PSfd1JAKn8wwDQYJKoZIhvcNAQELBQAD
+** SIG ** ggEBAIpxL0AvtcrbShLKgI7dmLn6WJbpdzkB9e2Cm1Mu
+** SIG ** AAIiogLFF1n07l0VXZE+gqxGHB8ji2h33t+o1R8PLyyI
+** SIG ** kdnMhHAd78HsqyZzabfmWuCP12TKBv77wiZkpbTo/Av+
+** SIG ** z0SlpJRoMpzzXhyPPtHdby80bSu+4RXlewiDCH56aGE4
+** SIG ** SSk0i8Xa9JJ/ozPKLX3Szdmg6J58XtDH/tq5K1/ABSCB
+** SIG ** z6SF2Y9l9lRJpGXchSDYCPipSVUGP0WPQRTDNobSwCJD
+** SIG ** XAz9UFcxWo4Rh8o/gvlLWUH+T3HhmLSRzXqt3JuqJo5x
+** SIG ** H8s4vPzcGBZZFob8yRB98KD6ioFK2pjRRSw9FucwggVZ
+** SIG ** MIIEQaADAgECAhA9eNf5dklgsmF99PAeyoYqMA0GCSqG
+** SIG ** SIb3DQEBCwUAMIHKMQswCQYDVQQGEwJVUzEXMBUGA1UE
+** SIG ** ChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+** SIG ** aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAy
+** SIG ** MDA2IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6
+** SIG ** ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENs
+** SIG ** YXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
+** SIG ** biBBdXRob3JpdHkgLSBHNTAeFw0xMzEyMTAwMDAwMDBa
+** SIG ** Fw0yMzEyMDkyMzU5NTlaMH8xCzAJBgNVBAYTAlVTMR0w
+** SIG ** GwYDVQQKExRTeW1hbnRlYyBDb3Jwb3JhdGlvbjEfMB0G
+** SIG ** A1UECxMWU3ltYW50ZWMgVHJ1c3QgTmV0d29yazEwMC4G
+** SIG ** A1UEAxMnU3ltYW50ZWMgQ2xhc3MgMyBTSEEyNTYgQ29k
+** SIG ** ZSBTaWduaW5nIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+** SIG ** AQ8AMIIBCgKCAQEAl4MeABavLLHSCMTXaJNRYB5x9uJH
+** SIG ** tNtYTSNiarS/WhtR96MNGHdou9g2qy8hUNqe8+dfJ04L
+** SIG ** wpfICXCTqdpcDU6kDZGgtOwUzpFyVC7Oo9tE6VIbP0E8
+** SIG ** ykrkqsDoOatTzCHQzM9/m+bCzFhqghXuPTbPHMWXBySO
+** SIG ** 8Xu+MS09bty1mUKfS2GVXxxw7hd924vlYYl4x2gbrxF4
+** SIG ** GpiuxFVHU9mzMtahDkZAxZeSitFTp5lbhTVX0+qTYmEg
+** SIG ** CscwdyQRTWKDtrp7aIIx7mXK3/nVjbI13Iwrb2pyXGCE
+** SIG ** nPIMlF7AVlIASMzT+KV93i/XE+Q4qITVRrgThsIbnepa
+** SIG ** ON2b2wIDAQABo4IBgzCCAX8wLwYIKwYBBQUHAQEEIzAh
+** SIG ** MB8GCCsGAQUFBzABhhNodHRwOi8vczIuc3ltY2IuY29t
+** SIG ** MBIGA1UdEwEB/wQIMAYBAf8CAQAwbAYDVR0gBGUwYzBh
+** SIG ** BgtghkgBhvhFAQcXAzBSMCYGCCsGAQUFBwIBFhpodHRw
+** SIG ** Oi8vd3d3LnN5bWF1dGguY29tL2NwczAoBggrBgEFBQcC
+** SIG ** AjAcGhpodHRwOi8vd3d3LnN5bWF1dGguY29tL3JwYTAw
+** SIG ** BgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vczEuc3ltY2Iu
+** SIG ** Y29tL3BjYTMtZzUuY3JsMB0GA1UdJQQWMBQGCCsGAQUF
+** SIG ** BwMCBggrBgEFBQcDAzAOBgNVHQ8BAf8EBAMCAQYwKQYD
+** SIG ** VR0RBCIwIKQeMBwxGjAYBgNVBAMTEVN5bWFudGVjUEtJ
+** SIG ** LTEtNTY3MB0GA1UdDgQWBBSWO1PweTOXr32D7y4rzMq3
+** SIG ** hh5yZjAfBgNVHSMEGDAWgBR/02Wnwt3su/AwCfNDOfoC
+** SIG ** rzMxMzANBgkqhkiG9w0BAQsFAAOCAQEAE4UaHmmpN/eg
+** SIG ** vaSvfh1hU/6djF4MpnUeeBcj3f3sGgNVOftxlcdlWqeO
+** SIG ** MNJEWmHbcG/aIQXCLnO6SfHRk/5dyc1eA+CJnj90Htf3
+** SIG ** OIup1s+7NS8zWKiSVtHITTuC5nmEFvwosLFH8x2iPu6H
+** SIG ** 2aZ/pFalP62ELinefLyoqqM9BAHqupOiDlAiKRdMh+Q6
+** SIG ** EV/WpCWJmwVrL7TJAUwnewusGQUioGAVP9rJ+01Mj/ty
+** SIG ** Z3f9J5THujUOiEn+jf0or0oSvQ2zlwXeRAwV+jYrA9zB
+** SIG ** UAHxoRFdFOXivSdLVL4rhF4PpsN0BQrvl8OJIrEfd/O9
+** SIG ** zUPU8UypP7WLhK9k8tAUITGCEF0wghBZAgEBMIGTMH8x
+** SIG ** CzAJBgNVBAYTAlVTMR0wGwYDVQQKExRTeW1hbnRlYyBD
+** SIG ** b3Jwb3JhdGlvbjEfMB0GA1UECxMWU3ltYW50ZWMgVHJ1
+** SIG ** c3QgTmV0d29yazEwMC4GA1UEAxMnU3ltYW50ZWMgQ2xh
+** SIG ** c3MgMyBTSEEyNTYgQ29kZSBTaWduaW5nIENBAhAwejZ6
+** SIG ** qj5ogab5TwjLOzlkMAkGBSsOAwIaBQCgcDAQBgorBgEE
+** SIG ** AYI3AgEMMQIwADAZBgkqhkiG9w0BCQMxDAYKKwYBBAGC
+** SIG ** NwIBBDAcBgorBgEEAYI3AgELMQ4wDAYKKwYBBAGCNwIB
+** SIG ** FTAjBgkqhkiG9w0BCQQxFgQU1JiqEBFfMLz+ewvucB0g
+** SIG ** YCeAM7EwDQYJKoZIhvcNAQEBBQAEggEASOfdyfso3+eN
+** SIG ** te5yCJXV9sWpFSsx8AOVFHCJ/Jomo40NU8VxLKvYH8eU
+** SIG ** XdjdKSJgf2PinrtHR2xitUrwb7WvIVeAlrnO1ZdvwzAG
+** SIG ** Xes/RjEhMZ2X6x5fh+yaIrF+r0qcGSXaZjBrkBUZDMzo
+** SIG ** ub8miWO7AtxyGV+T4mUtJjKnS7eIUfO63h1GvwVz0usf
+** SIG ** vloF+FCb02TlERIr4N9uO1OK+j5md6DDh5WZyCki6FAl
+** SIG ** ptvjgbDfi7T9Vpae8jdZmBTcog0QGhmCBmN9Br7DDojU
+** SIG ** OSaEEJ4XTa+TIBFFslWLIImQ8FCaySzsLx+6k2aI9N56
+** SIG ** dZhMtwv0ITsEF75iU7us+KGCDiwwgg4oBgorBgEEAYI3
+** SIG ** AwMBMYIOGDCCDhQGCSqGSIb3DQEHAqCCDgUwgg4BAgED
+** SIG ** MQ0wCwYJYIZIAWUDBAIBMIH/BgsqhkiG9w0BCRABBKCB
+** SIG ** 7wSB7DCB6QIBAQYLYIZIAYb4RQEHFwMwITAJBgUrDgMC
+** SIG ** GgUABBRpigMmb6ApU583AUw7154GsXnZIgIVAPAoqBpf
+** SIG ** lG9FED3JtlJaAQhNVaq8GA8yMDE3MDQxODEyNDMxNFow
+** SIG ** AwIBHqCBhqSBgzCBgDELMAkGA1UEBhMCVVMxHTAbBgNV
+** SIG ** BAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQL
+** SIG ** ExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMTEwLwYDVQQD
+** SIG ** EyhTeW1hbnRlYyBTSEEyNTYgVGltZVN0YW1waW5nIFNp
+** SIG ** Z25lciAtIEcyoIIKizCCBTgwggQgoAMCAQICEHsFsdRJ
+** SIG ** aFFE98mJ0pwZnRIwDQYJKoZIhvcNAQELBQAwgb0xCzAJ
+** SIG ** BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j
+** SIG ** LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
+** SIG ** azE6MDgGA1UECxMxKGMpIDIwMDggVmVyaVNpZ24sIElu
+** SIG ** Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE4MDYG
+** SIG ** A1UEAxMvVmVyaVNpZ24gVW5pdmVyc2FsIFJvb3QgQ2Vy
+** SIG ** dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTYwMTEyMDAw
+** SIG ** MDAwWhcNMzEwMTExMjM1OTU5WjB3MQswCQYDVQQGEwJV
 ** SIG ** UzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24x
 ** SIG ** HzAdBgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsx
-** SIG ** MDAuBgNVBAMTJ1N5bWFudGVjIENsYXNzIDMgU0hBMjU2
-** SIG ** IENvZGUgU2lnbmluZyBDQTAeFw0xNTEwMDkwMDAwMDBa
-** SIG ** Fw0xODExMDcyMzU5NTlaMGExCzAJBgNVBAYTAlNJMREw
-** SIG ** DwYDVQQIEwhTbG92ZW5pYTEPMA0GA1UEBxMGS2Ftbmlr
-** SIG ** MRYwFAYDVQQKFA1BbWViaXMgZC5vLm8uMRYwFAYDVQQD
-** SIG ** FA1BbWViaXMgZC5vLm8uMIIBIjANBgkqhkiG9w0BAQEF
-** SIG ** AAOCAQ8AMIIBCgKCAQEAl/LoF3DHaSrIaG1pgBmBwDyl
-** SIG ** Yt7sRvIuoEdGr/yMhV9RfUIft+xsTPVQOAirvgG+KUbc
-** SIG ** E3KMnGH+VuK7Y+vYzRp3dYTLinSQz1NKYAELyTdVzmmY
-** SIG ** mU3LX764yk3ABtSZsZwPoiCy+TXE9ZsCkugB2c7Qp9N/
-** SIG ** O9EjjQDRwZlUa3nLoY96Y3qNPwkCn04ppYiqPeIXTRz8
-** SIG ** XBLs4Nl/bD9wymEuNSV75vzobJ7BUYQwRU7lmNL2SwRY
-** SIG ** ENaf0DpdiyFLBsNafHjGYiXQHgNxZUBpj7OoRDNBvMQY
-** SIG ** L+LM8OrjhGIK1uGL5CqBD/p81ebeFsAZVxg9hrgnkPVQ
-** SIG ** w77U0LZw8wIDAQABo4IBYjCCAV4wCQYDVR0TBAIwADAO
-** SIG ** BgNVHQ8BAf8EBAMCB4AwKwYDVR0fBCQwIjAgoB6gHIYa
-** SIG ** aHR0cDovL3N2LnN5bWNiLmNvbS9zdi5jcmwwZgYDVR0g
-** SIG ** BF8wXTBbBgtghkgBhvhFAQcXAzBMMCMGCCsGAQUFBwIB
-** SIG ** FhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEF
-** SIG ** BQcCAjAZDBdodHRwczovL2Quc3ltY2IuY29tL3JwYTAT
-** SIG ** BgNVHSUEDDAKBggrBgEFBQcDAzBXBggrBgEFBQcBAQRL
-** SIG ** MEkwHwYIKwYBBQUHMAGGE2h0dHA6Ly9zdi5zeW1jZC5j
-** SIG ** b20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9zdi5zeW1jYi5j
-** SIG ** b20vc3YuY3J0MB8GA1UdIwQYMBaAFJY7U/B5M5evfYPv
-** SIG ** LivMyreGHnJmMB0GA1UdDgQWBBT3B72WgJotdMR/DD09
-** SIG ** J93UkAqfzDANBgkqhkiG9w0BAQsFAAOCAQEAinEvQC+1
-** SIG ** yttKEsqAjt2YufpYlul3OQH17YKbUy4AAiKiAsUXWfTu
-** SIG ** XRVdkT6CrEYcHyOLaHfe36jVHw8vLIiR2cyEcB3vweyr
-** SIG ** JnNpt+Za4I/XZMoG/vvCJmSltOj8C/7PRKWklGgynPNe
-** SIG ** HI8+0d1vLzRtK77hFeV7CIMIfnpoYThJKTSLxdr0kn+j
-** SIG ** M8otfdLN2aDonnxe0Mf+2rkrX8AFIIHPpIXZj2X2VEmk
-** SIG ** ZdyFINgI+KlJVQY/RY9BFMM2htLAIkNcDP1QVzFajhGH
-** SIG ** yj+C+UtZQf5PceGYtJHNeq3cm6omjnEfyzi8/NwYFlkW
-** SIG ** hvzJEH3woPqKgUramNFFLD0W5zCCBVkwggRBoAMCAQIC
-** SIG ** ED141/l2SWCyYX308B7KhiowDQYJKoZIhvcNAQELBQAw
-** SIG ** gcoxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-** SIG ** biwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3Qg
-** SIG ** TmV0d29yazE6MDgGA1UECxMxKGMpIDIwMDYgVmVyaVNp
-** SIG ** Z24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-** SIG ** eTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMyBQdWJs
-** SIG ** aWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-** SIG ** eSAtIEc1MB4XDTEzMTIxMDAwMDAwMFoXDTIzMTIwOTIz
-** SIG ** NTk1OVowfzELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h
-** SIG ** bnRlYyBUcnVzdCBOZXR3b3JrMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBDbGFzcyAzIFNIQTI1NiBDb2RlIFNpZ25pbmcg
-** SIG ** Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-** SIG ** AQCXgx4AFq8ssdIIxNdok1FgHnH24ke021hNI2JqtL9a
-** SIG ** G1H3ow0Yd2i72DarLyFQ2p7z518nTgvCl8gJcJOp2lwN
-** SIG ** TqQNkaC07BTOkXJULs6j20TpUhs/QTzKSuSqwOg5q1PM
-** SIG ** IdDMz3+b5sLMWGqCFe49Ns8cxZcHJI7xe74xLT1u3LWZ
-** SIG ** Qp9LYZVfHHDuF33bi+VhiXjHaBuvEXgamK7EVUdT2bMy
-** SIG ** 1qEORkDFl5KK0VOnmVuFNVfT6pNiYSAKxzB3JBFNYoO2
-** SIG ** untogjHuZcrf+dWNsjXcjCtvanJcYISc8gyUXsBWUgBI
-** SIG ** zNP4pX3eL9cT5DiohNVGuBOGwhud6lo43ZvbAgMBAAGj
-** SIG ** ggGDMIIBfzAvBggrBgEFBQcBAQQjMCEwHwYIKwYBBQUH
-** SIG ** MAGGE2h0dHA6Ly9zMi5zeW1jYi5jb20wEgYDVR0TAQH/
-** SIG ** BAgwBgEB/wIBADBsBgNVHSAEZTBjMGEGC2CGSAGG+EUB
-** SIG ** BxcDMFIwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc3lt
-** SIG ** YXV0aC5jb20vY3BzMCgGCCsGAQUFBwICMBwaGmh0dHA6
-** SIG ** Ly93d3cuc3ltYXV0aC5jb20vcnBhMDAGA1UdHwQpMCcw
-** SIG ** JaAjoCGGH2h0dHA6Ly9zMS5zeW1jYi5jb20vcGNhMy1n
-** SIG ** NS5jcmwwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
-** SIG ** BwMDMA4GA1UdDwEB/wQEAwIBBjApBgNVHREEIjAgpB4w
-** SIG ** HDEaMBgGA1UEAxMRU3ltYW50ZWNQS0ktMS01NjcwHQYD
-** SIG ** VR0OBBYEFJY7U/B5M5evfYPvLivMyreGHnJmMB8GA1Ud
-** SIG ** IwQYMBaAFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
-** SIG ** SIb3DQEBCwUAA4IBAQAThRoeaak396C9pK9+HWFT/p2M
-** SIG ** XgymdR54FyPd/ewaA1U5+3GVx2Vap44w0kRaYdtwb9oh
-** SIG ** BcIuc7pJ8dGT/l3JzV4D4ImeP3Qe1/c4i6nWz7s1LzNY
-** SIG ** qJJW0chNO4LmeYQW/CiwsUfzHaI+7ofZpn+kVqU/rYQu
-** SIG ** Kd58vKiqoz0EAeq6k6IOUCIpF0yH5DoRX9akJYmbBWsv
-** SIG ** tMkBTCd7C6wZBSKgYBU/2sn7TUyP+3Jnd/0nlMe6NQ6I
-** SIG ** Sf6N/SivShK9DbOXBd5EDBX6NisD3MFQAfGhEV0U5eK9
-** SIG ** J0tUviuEXg+mw3QFCu+Xw4kisR93873NQ9TxTKk/tYuE
-** SIG ** r2Ty0BQhMYIEPDCCBDgCAQEwgZMwfzELMAkGA1UEBhMC
+** SIG ** KDAmBgNVBAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3Rh
+** SIG ** bXBpbmcgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+** SIG ** ggEKAoIBAQC7WZ1ZVU+djHJdGoGi61XzsAGtPHGsMo8F
+** SIG ** a4aaJwAyl2pNyWQUSym7wtkpuS7sY7Phzz8LVpD4Yht+
+** SIG ** 66YH4t5/Xm1AONSRBudBfHkcy8utG7/YlZHz8O5s+K2W
+** SIG ** OS5/wSe4eDnFhKXt7a+Hjs6Nx23q0pi1Oh8eOZ3D9Jqo
+** SIG ** 9IThxNF8ccYGKbQ/5IMNJsN7CD5N+Qq3M0n/yjvU9bKb
+** SIG ** S+GImRr1wOkzFNbfx4Dbke7+vJJXcnf0zajM/gn1kze+
+** SIG ** lYhqxdz0sUvUzugJkV+1hHk1inisGTKPI8EyQRtZDqk+
+** SIG ** scz51ivvt9jk1R1tETqS9pPJnONI7rtTDtQ2l4Z4xaE3
+** SIG ** AgMBAAGjggF3MIIBczAOBgNVHQ8BAf8EBAMCAQYwEgYD
+** SIG ** VR0TAQH/BAgwBgEB/wIBADBmBgNVHSAEXzBdMFsGC2CG
+** SIG ** SAGG+EUBBxcDMEwwIwYIKwYBBQUHAgEWF2h0dHBzOi8v
+** SIG ** ZC5zeW1jYi5jb20vY3BzMCUGCCsGAQUFBwICMBkaF2h0
+** SIG ** dHBzOi8vZC5zeW1jYi5jb20vcnBhMC4GCCsGAQUFBwEB
+** SIG ** BCIwIDAeBggrBgEFBQcwAYYSaHR0cDovL3Muc3ltY2Qu
+** SIG ** Y29tMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9zLnN5
+** SIG ** bWNiLmNvbS91bml2ZXJzYWwtcm9vdC5jcmwwEwYDVR0l
+** SIG ** BAwwCgYIKwYBBQUHAwgwKAYDVR0RBCEwH6QdMBsxGTAX
+** SIG ** BgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTMwHQYDVR0OBBYE
+** SIG ** FK9j1sqjToVy4Ke8QfMpojh/gHViMB8GA1UdIwQYMBaA
+** SIG ** FLZ3+mlIR59TEtXC6gcydgfRlwcZMA0GCSqGSIb3DQEB
+** SIG ** CwUAA4IBAQB16rAt1TQZXDJF/g7h1E+meMFv1+rd3E/z
+** SIG ** ociBiPenjxXmQCmt5l30otlWZIRxMCrdHmEXZiBWBpgZ
+** SIG ** jV1x8viXvAn9HJFHyeLojQP7zJAv1gpsTjPs1rSTyEyQ
+** SIG ** Y0g5QCHE3dZuiZg8tZiX6KkGtwnJj1NXQZAv4R5NTtzK
+** SIG ** EHhsQm7wtsX4YVxS9U72a433Snq+8839A9fZ9gOoD+NT
+** SIG ** 9wp17MZ1LqpmhQSZt/gGV+HGDvbor9rsmxgfqrnjOgC/
+** SIG ** zoqUywHbnsc4uw9Sq9HjlANgCk2g/idtFDL8P5dA4b+Z
+** SIG ** idvkORS92uTTw+orWrOVWFUEfcea7CMDjYUq0v+uqWGB
+** SIG ** MIIFSzCCBDOgAwIBAgIQVFjyqtdB1kS8hKl7oJZS5jAN
+** SIG ** BgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJVUzEdMBsG
+** SIG ** A1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNV
+** SIG ** BAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxKDAmBgNV
+** SIG ** BAMTH1N5bWFudGVjIFNIQTI1NiBUaW1lU3RhbXBpbmcg
+** SIG ** Q0EwHhcNMTcwMTAyMDAwMDAwWhcNMjgwNDAxMjM1OTU5
+** SIG ** WjCBgDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFu
+** SIG ** dGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRl
+** SIG ** YyBUcnVzdCBOZXR3b3JrMTEwLwYDVQQDEyhTeW1hbnRl
+** SIG ** YyBTSEEyNTYgVGltZVN0YW1waW5nIFNpZ25lciAtIEcy
+** SIG ** MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+** SIG ** mfP82AQJA4b511ymk8BCfOp8Y89dAOKO88CQ348p9Rjq
+** SIG ** lLeS5dewoHOB6OkKm0p8Af+dj6Q5pw7qRfQiDDpw7TlF
+** SIG ** i+TFG1zwRWhGJAVjdpsc/J5sKrFW5Yp/UnGu8jXVRiMG
+** SIG ** HM9ILR20zbjZdiOOHP8+v7sGXGkHpmUO+F6ufS7tTa41
+** SIG ** 78nXAEL9KJUOn11yQgm8w9pE0u3MR4Tk/MotrFi+rveu
+** SIG ** 2UQNCLfCd9YaQ3DRbgPeUpLEEAhx2boiVfIfvO2bnTvi
+** SIG ** Xh1Mg/+XD3sL51WDTtIN677X7K5uR7mf36XWUbwEVe3/
+** SIG ** J3BMye0qSxPhsblMD8kB7lVlX2kCeGbLPwIDAQABo4IB
+** SIG ** xzCCAcMwDAYDVR0TAQH/BAIwADBmBgNVHSAEXzBdMFsG
+** SIG ** C2CGSAGG+EUBBxcDMEwwIwYIKwYBBQUHAgEWF2h0dHBz
+** SIG ** Oi8vZC5zeW1jYi5jb20vY3BzMCUGCCsGAQUFBwICMBka
+** SIG ** F2h0dHBzOi8vZC5zeW1jYi5jb20vcnBhMEAGA1UdHwQ5
+** SIG ** MDcwNaAzoDGGL2h0dHA6Ly90cy1jcmwud3Muc3ltYW50
+** SIG ** ZWMuY29tL3NoYTI1Ni10c3MtY2EuY3JsMBYGA1UdJQEB
+** SIG ** /wQMMAoGCCsGAQUFBwMIMA4GA1UdDwEB/wQEAwIHgDB3
+** SIG ** BggrBgEFBQcBAQRrMGkwKgYIKwYBBQUHMAGGHmh0dHA6
+** SIG ** Ly90cy1vY3NwLndzLnN5bWFudGVjLmNvbTA7BggrBgEF
+** SIG ** BQcwAoYvaHR0cDovL3RzLWFpYS53cy5zeW1hbnRlYy5j
+** SIG ** b20vc2hhMjU2LXRzcy1jYS5jZXIwKAYDVR0RBCEwH6Qd
+** SIG ** MBsxGTAXBgNVBAMTEFRpbWVTdGFtcC0yMDQ4LTUwHQYD
+** SIG ** VR0OBBYEFAm1wf6WcpcpQ5rJ4AK6rvj9L7r2MB8GA1Ud
+** SIG ** IwQYMBaAFK9j1sqjToVy4Ke8QfMpojh/gHViMA0GCSqG
+** SIG ** SIb3DQEBCwUAA4IBAQAXswqI6VxaXiBrOwoVsmzFqYoy
+** SIG ** h9Ox9BxTroW+P5v/17y3lIW0x1J+lOi97WGy1KeZ5MPJ
+** SIG ** k8E1PQvoaApdVpi9sSI70UR617/wbVEyitUj3zgBN/bi
+** SIG ** Uyt6KxGPt01sejMDG3xrCZQXu+TbWNQhE2Xn7NElyix1
+** SIG ** mpx//Mm7KmirxH20z6PJbKfZxACciQp3kfRNovsxO4Zu
+** SIG ** 9uYfUAOGm7/LQqvmdptyWhEBisbvpW+V592uuuYiZfAY
+** SIG ** WRsRyc2At9iXRx9CCPiscR+wRlOz1LLVo6tQdUgSF4Kt
+** SIG ** z+BBTzJ+zZUcv5GKCD2kp2cClt8kTKXQQcCCYKOKFzJL
+** SIG ** 07zPpLSMMYICWjCCAlYCAQEwgYswdzELMAkGA1UEBhMC
 ** SIG ** VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9u
 ** SIG ** MR8wHQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3Jr
-** SIG ** MTAwLgYDVQQDEydTeW1hbnRlYyBDbGFzcyAzIFNIQTI1
-** SIG ** NiBDb2RlIFNpZ25pbmcgQ0ECEDB6NnqqPmiBpvlPCMs7
-** SIG ** OWQwCQYFKw4DAhoFAKBwMBAGCisGAQQBgjcCAQwxAjAA
-** SIG ** MBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisG
-** SIG ** AQQBgjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqGSIb3
-** SIG ** DQEJBDEWBBRks7QO0Q1TbqLbIDEUvL8KkL8IOzANBgkq
-** SIG ** hkiG9w0BAQEFAASCAQA27mGuVkGoe/+4z27Kao9P9zVz
-** SIG ** LaOj4xwna4cZNPuBW7dF4JOSuV9XgEq8s2T+W75iYHCc
-** SIG ** g6vroJrU+Cp5SlFdFVXwWTE/oXRV5YluBTWPiMnNfsSi
-** SIG ** fJsAKu6t9O2WqxEuS0UR//V3NayTxzDEnQ/3wNGWflsu
-** SIG ** Nht4BZvtkHVQNj4bgYKA7Do16Q7r2Xoia3l3YSQ7Fz8t
-** SIG ** PgtHBjjIa8nW33f93AK+Ln+n25gaWNKuLQ4hCJ5UB7tT
-** SIG ** ticmIaJVi6xczXfXEYQMFM4h/4A+mvBT8J7tz0iPSLud
-** SIG ** hi57YIaiWhKW9Kqvum+WU+l3zpHVbr2oAm7LHGHwlQ/t
-** SIG ** tcQguxpvoYICCzCCAgcGCSqGSIb3DQEJBjGCAfgwggH0
-** SIG ** AgEBMHIwXjELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5
-** SIG ** bWFudGVjIENvcnBvcmF0aW9uMTAwLgYDVQQDEydTeW1h
-** SIG ** bnRlYyBUaW1lIFN0YW1waW5nIFNlcnZpY2VzIENBIC0g
-** SIG ** RzICEA7P9DjI/r81bgTYapgbGlAwCQYFKw4DAhoFAKBd
-** SIG ** MBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZI
-** SIG ** hvcNAQkFMQ8XDTE2MTAwNzEwMTkxMFowIwYJKoZIhvcN
-** SIG ** AQkEMRYEFB8Z4qDreHI/XRSxENDHP/qd83AzMA0GCSqG
-** SIG ** SIb3DQEBAQUABIIBAEXrRco2xaBS4Psiwgpat92b6vwV
-** SIG ** c1CEaFGxZPxOCJBLUQ3Q537mN95vO3IUNI3VpoRX3PpV
-** SIG ** 100vbkppOKS9zTISeGU+kSk25CHPQVQzCEqcGQu6Dxmm
-** SIG ** mlfTwgKcbZY2kxkMITCRkzVp4aVKmC6c9BJYhIc3/HQ6
-** SIG ** w4atbtosFxm7hNnlWoRxa1v+VnzLa5SM3i7VRBz9xGPD
-** SIG ** o1AwTQFfspE6eJR72RlB2EcA4rX0lL9fnEzAo6AtiSKe
-** SIG ** yU1rsvaOr2xym8nqYzutDGNt7Bm0WuG6nF0+/N8cXtt8
-** SIG ** I4rDZZog5qyx3FGslo79Bf+1tx9JWUJp/F2HQZgQ32kV
-** SIG ** GMesCbY=
+** SIG ** MSgwJgYDVQQDEx9TeW1hbnRlYyBTSEEyNTYgVGltZVN0
+** SIG ** YW1waW5nIENBAhBUWPKq10HWRLyEqXugllLmMAsGCWCG
+** SIG ** SAFlAwQCAaCBpDAaBgkqhkiG9w0BCQMxDQYLKoZIhvcN
+** SIG ** AQkQAQQwHAYJKoZIhvcNAQkFMQ8XDTE3MDQxODEyNDMx
+** SIG ** NFowLwYJKoZIhvcNAQkEMSIEIBIHo1GiDzSLJjfaDfwk
+** SIG ** 1sxMhgFVQZkYsO+xHtIKcvuOMDcGCyqGSIb3DQEJEAIv
+** SIG ** MSgwJjAkMCIEIM96wXrQR+zV/cNoIgMbEtTvB4tvK0xe
+** SIG ** a6Qfj/LPS61nMAsGCSqGSIb3DQEBAQSCAQCY1377Rdz9
+** SIG ** 040vUOkWgMrOoY65YoGXPfasrXflFWXs8lPuHl2/+bVR
+** SIG ** kDUBL2MSIYt+dlUsY31lgtCUDBLMy02sZ5BpZ7ZFcI8Y
+** SIG ** ah3ZDZuxTGBm42sEtOv1xx2QR4bAzxkZGOOienxYNqnn
+** SIG ** zIdqYl2CYfiV9PBFODnB+aTeRBZ7tH5RDMmZMJ3taZDX
+** SIG ** 1MCV1Z39HTKQq4uHi7gqg0N8nv6Xm8J+OPchVMlZMGJH
+** SIG ** tvmZHge+4jDFv/B3YYVOQOLNOHgF3tCtWClmhVQ+Fay+
+** SIG ** GVDCCMr1Hi2NWImFKS7yoHnYPV5fPtHMrch7XrRpVNQl
+** SIG ** o8+IiJV7N7/dgZeR5cmJuEX3
 </signature>
 </package>
--- a/include/Debug.props
+++ b/include/Debug.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/Release.props
+++ b/include/Release.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

--- a/include/Win32.props
+++ b/include/Win32.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

--- a/include/common.props
+++ b/include/common.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

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

    This file is part of ZRCola.

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02000100
+#define PRODUCT_VERSION          0x02000200

 //
 // Product version by components
@@ -33,26 +33,26 @@
 //
 #define PRODUCT_VERSION_MAJ      2
 #define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      1
+#define PRODUCT_VERSION_REV      2
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.1-beta1"
+#define PRODUCT_VERSION_STR      "2.1-beta2"
 #define PRODUCT_BUILD_YEAR_STR   "2017"

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

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{8ABE00FD-2325-4FD1-ADDE-FCF996B31636}"
+#define PRODUCT_VERSION_GUID     "{162DE912-6795-4F1B-8824-32C873FE4186}"

 //
 // The product vendor and application name for configuration keeping.
--- a/include/x64.props
+++ b/include/x64.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2016 Amebis
+    Copyright 2016-2017 Amebis

    This file is part of ZRCola.

--- a/include/xgettext.props
+++ b/include/xgettext.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 1991-2016 Amebis
+    Copyright 1991-2017 Amebis

    This file is part of ZRCola.

--- a/lib/MSICALib
+++ b/lib/MSICALib
--- a/lib/WinStd
+++ b/lib/WinStd
--- a/lib/atlex
+++ b/lib/atlex
--- a/lib/libZRCola/MSIBuild/Makefile
+++ b/lib/libZRCola/MSIBuild/Makefile
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/lib/libZRCola/build/libZRCola.vcxproj
+++ b/lib/libZRCola/build/libZRCola.vcxproj
@@ -23,7 +23,6 @@
    <ClCompile Include="..\src\common.cpp" />
    <ClCompile Include="..\src\language.cpp" />
    <ClCompile Include="..\src\mapping.cpp" />
-    <ClCompile Include="..\src\normalize.cpp" />
    <ClCompile Include="..\src\stdafx.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -37,7 +36,6 @@
    <ClInclude Include="..\include\zrcola\character.h" />
    <ClInclude Include="..\include\zrcola\common.h" />
    <ClInclude Include="..\include\zrcola\language.h" />
-    <ClInclude Include="..\include\zrcola\normalize.h" />
    <ClInclude Include="..\include\zrcola\tag.h" />
    <ClInclude Include="..\include\zrcola\translate.h" />
    <ClInclude Include="..\src\stdafx.h" />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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