Version set to 2.1-beta2

LOCALIZATION.md

@@ -1,20 +0,0 @@
-# Localization of ZRCola
-
-In order to get ZRCola experience in your language the following resources should be translated:
-
-1. [ZRCola](https://poeditor.com/join/project/NTidhEPdDM)
-2. [ZRCola-zrcdb](https://poeditor.com/join/project/QBuYsTwk0d)
-3. [libZRColaUI](https://poeditor.com/join/project/vrnIvk5IOM)
-4. [Updater](https://poeditor.com/join/project/oDK4ktH3ZV)
-5. [wxExtend](https://poeditor.com/join/project/YmsdlC3CBv)
-6. Setup
-   - [MSIBuildUI](https://poeditor.com/join/project/ikxWBlq1o5)
-   - [MSIBuildCore](https://poeditor.com/join/project/RSCSsz9fXi)
-   - [MSICALib](https://poeditor.com/join/project/cKP0wwBrHU)
-   - [MSICA](https://poeditor.com/join/project/gCNPagUQvn)
-
-## General Guidelines
-
-Please use the Windows "official" translations for terms published at [Microsoft Language Portal](https://www.microsoft.com/en-us/language). This will provide a consistent terminology experience on Windows.
-
-Should you need any assistance to get started, please do not hesitate to contact project maintainer at [simon.rozman@amebis.si](mailto:simon.rozman@amebis.si).

MSI/MSM/wxMSW_wxbase30u_net_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_net_vc100.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_vc100.dll

MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30u_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_net_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxbase30ud_xml_vc100.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30u_adv_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30u_adv_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30u_aui_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30u_aui_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30u_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30ud_adv_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30ud_adv_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30ud_aui_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30ud_aui_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst

@@ -0,0 +1 @@
+System Folder\wxmsw30ud_core_vc100.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst

@@ -0,0 +1 @@
+System (64-bit) Folder\wxmsw30ud_core_vc100_x64.dll

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg

@@ -0,0 +1,24 @@
+#
+#    Copyright 1991-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/>.
+#
+
+[splosno]
+jezik=0
+deli=featZRCola featUpdCheck
+
+[parametri]

MSI/ZRCola/wxWidgets/.gitignore

@@ -1,9 +0,0 @@
-/*-1.idt
-/*-2.idt
-/*-2.idtx
-/*.Binary-1
-/*.Binary-2
-/*.Icon-1
-/*.Icon-2
-/*.lst
-/*.msm

MSI/ZRCola/wxWidgets/Makefile

@@ -1,94 +0,0 @@
-#
-#    Copyright 1991-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 "..\..\..\include\MSIBuildCfg.mak"
-
-# Note: When changing WXWIDGETS_VER or WXWIDGETS_COMPILER, the DLL filenames will change.
-# Then, you MUST change the component GUIDs as well.
-WXWIDGETS_VER=311
-WXWIDGETS_COMPILER=_vc100
-
-!IF "$(PLAT)" == "x64"
-WXWIDGETS_PLAT=_x64
-!ELSE
-WXWIDGETS_PLAT=
-!ENDIF
-
-!IF "$(CFG)" == "Debug"
-WXWIDGETS_CFG=ud
-!ELSE
-WXWIDGETS_CFG=u
-!ENDIF
-
-
-######################################################################
-# Component
-
-All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
-
-"$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
-	move /y << $@ > NUL
-Component	ComponentId	Directory_	Attributes	Condition	KeyPath
-s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
-Component	Component
-!IF "$(PLAT)" == "Win32"
-compwxbase.dll.Win32	{4C7F5A16-5B74-47D5-A405-57C7BD96F090}	ZRCOLABINDIR	0		filewxbase.dll.Win32
-compwxbase_net.dll.Win32	{00534942-B21F-4401-BFE4-C7677F4BE3E5}	ZRCOLABINDIR	0		filewxbase_net.dll.Win32
-compwxbase_xml.dll.Win32	{71E30748-DD22-4D8B-B26F-60C5150D9AAE}	ZRCOLABINDIR	0		filewxbase_xml.dll.Win32
-compwxmsw_core.dll.Win32	{FB8D46B9-86DC-4590-8F0A-8294F6A45E6A}	ZRCOLABINDIR	0		filewxwxmsw_core.dll.Win32
-compwxmsw_adv.dll.Win32	{7B7DB31D-1760-493A-BBE9-35237A6EF9E0}	ZRCOLABINDIR	0		filewxmsw_adv.dll.Win32
-compwxmsw_aui.dll.Win32	{49CF9864-63B6-4F43-8EC7-7294B966B419}	ZRCOLABINDIR	0		filewxmsw_aui.dll.Win32
-!ENDIF
-!IF "$(PLAT)" == "x64"
-compwxbase.dll.x64	{905D8859-BFD2-410A-81DB-93231088C066}	ZRCOLABINDIR	256		filewxbase.dll.x64
-compwxbase_net.dll.x64	{8A0A49C8-DAEB-4983-8E8D-9DE30AE1D0B6}	ZRCOLABINDIR	256		filewxbase_net.dll.x64
-compwxbase_xml.dll.x64	{24A5F181-EFE7-4542-8AAB-1D21DB74E954}	ZRCOLABINDIR	256		filewxbase_xml.dll.x64
-compwxmsw_core.dll.x64	{F5B3F6E6-4FFB-4A79-A794-202D6F93F716}	ZRCOLABINDIR	256		filewxwxmsw_core.dll.x64
-compwxmsw_adv.dll.x64	{D7722FB9-59BB-498F-93C3-78451471A023}	ZRCOLABINDIR	256		filewxmsw_adv.dll.x64
-compwxmsw_aui.dll.x64	{FB703979-0E3D-458E-82DD-DAC33329FA9D}	ZRCOLABINDIR	256		filewxmsw_aui.dll.x64
-!ENDIF
-<<NOKEEP
-
-
-######################################################################
-# File
-
-All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
-
-"$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
-	move /y << $@ > NUL
-File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
-s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
-File	File
-filewxbase.dll.$(PLAT)	compwxbase.dll.$(PLAT)	WXBASE~1.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxbase_net.dll.$(PLAT)	compwxbase_net.dll.$(PLAT)	WXBASE~2.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_net$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxbase_xml.dll.$(PLAT)	compwxbase_xml.dll.$(PLAT)	WXBASE~3.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_xml$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxwxmsw_core.dll.$(PLAT)	compwxmsw_core.dll.$(PLAT)	WXMSW3~1.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_core$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxmsw_adv.dll.$(PLAT)	compwxmsw_adv.dll.$(PLAT)	WXMSW3~2.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_adv$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-filewxmsw_aui.dll.$(PLAT)	compwxmsw_aui.dll.$(PLAT)	WXMSW3~3.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_aui$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll	0		0	512	1
-<<NOKEEP
-
-
-######################################################################
-# Build MSM module!
-######################################################################
-
-!INCLUDE "..\..\MSIBuild\MSM.mak"

Makefile

@@ -24,13 +24,10 @@ PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
 PLAT=x64
 REG_FLAGS=/f /reg:64
 REG_FLAGS32=/f /reg:32
-PROGRAM_FILES_32=C:\Program Files (x86)
 !ELSE
 PLAT=Win32
 REG_FLAGS=/f
-PROGRAM_FILES_32=C:\Program Files
 !ENDIF
-DEVENV10=$(PROGRAM_FILES_32)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com
 
 
 All ::
@@ -39,91 +36,43 @@ Clean ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	"$(DEVENV10)" "ZRCola.sln"          /clean "Release|Win32"
-	"$(DEVENV10)" "ZRCola.sln"          /clean "Debug|Win32"
-	"$(DEVENV10)" "ZRCola.sln"          /clean "Release|x64"
-	"$(DEVENV10)" "ZRCola.sln"          /clean "Debug|x64"
-	"$(DEVENV10)" "ZRColaUtils.sln"     /clean "Release|Win32"
-	"$(DEVENV10)" "ZRColaUtils.sln"     /clean "Debug|Win32"
-	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
-	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
-	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Release|x64"
-	"$(DEVENV10)" "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
-	"$(DEVENV10)" "Updater\Updater.sln" /clean "Release|Win32"
-	"$(DEVENV10)" "Updater\Updater.sln" /clean "Debug|Win32"
-	"$(DEVENV10)" "Updater\Updater.sln" /clean "Release|x64"
-	"$(DEVENV10)" "Updater\Updater.sln" /clean "Debug|x64"
-	-if exist "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"                    del /f /q "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"                    del /f /q "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"                    del /f /q "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"
-	-if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"             del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"             del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"             del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll"        del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb"        del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll"       del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb"       del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll"      del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb"      del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll"     del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb"     del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb"    del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb"   del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb"  del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll"     del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb"     del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll"    del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb"    del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll"   del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb"   del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll"  del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb"  del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll"     del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb"     del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll"    del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll"
-	-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb"    del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll"   del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb"   del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll"  del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll"
-	-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb"  del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.ddf"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.ddf"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.ddf"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.ddf"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola64D.ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.cab"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola32.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.inf"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola32.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32.rpt"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola32.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.cab"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola32D.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.inf"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola32D.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola32D.rpt"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola32D.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.cab"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola64.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.inf"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola64.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64.rpt"                        	   del /f /q "$(OUTPUT_DIR)\ZRCola64.rpt"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.cab"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola64D.cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.inf"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola64D.inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola64D.rpt"                       	   del /f /q "$(OUTPUT_DIR)\ZRCola64D.rpt"
-	-if exist "$(OUTPUT_DIR)\catalog.xml"                         	   del /f /q "$(OUTPUT_DIR)\catalog.xml"
+	devenv.com "ZRCola.sln"          /clean "Release|Win32"
+	devenv.com "ZRCola.sln"          /clean "Debug|Win32"
+	devenv.com "ZRCola.sln"          /clean "Release|x64"
+	devenv.com "ZRCola.sln"          /clean "Debug|x64"
+	devenv.com "ZRColaUtils.sln"     /clean "Release|Win32"
+	devenv.com "ZRColaUtils.sln"     /clean "Debug|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64"
+	devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
+	devenv.com "Updater\Updater.sln" /clean "Release|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
+	devenv.com "Updater\Updater.sln" /clean "Release|x64"
+	devenv.com "Updater\Updater.sln" /clean "Debug|x64"
+	-if exist "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\de_DE\wxstd.mo"
+	-if exist "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo"
+	-if exist "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"        del /f /q "$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo"
+	-if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"
+	-if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"
+	-if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
+	-if exist "$(OUTPUT_DIR)\ZRCola32.ddf"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf"
+	-if exist "$(OUTPUT_DIR)\ZRCola32D.ddf"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf"
+	-if exist "$(OUTPUT_DIR)\ZRCola64.ddf"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf"
+	-if exist "$(OUTPUT_DIR)\ZRCola64D.ddf"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.ddf"
+	-if exist "$(OUTPUT_DIR)\ZRCola32.cab"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.cab"
+	-if exist "$(OUTPUT_DIR)\ZRCola32.inf"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.inf"
+	-if exist "$(OUTPUT_DIR)\ZRCola32.rpt"                 del /f /q "$(OUTPUT_DIR)\ZRCola32.rpt"
+	-if exist "$(OUTPUT_DIR)\ZRCola32D.cab"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.cab"
+	-if exist "$(OUTPUT_DIR)\ZRCola32D.inf"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.inf"
+	-if exist "$(OUTPUT_DIR)\ZRCola32D.rpt"                del /f /q "$(OUTPUT_DIR)\ZRCola32D.rpt"
+	-if exist "$(OUTPUT_DIR)\ZRCola64.cab"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.cab"
+	-if exist "$(OUTPUT_DIR)\ZRCola64.inf"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.inf"
+	-if exist "$(OUTPUT_DIR)\ZRCola64.rpt"                 del /f /q "$(OUTPUT_DIR)\ZRCola64.rpt"
+	-if exist "$(OUTPUT_DIR)\ZRCola64D.cab"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.cab"
+	-if exist "$(OUTPUT_DIR)\ZRCola64D.inf"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.inf"
+	-if exist "$(OUTPUT_DIR)\ZRCola64D.rpt"                del /f /q "$(OUTPUT_DIR)\ZRCola64D.rpt"
+	-if exist "$(OUTPUT_DIR)\catalog.xml"                  del /f /q "$(OUTPUT_DIR)\catalog.xml"
 
 !IFNDEF HAS_VERSION
 
@@ -220,7 +169,6 @@ Publish :: \
 Register :: \
 	RegisterSettings \
 	InstallFonts \
-	InstallwxWidgets \
 	RegisterShortcuts
 
 Unregister :: \
@@ -229,21 +177,17 @@ Unregister :: \
 	UnregisterSettings
 
 RegisterSettings ::
-	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "Language"                   /t REG_SZ /d "en_US"                           $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS) > NUL
 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "Language"                   /t REG_SZ /d "en_US"                           $(REG_FLAGS32) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data"   $(REG_FLAGS32) > NUL
 !ENDIF
 
 UnregisterSettings ::
-	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "Language"                   $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS) > NUL
 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "Language"                   $(REG_FLAGS32) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL
 	-reg.exe delete "HKLM\Software\Amebis\ZRCola" /v "DatabasePath"               $(REG_FLAGS32) > NUL
 !ENDIF
@@ -259,72 +203,6 @@ InstallFonts :: \
 	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" /t REG_SZ /d "ZRCola_BI.otf" $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     /t REG_SZ /d "ZRCola"        $(REG_FLAGS) > NUL
 
-InstallwxWidgets :: \
-	InstallwxWidgets_Debug_Win32 \
-	InstallwxWidgets_Release_Win32 \
-	InstallwxWidgets_Debug_x64 \
-	InstallwxWidgets_Release_x64
-
-InstallwxWidgets_Debug_Win32 :: \
-	"$(OUTPUT_DIR)\Win32.Debug" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb"
-
-InstallwxWidgets_Release_Win32 :: \
-	"$(OUTPUT_DIR)\Win32.Release" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" \
-	"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb"
-
-InstallwxWidgets_Debug_x64 :: \
-	"$(OUTPUT_DIR)\x64.Debug" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb"
-
-InstallwxWidgets_Release_x64 :: \
-	"$(OUTPUT_DIR)\x64.Release" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" \
-	"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb"
-
 UninstallFonts::
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola (TrueType)"             $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
@@ -369,21 +247,13 @@ Localization :: \
 "$(OUTPUT_DIR)\locale\de_DE" \
 "$(OUTPUT_DIR)\locale\ru_RU" \
 "$(OUTPUT_DIR)\locale\sl_SI" \
-"$(OUTPUT_DIR)\Win32.Debug" \
-"$(OUTPUT_DIR)\Win32.Release" \
-"$(OUTPUT_DIR)\x64.Debug" \
-"$(OUTPUT_DIR)\x64.Release" \
 "$(PUBLISH_DIR)" \
 "$(PUBLISH_PACKAGE_DIR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
 	if not exist $@ md $@
 
 "$(OUTPUT_DIR)\Keys" \
-"$(OUTPUT_DIR)\locale" \
-"$(OUTPUT_DIR)\Win32.Debug" \
-"$(OUTPUT_DIR)\Win32.Release" \
-"$(OUTPUT_DIR)\x64.Debug" \
-"$(OUTPUT_DIR)\x64.Release" : "$(OUTPUT_DIR)"
+"$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)"
 
 "$(OUTPUT_DIR)\locale\de_DE" \
 "$(OUTPUT_DIR)\locale\ru_RU" \
@@ -408,150 +278,6 @@ Localization :: \
 "$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
 	copy /y $** $@ > NUL
 
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.dll"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.pdb"
-	copy /y $** $@ > NUL
-
 
 ######################################################################
 # Shortcut creation
@@ -587,53 +313,53 @@ Localization :: \
 "$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" :: Localization InstallwxWidgets
+"$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" :: Localization
 
 "$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" :: Localization InstallwxWidgets_Release_Win32
+"$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" :: Localization
 
 "$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" :: Localization InstallwxWidgets_Release_x64
+"$(OUTPUT_DIR)\x64.Release\ZRCola.exe" :: Localization
 
 "$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
-"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" :: Localization InstallwxWidgets_Debug_x64
+"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" :: Localization
 
 "$(OUTPUT_DIR)\Win32.Release\libZRCola10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\libZRColaUI10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" ::
-	"$(DEVENV10)" "ZRCola.sln" /build "Release|Win32"
+	devenv.com "ZRCola.sln" /build "Release|Win32"
 
 "$(OUTPUT_DIR)\Win32.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" ::
-	"$(DEVENV10)" "ZRCola.sln" /build "Debug|Win32"
+	devenv.com "ZRCola.sln" /build "Debug|Win32"
 
 "$(OUTPUT_DIR)\x64.Release\libZRCola10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\libZRColaUI10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\stdex10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Release\ZRCola.exe" ::
-	"$(DEVENV10)" "ZRCola.sln" /build "Release|x64"
+	devenv.com "ZRCola.sln" /build "Release|x64"
 
 "$(OUTPUT_DIR)\x64.Debug\libZRCola10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\libZRColaUI10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\stdex10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \
 "$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" ::
-	"$(DEVENV10)" "ZRCola.sln" /build "Debug|x64"
+	devenv.com "ZRCola.sln" /build "Debug|x64"
 
 "$(OUTPUT_DIR)\ZRCola32.ddf" : \
 #	"$(OUTPUT_DIR)\ZRCola.de_DE.32.2.msi" \
@@ -697,7 +423,7 @@ Localization :: \
 
 "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
 	if exist $@  del /f /q $@
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" $** $@
+	output\$(PLAT).Release\UpdSignXML.exe $** $@
 
 "$(OUTPUT_DIR)\catalog.xml" : \
 #	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
@@ -711,14 +437,14 @@ Localization :: \
 	-if exist $@ del /f /q $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
-#	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi"
-#	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.msi"
+#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
+	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
 	move /y "$(@:"=).tmp" $@ > NUL
 
 !ENDIF

README.md

@@ -16,7 +16,6 @@ https://www.amebis.si/prenos/ZRCola/
 - _sed.exe_ and _grep.exe_
 - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
 - Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
-- wxWidgets 3.1.1 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
 
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:
@@ -39,9 +38,6 @@ Use Microsoft NMAKE to build the project. The resulting files can be found in ou
 
 The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
 
-## Translating ZRCola
-Instructions how to translate ZRCola to your language can be found [here](LOCALIZATION.md).
-
 ## Contact Information
 Please contact the following addressee for further information and help:
 - ZRC SAZU, ZRCola@zrc-sazu.si 

ZRCola.sln

@@ -5,7 +5,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcx
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendDll.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
@@ -16,11 +16,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-10.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ZRCola/MSIBuild/Makefile

@@ -245,12 +245,6 @@ featZRCola	complibZRCola.dll.$(PLAT)
 featZRCola	complibZRColaUI.dll.$(PLAT)
 featZRCola	compwxExtend.dll.$(PLAT)
 featZRCola	compUpdater.dll.$(PLAT)
-featZRCola	compwxbase.dll.$(PLAT)
-featZRCola	compwxbase_net.dll.$(PLAT)
-featZRCola	compwxbase_xml.dll.$(PLAT)
-featZRCola	compwxmsw_core.dll.$(PLAT)
-featZRCola	compwxmsw_adv.dll.$(PLAT)
-featZRCola	compwxmsw_aui.dll.$(PLAT)
 featZRCola	compLocalizationRepositoryPath
 featZRCola	compLanguage
 featZRCola	compDatabasePath

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>
@@ -115,10 +117,10 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd-10.0.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll-10.0.vcxproj">
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll.vcxproj">
       <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">
@@ -128,6 +130,8 @@
   <ItemGroup>
     <None Include="locale\ZRCola.pot" />
     <None Include="res\char_select.ico" />
+    <None Include="res\copy_composed_and_return.ico" />
+    <None Include="res\copy_decomposed_and_return.ico" />
     <None Include="res\edit_copy.ico" />
     <None Include="res\edit_cut.ico" />
     <None Include="res\edit_paste.ico" />
@@ -137,7 +141,9 @@
     <None Include="res\send_composed.ico" />
     <None Include="res\send_decomposed.ico" />
     <None Include="res\zrcola.ico" />
-    <None Include="ZRCola.fbp" />
+    <None Include="ZRCola.fbp">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRCola.rc" />

ZRCola/ZRCola.vcxproj.filters

@@ -58,6 +58,9 @@
     <ClCompile Include="zrcolachrreq.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="zrcolatranseq.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -99,6 +102,9 @@
     <ClInclude Include="zrcolachrreq.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="zrcolatranseq.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\zrcola.ico">
@@ -137,6 +143,12 @@
     <None Include="res\navigate_forward.ico">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="res\copy_composed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="res\copy_decomposed_and_return.ico">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ZRCola.rc">

ZRCola/locale/de_DE.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-18 10:10+0200\n"
-"PO-Revision-Date: 2016-10-18 10:10+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.10\n"
+"X-Generator: Poedit 2.0.2\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -20,74 +20,79 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 #, fuzzy
 msgid "Character"
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 #, fuzzy
 msgid "Context"
 msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr ""
 
-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr ""
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr "Fehler bei der Validierung"
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr ""
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr ""
 
 # Recitation separator
-#: zrcolachrslct.cpp:164
+#: zrcolachrslct.cpp:328
 #, fuzzy
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr ""
 
-#: zrcolafrm.cpp:141
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
 msgstr ""
 
-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr ""
+
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "
 
-#: zrcolafrm.cpp:143
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
+#: zrcolafrm.cpp:177
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
 
-#: zrcolafrm.cpp:375
-msgid ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
-msgstr ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
+#: zrcolafrm.cpp:434
+msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
+msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -117,7 +122,7 @@ msgstr ""
 msgid "Find C&haracter..."
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr ""
 
@@ -126,595 +131,595 @@ msgstr ""
 msgid "&Send Composed"
 msgstr "Pošlji sestavljeno (F5)"
 
-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr ""
 
 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr ""
+
+#: zrcolagui.cpp:98
+msgid "Copy composed text to clipboard and return focus to source window"
+msgstr ""
+
+#: zrcolagui.cpp:107
 #, fuzzy
 msgid "Send &Decomposed"
 msgstr "Pošlji razstavljeno (F6)"
 
-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr ""
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr ""
+
+#: zrcolagui.cpp:116
+msgid "Copy decomposed text to clipboard and return focus to source window"
+msgstr ""
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr ""
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr ""
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr ""
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr ""
 
-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 #, fuzzy
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr ""
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "Toggle edit toolbar"
 msgstr ""
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr ""
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "Toggle compose toolbar"
 msgstr ""
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr ""
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Toggle character catalog panel"
 msgstr ""
 
-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 #, fuzzy
 msgid "&View"
 msgstr "&Ansicht..."
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr ""
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr ""
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr ""
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr ""
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr ""
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr ""
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr ""
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr ""
 
-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
+#, fuzzy
 msgid "&About..."
-msgstr ""
+msgstr "Über..."
 
-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 #, fuzzy
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 #, fuzzy
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 #, fuzzy
 msgid "Cut selection"
 msgstr "Auswahl ausschneiden"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 #, fuzzy
 msgid "Copy"
 msgstr "Kopieren"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 #, fuzzy
 msgid "Copy selection"
 msgstr "Auswahl kopieren"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 #, fuzzy
 msgid "Paste"
 msgstr "Einfügen"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 #, fuzzy
 msgid "Paste selection"
 msgstr "Auswahl einfügen"
 
-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 #, fuzzy
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 #, fuzzy
 msgid "Find Character"
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 #, fuzzy
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno (F5)"
 
-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 #, fuzzy
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno (F6)"
 
-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr ""
 
-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr ""
 
-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr ""
 
-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr ""
 
-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr ""
 
-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr ""
 
-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr ""
 
-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr ""
 
-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 #, fuzzy
 msgid "Show &All"
 msgstr "Alles zeigen"
 
-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr ""
 
-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 #, fuzzy
 msgid "&Browse"
 msgstr "Durchsuchen"
 
-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr ""
 
-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr ""
 
-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr ""
 
-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr ""
 
-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 #, fuzzy
 msgid "All"
 msgstr "Alle"
 
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr ""
 
-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 #, fuzzy
 msgid "None"
 msgstr "Kein"
 
-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Auswahl kopieren"
 
-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr ""
 
-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"
 
-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 #, fuzzy
 msgid "Character search results"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr ""
 
-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr ""
 
-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 #, fuzzy
 msgid "Preview"
 msgstr " Vorschau"
 
-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr ""
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr ""
 
-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 #, fuzzy
 msgid "Character preview"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr ""
 
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:647
 #, fuzzy
 msgid "Character tags"
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr ""
 
-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"
 
-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"
 
-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr ""
 
-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr ""
 
-#: zrcolagui.cpp:770
-msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
-"For optimal decomposition you should set the language correctly."
-msgstr ""
-
-#: zrcolagui.cpp:774
-msgid "Select language &automatically according to selected keyboard"
-msgstr ""
-
-#: zrcolagui.cpp:777
-msgid "&Manually select the language from the list below:"
-msgstr ""
-
-#: zrcolagui.cpp:789
-msgid "Text Language"
-msgstr ""
-
 #: zrcolagui.cpp:794
 msgid ""
-"ZRCola can be launched every time you log in to your computer.\n"
-"It will be available on the system tray and via registered shortcuts Win+F5 "
-"and Win+F6."
+"Some character native to specific language you are working with should not decompose to primitives.\n"
+"For optimal decomposition you should set the language correctly."
 msgstr ""
 
 #: zrcolagui.cpp:798
+msgid "Select language &automatically according to selected keyboard"
+msgstr ""
+
+#: zrcolagui.cpp:801
+msgid "&Manually select the language from the list below:"
+msgstr ""
+
+#: zrcolagui.cpp:812
+msgid "Text Language"
+msgstr ""
+
+#: zrcolagui.cpp:817
+msgid ""
+"ZRCola can be launched every time you log in to your computer.\n"
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
+msgstr ""
+
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr ""
 
-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 
-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
+#, fuzzy
 msgid "zrcola.zrc-sazu.si"
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
+
+#: zrcolagui.cpp:919
+msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
 msgstr ""
 
-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in a footnote or some other "
-"appropriate part of the publication the note below:"
+#: zrcolagui.cpp:923
+msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
 msgstr ""
 
-#: zrcolagui.cpp:903
-msgid ""
-"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
-"si), developed at the Science and Research Centre of SAZU in Ljubljana "
-"(http://www.zrc-sazu.si) by Peter Weiss."
-msgstr ""
-
-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 #, fuzzy
 msgid "Log"
 msgstr "&Log"
 
-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
 
-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr ""
 
-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"
 
-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 #, fuzzy
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr ""
 
-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr ""
 
-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 msgid ""
 "Please, use the decomposed form.\n"
-"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
-"it from the Decomposed window."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 msgstr ""
 
-#: zrcolagui.cpp:1027
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
 msgstr ""
 
-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr ""
 
-#: zrcolagui.cpp:1040
+#: zrcolagui.cpp:1060
 msgid ""
-"After clicking OK button, your e-mail application should open allowing you "
-"to submit the new character request to ZRCola Editor.\n"
-"Your e-mail application might not display all the characters correctly, but "
-"the Editor will be able to read them correctly anyway."
+"After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
+"Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
+msgstr ""
+
+#: zrcolagui.cpp:1102
+msgid "Translation"
+msgstr ""
+
+#: zrcolagui.cpp:1104
+msgid ""
+"ZRCola offers multiple text translations that can be arranged in a sequence.\n"
+"Please select desired translations and the order they are applied."
+msgstr ""
+
+#: zrcolagui.cpp:1114
+msgid "A&vailable:"
+msgstr ""
+
+#: zrcolagui.cpp:1129
+msgid ">"
+msgstr ">"
+
+#: zrcolagui.cpp:1132
+msgid "<"
+msgstr "<"
+
+#: zrcolagui.cpp:1141
+#, fuzzy
+msgid "&Selected:"
+msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
+
+#: zrcolagui.cpp:1159
+#, fuzzy
+msgid "Up"
+msgstr "Up"
+
+#: zrcolagui.cpp:1162
+#, fuzzy
+msgid "Down"
+msgstr "Down"
+
+#: zrcolagui.h:250
+#, fuzzy
+msgid "Character Search"
+msgstr "Skupine &znakov"
+
+#: zrcolagui.h:286
+msgid "Settings"
+msgstr ""
+
+#: zrcolagui.h:312
+msgid "About ZRCola"
+msgstr ""
+
+#: zrcolagui.h:337 zrcolaupdater.cpp:94
+msgid "Product Update"
+msgstr ""
+
+#: zrcolagui.h:408
+msgid "Custom Translation Sequence"
 msgstr ""
 
 #: zrcolakeyhndlr.cpp:44
-msgid ""
-"INS key is pressed. Type the Unicode code of desired character now (up to "
-"four hexadecimal digits: 0-9, A-F), then release INS."
+msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
 msgstr ""
 
-#: zrcolasettings.cpp:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr ""
 
+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr ""
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
 msgstr ""
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr ""
-
-#: zrcolagui.h:246
-#, fuzzy
-msgid "Character Search"
-msgstr "Skupine &znakov"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr ""
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr ""
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:7
-msgid ""
-"When configured, ZRCola starts at system startup and runs in the background. "
-"If needed, it can be brought up by pressing the combination Win+F5."
+msgid "When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5."
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:8
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:8
-msgid ""
-"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
-"location of the cursor in the text. If ZRCola is brought to the foreground "
-"without using the aforementioned combination of keys, the program won't know "
-"where to insert the special characters!"
+msgid "IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 #, fuzzy
 msgid "&Continue"
-msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
+msgstr "Auf Volume \"[2]\" steht nicht genügend Speicherplatz für die Installation bei aktivierter Wiederherstellungsoption zur Verfügung. [3] KB sind erforderlich, aber nur [4] KB sind verfügbar. Klicken Sie auf \"Ignorieren\", um die Installation ohne Speicherung von Wiederherstellungsinformationen fortzusetzen, klicken Sie auf \"Wiederholen\", um den verfügbaren Speicher erneut zu überprüfen oder auf \"Abbrechen\", um die Installation abzubrechen."
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:13
-msgid ""
-"The string of basic and substitute characters is entered into the upper "
-"input window of the program. In the window below the resulted special "
-"characters are displayed. To insert them in the text, the F5 key is used."
+msgid "The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used."
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
 msgstr ""
 
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"

ZRCola/locale/ru_RU.po

@@ -1,18 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-18 10:09+0200\n"
-"PO-Revision-Date: 2016-10-18 10:10+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.10\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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 
@@ -21,74 +20,75 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004–%s ZRC SAZU"
 
-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 msgid "Character"
 msgstr "Знак"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 msgid "Context"
 msgstr "Контекст"
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr "Запрос нового знака"
 
-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr ""
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr ""
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr ""
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr "▸ Опции поиска"
 
 # Recitation separator
-#: zrcolachrslct.cpp:164
+#: zrcolachrslct.cpp:328
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr "▾ Опции поиска"
 
-#: zrcolafrm.cpp:141
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
 msgstr ""
-"Сочетание клавиш Win+F5 \n"
-"регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F5 регистрировать. Некоторые функциональности не будут доступны."
+
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: zrcolafrm.cpp:143
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые "
-"функциональности не будут доступны."
+#: zrcolafrm.cpp:177
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
+msgstr "Сочетание клавиш Win+F6 невозможно регистрировать. Некоторые функциональности не будут доступны."
 
-#: zrcolafrm.cpp:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"
 
-#: zrcolafrm.cpp:375
-msgid ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
-msgstr ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
+#: zrcolafrm.cpp:434
+msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
+msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -114,7 +114,7 @@ msgstr "Выделить весь текст"
 msgid "Find C&haracter..."
 msgstr "Поиск &знака ..."
 
-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr "Показать браузер знаков для вставления выбранного знака"
 
@@ -122,452 +122,496 @@ msgstr "Показать браузер знаков для вставления
 msgid "&Send Composed"
 msgstr "&Послать составленное"
 
-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr "Послать составленный текст в исходное окно"
 
 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr "Копировать составленное и &возвратиться"
+
+#: zrcolagui.cpp:98
+msgid "Copy composed text to clipboard and return focus to source window"
+msgstr "Копировать составленный текст в буфер обмена и возвратить фокус в исходное окно"
+
+#: zrcolagui.cpp:107
 msgid "Send &Decomposed"
 msgstr "Послать &разобранное"
 
-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr "Послать разобранный текст в исходное окно"
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr "Копировать разобранное и возв&ратиться"
+
+#: zrcolagui.cpp:116
+msgid "Copy decomposed text to clipboard and return focus to source window"
+msgstr "Копировать разобранный текст в буфер обмена и возвратить фокус в исходное окно"
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr "Прервать составление/разборку"
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr "Прервать составление и возвратить фокус в исходное окно"
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr "&Настройки ..."
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr "Открыть диалог конфигурации программы"
 
-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 msgid "&Edit"
 msgstr "&Правка"
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr "Панель инструментов для &правки"
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "Toggle edit toolbar"
 msgstr "Переключить панель инструментов для правки"
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr "Панель инструментов для &составления"
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "Toggle compose toolbar"
 msgstr "Переключить панель инструментов для составления"
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr "Список &знаков"
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Toggle character catalog panel"
 msgstr "Переключить список знаков"
 
-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 msgid "&View"
 msgstr "&Вид"
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr "&Инструкции ..."
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr "Открыть сайт с инструкциями по продукту"
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr "Сочетания &клавиш ..."
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr "Открыть список сочетаний клавиш"
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr "&Запрос нового знака ..."
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Отправить запрос нового знака"
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr "Проверить наличие &обновлений ..."
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr "Проверить наличие обновлений онлайн"
 
-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
 msgid "&About..."
 msgstr "О прогр&амме ..."
 
-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 msgid "&Help"
 msgstr "&Справка"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut"
 msgstr "Вырезать"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut selection"
 msgstr "Вырезать выбор"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy"
 msgstr "Копировать"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy selection"
 msgstr "Копировать выбор"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste"
 msgstr "Вставить"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste selection"
 msgstr "Вставить выбор"
 
-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 msgid "Edit"
 msgstr "Правка"
 
-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 msgid "Find Character"
 msgstr "Поиск знака"
 
-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 msgid "Send Composed"
 msgstr "Послать составленное (F5)"
 
-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 msgid "Send Decomposed"
 msgstr "Послать разобранное (F6)"
 
-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr "Составить"
 
-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr "Список знаков"
 
-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr "(Де)Композитор"
 
-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr "Разобранний текст"
 
-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr "Дамп разобранного Юнукода"
 
-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr "Составленный текст"
 
-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr "Дамп составленного Юникода"
 
-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr "Выделить категории для отображения"
 
-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 msgid "Show &All"
 msgstr "Показать &все"
 
-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr "Переключить отображение редко использованных знаков"
 
-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 msgid "&Browse"
 msgstr "&Обзор"
 
-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
 msgstr "Полное либо частичное описание знака Юникод (на английском) для поиска"
 
-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr "Опции поиска"
 
-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr "Показать/скрыть дополнительные опции поиска"
 
-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr "Список категории Юникод для проведения поиска"
 
-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 msgid "All"
 msgstr "Все"
 
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr "Выбрать все категории"
 
-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 msgid "None"
 msgstr "Ничего"
 
-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 msgid "Clear category selection"
 msgstr "Очистить выбор категории"
 
-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr "Обратить"
 
-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 msgid "Invert category selection"
 msgstr "Обратить выбор категории"
 
-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 msgid "Character search results"
 msgstr "Результаты поиска знаков"
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr "&Недавно использованное"
 
-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr "Список недавно вставленных знаков"
 
-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 msgid "Preview"
 msgstr "Просмотр"
 
-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr "Шестнадцатеричный код Юникод"
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr "Сочетание клавиш в окне композитора"
 
-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 msgid "Character preview"
 msgstr "Просмотр знака"
 
-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr "Описание знака Юникод"
 
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:647
 msgid "Character tags"
 msgstr "Ключевые слова"
 
-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr "Категория знака Юникод"
 
-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 msgid "« Back"
 msgstr "« Назад"
 
-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr "К предыдущему знаку"
 
-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 msgid "Forward »"
 msgstr "Далее »"
 
-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr "К следующему знаку"
 
-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr "&Связанное"
 
-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr "Список связанных знаков"
 
-#: zrcolagui.cpp:770
+#: zrcolagui.cpp:794
 msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
+"Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""
 "Некоторые знаки использованного языка нельзя разбирать.\n"
 "Для оптимальной разборки вы должны настроить правильный язык."
 
-#: zrcolagui.cpp:774
+#: zrcolagui.cpp:798
 msgid "Select language &automatically according to selected keyboard"
 msgstr "&Автоматически установить язык на основе выбранной клавиатуры"
 
-#: zrcolagui.cpp:777
+#: zrcolagui.cpp:801
 msgid "&Manually select the language from the list below:"
 msgstr "&Вручную выбрать язык со списка:"
 
-#: zrcolagui.cpp:789
+#: zrcolagui.cpp:812
 msgid "Text Language"
 msgstr "Язык текста"
 
-#: zrcolagui.cpp:794
+#: zrcolagui.cpp:817
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
-"It will be available on the system tray and via registered shortcuts Win+F5 "
-"and Win+F6."
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
 msgstr ""
 "Запуск системы ZRCola возможен при каждом запуске компьютера.\n"
-"После запуска система ZRCola доступна на панели задач либо через нажатие "
-"сочетания клавиш Win+F5 и Win+F6."
+"После запуска система ZRCola доступна на панели задач либо через нажатие сочетания клавиш Win+F5 и Win+F6."
 
-#: zrcolagui.cpp:798
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr "&Автоматически запустить систему ZRCola при запуске компьютера"
 
-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr "Запуск"
 
-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 "Администратор программы и сайта: Янош Ежовник (Janoš Ježovnik)\n"
 "Разработка: Amebis, d. o. o., Kamnik\n"
 "Перевод на английский яазык: Янош Ежовник (Janoš Ježovnik)\n"
-"Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo "
-"Torkar), Анастасия Плотникова\n"
-"Разработка in техническая поддержка первоначальной программы (2004–2015): "
-"Петер Вейсс (Peter Weiss)"
+"Перевод на русский язык: Домен Крвина (Domen Krvina), Силво Торкар (Silvo Torkar), Анастасия Плотникова\n"
+"Разработка in техническая поддержка первоначальной программы (2004–2015): Петер Вейсс (Peter Weiss)"
 
-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in a footnote or some other "
-"appropriate part of the publication the note below:"
-msgstr ""
-"Текст, созданный с помощью системы ZRCola, должен в примечании или другом "
-"соответствующем месте в публикации сопровождаться следующей записью:"
+#: zrcolagui.cpp:919
+msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
+msgstr "Текст, созданный с помощью системы ZRCola, должен в примечании или другом соответствующем месте в публикации сопровождаться следующей записью:"
 
-#: zrcolagui.cpp:903
-msgid ""
-"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
-"si), developed at the Science and Research Centre of SAZU in Ljubljana "
-"(http://www.zrc-sazu.si) by Peter Weiss."
-msgstr ""
-"Текст подготовлен с помощью системы ввода ZRCola (http://zrcola.zrc-sazu."
-"si), разработанной в Научно-исследовательском центре Словенской академии "
-"наук и искусств в Любляне (http://www.zrc-sazu.si) Петром Вейссoм."
+#: zrcolagui.cpp:923
+msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
+msgstr "Текст подготовлен с помощью системы ввода ZRCola (http://zrcola.zrc-sazu.si), разработанной в Научно-исследовательском центре Словенской академии наук и искусств в Любляне (http://www.zrc-sazu.si) Петром Вейссoм."
 
-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Журнал"
 
-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 msgid "Quit and &Update..."
 msgstr "Выйти и &обновить ..."
 
-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr "Выйти из программы и запустить обновление"
 
-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr "Ввести запрашиваемый &знак:"
 
-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr "Запрашиваемый разобранный знак"
 
-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 msgid ""
 "Please, use the decomposed form.\n"
-"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
-"it from the Decomposed window."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 msgstr ""
 "Пожалуйста, используйте разобранный формат.\n"
-"Для ввода запрашиваемого знака можно использовать сочетания клавиш системы "
-"ZRCola либо копировать и вставить знаки из окна для разборки."
+"Для ввода запрашиваемого знака можно использовать сочетания клавиш системы ZRCola либо копировать и вставить знаки из окна для разборки."
 
-#: zrcolagui.cpp:1027
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
-msgstr ""
-"&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем "
-"он нужен:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
+msgstr "&Контекст, примеры либо описание запрашиваемого знака или объяснение, зачем он нужен:"
 
-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr "Дополнительные примечания"
 
-#: zrcolagui.cpp:1040
+#: zrcolagui.cpp:1060
 msgid ""
-"After clicking OK button, your e-mail application should open allowing you "
-"to submit the new character request to ZRCola Editor.\n"
-"Your e-mail application might not display all the characters correctly, but "
-"the Editor will be able to read them correctly anyway."
+"After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
+"Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
+msgstr ""
+"После нажатия на кнопку «OK» ваша почтовая программа должна открытся для отправки запроса нового знака администратору системы ZRCola.\n"
+"Возможно, не все знаки будут отображены правильно, но все информации будут закодированны таким образом, что администратор сможет их правильно прочитать."
+
+#: 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 ""
-"После нажатия на кнопку «OK» ваша почтовая программа должна открытся для "
-"отправки запроса нового знака администратору системы ZRCola.\n"
-"Возможно, не все знаки будут отображены правильно, но все информации будут "
-"закодированны таким образом, что администратор сможет их правильно прочитать."
 
 #: zrcolakeyhndlr.cpp:44
-msgid ""
-"INS key is pressed. Type the Unicode code of desired character now (up to "
-"four hexadecimal digits: 0-9, A-F), then release INS."
-msgstr ""
-"Нажата клавиша INS. Введите код Юникод желаемого знака (максимум четыре "
-"шестнадцатеричныe цифры: 0-9, A-F), затем отпустите клавишу INS."
+msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
+msgstr "Нажата клавиша INS. Введите код Юникод желаемого знака (максимум четыре шестнадцатеричныe цифры: 0-9, A-F), затем отпустите клавишу INS."
 
-#: zrcolasettings.cpp:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr "Автоматически запустить систему ZRCola при запуске компьютера"
 
+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr ""
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
@@ -576,151 +620,76 @@ msgstr ""
 "Программа будет закрыта и обновлена.\n"
 "Вы уверены?"
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr "Обновление продукта"
-
-#: zrcolagui.h:246
-msgid "Character Search"
-msgstr "Поиск знака"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr "Настройки"
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr "О системе ZRCola"
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по запуску системы"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:7
-msgid ""
-"When configured, ZRCola starts at system startup and runs in the background. "
-"If needed, it can be brought up by pressing the combination Win+F5."
-msgstr ""
-"Если так настроено, система ZRCola запускается при запуске компьютера и "
-"работает в фоновом режиме. Если потребуется, пользователь может вывести "
-"программу на экран, нажав на сочетание клавиш Win+F5."
+msgid "When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5."
+msgstr "Если так настроено, система ZRCola запускается при запуске компьютера и работает в фоновом режиме. Если потребуется, пользователь может вывести программу на экран, нажав на сочетание клавиш Win+F5."
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:8
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:8
-msgid ""
-"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
-"location of the cursor in the text. If ZRCola is brought to the foreground "
-"without using the aforementioned combination of keys, the program won't know "
-"where to insert the special characters!"
-msgstr ""
-"Внимание: При нажатии сочетание клавиш Win+F5 программа запомнить "
-"местонахождение курсора в тексте. Если система ZRCola выведена на экран без "
-"использования упомянутого сочетания клавиш, программа не знает, куда ввести "
-"желаемые знаки!"
+msgid "IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!"
+msgstr "Внимание: При нажатии сочетание клавиш Win+F5 программа запомнить местонахождение курсора в тексте. Если система ZRCola выведена на экран без использования упомянутого сочетания клавиш, программа не знает, куда ввести желаемые знаки!"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 msgid "&Continue"
 msgstr "&Продолжить"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по составлению"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:13
-msgid ""
-"The string of basic and substitute characters is entered into the upper "
-"input window of the program. In the window below the resulted special "
-"characters are displayed. To insert them in the text, the F5 key is used."
-msgstr ""
-"Строка основных и замещающих знаков вводится в верхнее окно для ввода. После "
-"того, в нижнем окне появляются соответствующие специальные знаки. Для их "
-"ввода в текст нужно нажать клавишу F5."
+msgid "The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used."
+msgstr "Строка основных и замещающих знаков вводится в верхнее окно для ввода. После того, в нижнем окне появляются соответствующие специальные знаки. Для их ввода в текст нужно нажать клавишу F5."
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr "[DlgTitleFont][SimpleProductName] Руководство по вводу знаков"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
-msgstr ""
-"Знак можно ввести, употребляя сочетания клавиш на клавиатуре, список знаков "
-"(F4) или функцию \"Поиск знака\" (F8)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
+msgstr "Знак можно ввести, употребляя сочетания клавиш на клавиатуре, список знаков (F4) или функцию \"Поиск знака\" (F8)."
 
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
@@ -729,12 +698,8 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "http://zrcola-2.amebis.si/en/info/instructions/"
 #~ msgstr "http://zrcola.zrc-sazu.si/ru/info/instructions/"
 
-#~ msgid ""
-#~ "http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-#~ "Tipkovnica_2009-06-21.pdf"
-#~ msgstr ""
-#~ "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/08/"
-#~ "ZRCola_tipkovnica_20160801.pdf"
+#~ msgid "http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-Tipkovnica_2009-06-21.pdf"
+#~ msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/08/ZRCola_tipkovnica_20160801.pdf"
 
 # Windows charset for this language (decimal)
 #~ msgid "1252"
@@ -855,15 +820,9 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "Left"
 #~ msgstr "Left"
 
-#~ msgid "Up"
-#~ msgstr "Up"
-
 #~ msgid "Right"
 #~ msgstr "Right"
 
-#~ msgid "Down"
-#~ msgstr "Down"
-
 #~ msgid "Num Lock"
 #~ msgstr "Num Lock"
 
@@ -932,12 +891,8 @@ msgstr "Система ввода ZRCola для лингвистического
 #~ msgid "Send Composed (F5)"
 #~ msgstr "Pošlji sestavljeno (F5)"
 
-#~ msgid ""
-#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
-#~ "functionality will not be available."
-#~ msgstr ""
-#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
-#~ "Nekaj funkcionalnosti ne bo na voljo."
+#~ msgid "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some functionality will not be available."
+#~ msgstr "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
 #, fuzzy
 #~ msgid "Authentication progress real time monitor"

ZRCola/locale/sl_SI.po

@@ -1,18 +1,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-18 10:08+0200\n"
-"PO-Revision-Date: 2016-10-18 10:09+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.10\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"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 
@@ -21,74 +20,75 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolaapp.cpp:71 zrcolafrm.cpp:90 zrcolagui.cpp:874 zrcolagui.h:104
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
+#: zrcolaapp.cpp:72 zrcolafrm.cpp:106 zrcolagui.cpp:894 zrcolagui.h:108
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "ZRCola"
 msgstr "ZRCola"
 
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1024
 msgid "Character"
 msgstr "Znak"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1045
 msgid "Context"
 msgstr "Kontekst"
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:363
+#: zrcolachrreq.cpp:64 zrcolagui.h:366
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+#: zrcolachrslct.cpp:89
+msgid "Too many digits in Unicode."
+msgstr "Preveč števk v zapisu Unicode."
+
+#: zrcolachrslct.cpp:89 zrcolachrslct.cpp:107
+msgid "Validation conflict"
+msgstr "Nesoglasje pri preverjanju"
+
+#: zrcolachrslct.cpp:107
+#, c-format
+msgid "Invalid character in Unicode found: %c"
+msgstr "Napačen znak v zapisu Unicode: %c"
+
+#: zrcolachrslct.cpp:214 zrcolachrslct.cpp:390 zrcolachrslct.cpp:869
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"
 
 # Recitation separator
-#: zrcolachrslct.cpp:164
+#: zrcolachrslct.cpp:328
 msgid ", "
 msgstr ", "
 
-#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+#: zrcolachrslct.cpp:393 zrcolachrslct.cpp:866
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
-#: zrcolafrm.cpp:141
-msgid ""
-"ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
-"funkcionalnosti ne bo na voljo."
+#: zrcolafrm.cpp:90
+msgid "Custom Translation..."
+msgstr "Pretvorba po meri ..."
 
-#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
+#: zrcolafrm.cpp:175
+msgid "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality will not be available."
+msgstr "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
+
+#: zrcolafrm.cpp:175 zrcolafrm.cpp:177
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:143
-msgid ""
-"ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
-"will not be available."
-msgstr ""
-"ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj "
-"funkcionalnosti ne bo na voljo."
+#: zrcolafrm.cpp:177
+msgid "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality will not be available."
+msgstr "ZRColine bližnjice na tipkovnici Win+F6 ni mogoče registrirati. Nekaj funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:351
+#: zrcolafrm.cpp:410
 msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
 msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
-#: zrcolafrm.cpp:375
-msgid ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
-msgstr ""
-"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
-"ZRCola_tipkovnica_Jun2016.pdf"
+#: zrcolafrm.cpp:434
+msgid "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
+msgstr "http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"
 
 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -114,7 +114,7 @@ msgstr "Izberi celotno besedilo"
 msgid "Find C&haracter..."
 msgstr "Poišči &znak ..."
 
-#: zrcolagui.cpp:78 zrcolagui.cpp:180
+#: zrcolagui.cpp:78 zrcolagui.cpp:198
 msgid "Display character search to select character to insert into text"
 msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 
@@ -122,348 +122,356 @@ msgstr "Prikaži iskalnik znakov za izbor znaka za vstavljanje v besedilo"
 msgid "&Send Composed"
 msgstr "Pošlji &sestavljeno"
 
-#: zrcolagui.cpp:89 zrcolagui.cpp:182
+#: zrcolagui.cpp:89 zrcolagui.cpp:200
 msgid "Send composed text to source window"
 msgstr "Pošlji sestavljeno besedilo izvornemu oknu"
 
 #: zrcolagui.cpp:98
+msgid "Copy Composed and &Return"
+msgstr "Kopi&raj sestavljeno in se vrni"
+
+#: zrcolagui.cpp:98
+msgid "Copy composed text to clipboard and return focus to source window"
+msgstr "Kopiraj sestavljeno besedilo na odložišče in vrni fokus nazaj izvornemu oknu"
+
+#: zrcolagui.cpp:107
 msgid "Send &Decomposed"
 msgstr "Pošlji &razstavljeno"
 
-#: zrcolagui.cpp:98 zrcolagui.cpp:184
+#: zrcolagui.cpp:107 zrcolagui.cpp:202
 msgid "Send decomposed text to source window"
 msgstr "Pošlji razstavljeno besedilo izvornemu oknu"
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:116
+msgid "Copy Decomposed and Re&turn"
+msgstr "Kopi&raj razstavljeno in se vrni"
+
+#: zrcolagui.cpp:116
+msgid "Copy decomposed text to clipboard and return focus to source window"
+msgstr "Kopiraj razstavljeno besedilo na odložišče in vrni fokus nazaj izvornemu oknu"
+
+#: zrcolagui.cpp:125
 msgid "Abort (De)composition"
 msgstr "Prekini raz/sestavljanje"
 
-#: zrcolagui.cpp:107
+#: zrcolagui.cpp:125
 msgid "Abort composition and return focus to source window"
 msgstr "Prekini sestavljanje in vrni fokus nazaj izvornemu oknu"
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "&Settings..."
 msgstr "Na&stavitve ..."
 
-#: zrcolagui.cpp:118
+#: zrcolagui.cpp:136
 msgid "Open program configuration dialog"
 msgstr "Odpri nastavitveni dialog programa"
 
-#: zrcolagui.cpp:121
+#: zrcolagui.cpp:139
 msgid "&Edit"
 msgstr "Ur&edi"
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "&Edit Toolbar"
 msgstr "Orodna vrstica za ur&ejanje"
 
-#: zrcolagui.cpp:125
+#: zrcolagui.cpp:143
 msgid "Toggle edit toolbar"
 msgstr "Prikaži/skrij orodno vrstico za urejanje"
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "&Compose Toolbar"
 msgstr "Orodna vrsti&ca za sestavljanje"
 
-#: zrcolagui.cpp:129
+#: zrcolagui.cpp:147
 msgid "Toggle compose toolbar"
 msgstr "Prikaži/skrij orodno vrstico za sestavljanje"
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Character Catalo&g"
 msgstr "Katalo&g znakov"
 
-#: zrcolagui.cpp:135
+#: zrcolagui.cpp:153
 msgid "Toggle character catalog panel"
 msgstr "Prikaži/skrij katalog znakov"
 
-#: zrcolagui.cpp:138
+#: zrcolagui.cpp:156
 msgid "&View"
 msgstr "Po&gled"
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "&Instructions..."
 msgstr "Navod&ila ..."
 
-#: zrcolagui.cpp:142
+#: zrcolagui.cpp:160
 msgid "Open a web site with product instructions"
 msgstr "Odpri spletno stran z navodili izdelka"
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Keyboard &Shortcuts..."
 msgstr "&Bližnjice na tipkovnici ..."
 
-#: zrcolagui.cpp:146
+#: zrcolagui.cpp:164
 msgid "Open a list of keyboard shortcuts"
 msgstr "Odpri seznam bližnjic na tipkovnici"
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "&Request a new character..."
 msgstr "&Zahtevaj nov znak ..."
 
-#: zrcolagui.cpp:152
+#: zrcolagui.cpp:170
 msgid "Submit a request to ZRC to add a new character"
 msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check for &Updates..."
 msgstr "Preveri &posodobitve ..."
 
-#: zrcolagui.cpp:156
+#: zrcolagui.cpp:174
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
-#: zrcolagui.cpp:162
+#: zrcolagui.cpp:180
 msgid "&About..."
 msgstr "O progr&amu ..."
 
-#: zrcolagui.cpp:165
+#: zrcolagui.cpp:183
 msgid "&Help"
 msgstr "Po&moč"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut"
 msgstr "Izreži"
 
-#: zrcolagui.cpp:170
+#: zrcolagui.cpp:188
 msgid "Cut selection"
 msgstr "Izreži izbor"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: zrcolagui.cpp:172
+#: zrcolagui.cpp:190
 msgid "Copy selection"
 msgstr "Kopiraj izbor"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste"
 msgstr "Prilepi"
 
-#: zrcolagui.cpp:174
+#: zrcolagui.cpp:192
 msgid "Paste selection"
 msgstr "Prilepi izbor"
 
-#: zrcolagui.cpp:177
+#: zrcolagui.cpp:195
 msgid "Edit"
 msgstr "Urejanje"
 
-#: zrcolagui.cpp:180
+#: zrcolagui.cpp:198
 msgid "Find Character"
 msgstr "Poišči znak"
 
-#: zrcolagui.cpp:182
+#: zrcolagui.cpp:200
 msgid "Send Composed"
 msgstr "Pošlji sestavljeno"
 
-#: zrcolagui.cpp:184
+#: zrcolagui.cpp:202
 msgid "Send Decomposed"
 msgstr "Pošlji razstavljeno"
 
-#: zrcolagui.cpp:187
+#: zrcolagui.cpp:209
 msgid "Compose"
 msgstr "Sestavljanje"
 
-#: zrcolagui.cpp:191
+#: zrcolagui.cpp:213
 msgid "Character Catalog"
 msgstr "Katalog znakov"
 
-#: zrcolagui.cpp:195
+#: zrcolagui.cpp:217
 msgid "(De)Composer"
 msgstr "Razstavljalnik/Sestavljalnik"
 
-#: zrcolagui.cpp:234
+#: zrcolagui.cpp:258
 msgid "Decomposed Text"
 msgstr "Razstavljeno besedilo"
 
-#: zrcolagui.cpp:254
+#: zrcolagui.cpp:278
 msgid "Decomposed Unicode Dump"
 msgstr "Unicode razstavljenega"
 
-#: zrcolagui.cpp:281
+#: zrcolagui.cpp:305
 msgid "Composed Text"
 msgstr "Sestavljeno besedilo"
 
-#: zrcolagui.cpp:301
+#: zrcolagui.cpp:325
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: zrcolagui.cpp:355
+#: zrcolagui.cpp:379
 msgid "Select category to display"
 msgstr "Izberi kategorijo za prikaz"
 
-#: zrcolagui.cpp:389
+#: zrcolagui.cpp:413
 msgid "Show &All"
 msgstr "Prik&aži vse"
 
-#: zrcolagui.cpp:390
+#: zrcolagui.cpp:414
 msgid "Toggle display of less frequent characters"
 msgstr "Prikaži/skrij manj pogoste znake"
 
-#: zrcolagui.cpp:430
+#: zrcolagui.cpp:454
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: zrcolagui.cpp:437
-msgid ""
-"Full or partial terms from Unicode character description (in English) to "
-"search for"
-msgstr ""
-"Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
+#: zrcolagui.cpp:461
+msgid "Full or partial terms from Unicode character description (in English) to search for"
+msgstr "Polne ali delne besede iz opisa znaka Unicode (v angleščini) za iskanje"
 
-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:465
 msgid "Search Options"
 msgstr "Možnosti iskanja"
 
-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:466
 msgid "Shows/hides additional search options"
 msgstr "Prikaže/skrije dodatne možnosti iskanja"
 
-#: zrcolagui.cpp:454
+#: zrcolagui.cpp:478
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: zrcolagui.cpp:461
+#: zrcolagui.cpp:485
 msgid "All"
 msgstr "Vse"
 
-#: zrcolagui.cpp:462
+#: zrcolagui.cpp:486
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: zrcolagui.cpp:466
+#: zrcolagui.cpp:490
 msgid "None"
 msgstr "Nič"
 
-#: zrcolagui.cpp:467
+#: zrcolagui.cpp:491
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: zrcolagui.cpp:471
+#: zrcolagui.cpp:495
 msgid "Invert"
 msgstr "Obrni"
 
-#: zrcolagui.cpp:472
+#: zrcolagui.cpp:496
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: zrcolagui.cpp:511
+#: zrcolagui.cpp:535
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: zrcolagui.cpp:521
+#: zrcolagui.cpp:545
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: zrcolagui.cpp:549
+#: zrcolagui.cpp:573
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: zrcolagui.cpp:563
+#: zrcolagui.cpp:587
 msgid "Preview"
 msgstr "Predogled"
 
-#: zrcolagui.cpp:568
+#: zrcolagui.cpp:592
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:573
+#: zrcolagui.cpp:597
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: zrcolagui.cpp:578
+#: zrcolagui.cpp:602
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: zrcolagui.cpp:613
+#: zrcolagui.cpp:637
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: zrcolagui.cpp:618
+#: zrcolagui.cpp:642
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:647
 msgid "Character tags"
 msgstr "Oznake znaka"
 
-#: zrcolagui.cpp:628
+#: zrcolagui.cpp:652
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: zrcolagui.cpp:635
+#: zrcolagui.cpp:659
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: zrcolagui.cpp:637
+#: zrcolagui.cpp:661
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: zrcolagui.cpp:641
+#: zrcolagui.cpp:665
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: zrcolagui.cpp:643
+#: zrcolagui.cpp:667
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: zrcolagui.cpp:654
+#: zrcolagui.cpp:678
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: zrcolagui.cpp:681
+#: zrcolagui.cpp:705
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: zrcolagui.cpp:770
+#: zrcolagui.cpp:794
 msgid ""
-"Some character native to specific language you are working with should not "
-"decompose to primitives.\n"
+"Some character native to specific language you are working with should not decompose to primitives.\n"
 "For optimal decomposition you should set the language correctly."
 msgstr ""
-"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo "
-"razstavljati.\n"
+"Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: zrcolagui.cpp:774
+#: zrcolagui.cpp:798
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: zrcolagui.cpp:777
+#: zrcolagui.cpp:801
 msgid "&Manually select the language from the list below:"
 msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: zrcolagui.cpp:789
+#: zrcolagui.cpp:812
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: zrcolagui.cpp:794
+#: zrcolagui.cpp:817
 msgid ""
 "ZRCola can be launched every time you log in to your computer.\n"
-"It will be available on the system tray and via registered shortcuts Win+F5 "
-"and Win+F6."
+"It will be available on the system tray and via registered shortcuts Win+F5 and Win+F6."
 msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
-"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih "
-"bližnjic Win+F5 in Win+F6."
+"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih bližnjic Win+F5 in Win+F6."
 
-#: zrcolagui.cpp:798
+#: zrcolagui.cpp:821
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.cpp:805
+#: zrcolagui.cpp:827
 msgid "Startup"
 msgstr "Zagon"
 
-#: zrcolagui.cpp:885
+#: zrcolagui.cpp:905
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
 "Translation into English: Janoš Ježovnik\n"
-"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia "
-"Plotnikova\n"
+"Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\n"
 "Development and maintenance of the original program (2004–2015): Peter Weiss"
 msgstr ""
 "Urednik programa in spletne strani: Janoš Ježovnik\n"
@@ -472,101 +480,140 @@ msgstr ""
 "Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
 "Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: zrcolagui.cpp:893
+#: zrcolagui.cpp:913
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: zrcolagui.cpp:899
-msgid ""
-"Texts made using ZRCola have to include in 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:919
+msgid "Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"
+msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: zrcolagui.cpp:903
-msgid ""
-"This text was written using the ZRCola input system (http://zrcola.zrc-sazu."
-"si), developed at the Science and Research Centre of SAZU in Ljubljana "
-"(http://www.zrc-sazu.si) by Peter Weiss."
-msgstr ""
-"Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-"
-"sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani "
-"(http://www.zrc-sazu.si) razvil Peter Weiss."
+#: zrcolagui.cpp:923
+msgid "This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."
+msgstr "Besedilo je bilo pripravljeno z vnašalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: zrcolagui.cpp:944
+#: zrcolagui.cpp:964
 msgid "Log"
 msgstr "Dnevnik"
 
-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:980
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: zrcolagui.cpp:962
+#: zrcolagui.cpp:982
 msgid "Exit this program and launch product update"
 msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: zrcolagui.cpp:966
+#: zrcolagui.cpp:986
 msgid "&Close"
 msgstr "&Zapri"
 
-#: zrcolagui.cpp:967
+#: zrcolagui.cpp:987
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1026
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: zrcolagui.cpp:1013
+#: zrcolagui.cpp:1033
 msgid "Decomposed character to request"
 msgstr "Zahtevani znak v razstavljeni obliki"
 
 # Please use a double && for final "&" character
-#: zrcolagui.cpp:1017
+#: zrcolagui.cpp:1037
 msgid ""
 "Please, use the decomposed form.\n"
-"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
-"it from the Decomposed window."
+"You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste it from the Decomposed window."
 msgstr ""
 "Uporabite razstavljeno obliko.\n"
-"Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga "
-"kopirate in prilepite iz okna z razstavljenim besedilom."
+"Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga kopirate in prilepite iz okna z razstavljenim besedilom."
 
-#: zrcolagui.cpp:1027
-msgid ""
-"The &context, examples or description why and where the character is "
-"required:"
+#: zrcolagui.cpp:1047
+msgid "The &context, examples or description why and where the character is required:"
 msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: zrcolagui.cpp:1033
+#: zrcolagui.cpp:1053
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: zrcolagui.cpp:1040
+#: zrcolagui.cpp:1060
 msgid ""
-"After clicking OK button, your e-mail application should open allowing you "
-"to submit the new character request to ZRCola Editor.\n"
-"Your e-mail application might not display all the characters correctly, but "
-"the Editor will be able to read them correctly anyway."
+"After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\n"
+"Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."
 msgstr ""
-"Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim "
-"boste lahko oddali zahtevo za nov znak uredniku programa.\n"
-"Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo "
-"urednik lahko kljub temu razbral."
+"Ko boste kliknili gumb V redu, se bo odprl vaš program za e-pošto, s katerim boste lahko oddali zahtevo za nov znak uredniku programa.\n"
+"Vsi znaki v sporočilu morda ne bodo prikazani pravilno, vendar jih bo urednik lahko kljub temu razbral."
+
+#: zrcolagui.cpp:1102
+msgid "Translation"
+msgstr "Pretvorba"
+
+#: zrcolagui.cpp:1104
+msgid ""
+"ZRCola offers multiple text translations that can be arranged in a sequence.\n"
+"Please select desired translations and the order they are applied."
+msgstr ""
+"ZRCola ponuja različne pretvorbe besedila, ki jih lahko uredimo v zaporedje.\n"
+"Prosimo, izberite želene pretvorbe in vrstni red, v katerem naj 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."
+msgid "INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."
+msgstr "Pritisnili ste tipko INS. Vtipkajte kodo Unicode želenega znaka (do štiri šestnajstiške števke: 0–9, A–F), nato izpustite INS."
 
-#: zrcolasettings.cpp:93
+#: zrcolasettings.cpp:87
 msgid "Start ZRCola automatically on logon"
 msgstr "Samodejno zaženi ZRColo ob prijavi"
 
+#: zrcolatranseq.cpp:63
+#, c-format
+msgid "Unknown translation (%u)"
+msgstr "Neznana pretvorba (%u)"
+
 #: zrcolaupdater.cpp:94
 msgid ""
 "This program will now close and the upgrade will be launched.\n"
@@ -575,150 +622,80 @@ msgstr ""
 "Program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
 "Ali ste prepričani, da želite nadaljevati?"
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:334
-msgid "Product Update"
-msgstr "Posodabljanje izdelka"
-
-#: zrcolagui.h:246
-msgid "Character Search"
-msgstr "Poišči znak"
-
-#: zrcolagui.h:283
-msgid "Settings"
-msgstr "Nastavitve"
-
-#: zrcolagui.h:309
-msgid "About ZRCola"
-msgstr "O ZRColi"
-
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:10
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:15
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:10
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:15
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15
 msgid "binUIHeader.bmp"
 msgstr "binUIHeader.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:5
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:5
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:6
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6
 msgid "bintutorial1.bmp"
 msgstr "bintutorial1.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:7
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:7
-msgid ""
-"When configured, ZRCola starts at system startup and runs in the background. "
-"If needed, it can be brought up by pressing the combination Win+F5."
-msgstr ""
-"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
-"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
+msgid "When configured, ZRCola starts at system startup and runs in the background. If needed, it can be brought up by pressing the combination Win+F5."
+msgstr "Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:8
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:8
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:8
-msgid ""
-"IMPORTANT: Upon pressing the combination Win+F5 the program memorises the "
-"location of the cursor in the text. If ZRCola is brought to the foreground "
-"without using the aforementioned combination of keys, the program won't know "
-"where to insert the special characters!"
-msgstr ""
-"POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v "
-"besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
-"vedel, kam vstaviti želene znake!"
+msgid "IMPORTANT: Upon pressing the combination Win+F5 the program memorises the location of the cursor in the text. If ZRCola is brought to the foreground without using the aforementioned combination of keys, the program won't know where to insert the special characters!"
+msgstr "POMEMBNO: Ob pritisku na Win+F5 si program zapomni mesto kurzorja v besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo vedel, kam vstaviti želene znake!"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:9
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:14
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:19
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:9
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:14
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:19
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:9
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:14
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:19
 msgid "&Continue"
 msgstr "&Nadaljuj"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:11
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:11
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:11
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:12
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12
 msgid "bintutorial2.bmp"
 msgstr "bintutorial2.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:13
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:13
-msgid ""
-"The string of basic and substitute characters is entered into the upper "
-"input window of the program. In the window below the resulted special "
-"characters are displayed. To insert them in the text, the F5 key is used."
-msgstr ""
-"Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v "
-"programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
-"vnesemo s pritiskom na tipko F5."
+msgid "The string of basic and substitute characters is entered into the upper input window of the program. In the window below the resulted special characters are displayed. To insert them in the text, the F5 key is used."
+msgstr "Želeni niz osnovnih in nadomestnih znakov vnesemo v zgornjo vrstico v programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih vnesemo s pritiskom na tipko F5."
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:16
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:16
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:16
 msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
 msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:17
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17
 msgid "bintutorial3.bmp"
 msgstr "bintutorial3.bmp"
 
-#: MSIBuild/en_US.Win32.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18
-#: MSIBuild/en_US.x64.Debug.Control-2.idtx:18
 #: MSIBuild/en_US.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
-msgstr ""
-"Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz "
-"kataloga znakov (F4) ali z iskalnikom znakov (F8)."
+msgid "Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8)."
+msgstr "Znake lahko v vnosno vrstico vstavljamo s pomočjo bližnjic na tipkovnici, iz kataloga znakov (F4) ali z iskalnikom znakov (F8)."
 
-#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Input system for linguistic use"
 msgstr "Vnašalni sistem za jezikoslovno rabo"
+
+#~ msgid "&Active:"
+#~ msgstr "&Aktivni:"

ZRCola/stdafx.h

@@ -29,6 +29,7 @@
 #include "zrcolafrm.h"
 #include "zrcolakeyhndlr.h"
 #include "zrcolasettings.h"
+#include "zrcolatranseq.h"
 #include "zrcolaupdater.h"
 
 #include <Updater/chkthread.h>
@@ -37,13 +38,15 @@
 #include <wxex/url.h>
 #include <wxex/persist/auimanager.h>
 
+#include <wx/clipbrd.h>
 #include <wx/ffile.h>
 #include <wx/msgdlg.h>
 #include <wx/persist.h>
 #include <wx/persist/toplevel.h>
+#include <wx/socket.h>
+#include <wx/tokenzr.h>
 #include <wx/utils.h>
 #include <wx/valtext.h>
-#include <wx/socket.h>
 
 #include <WinStd/MSI.h>