Switch to new catalog update file and switch to SHA-256 (phase 1)

Versions 2.2 and 2.3 require to update to 2.4 first (to fix Active Setup issue which works for minor updates only), before updating to 2.5 (requires major update). The 2.5 and beyond updates will have to be visible to 2.4 version only. Therefore, we switch the Updater in 2.4 to a new catalog file. While the 2.4 update itself needs to be published to the existing catalog file to instruct pre-2.4 versions to update to 2.4. In other words: - include\UpdaterCfg.h is about checking for future releases - Makefile publish is about upgrading the past releases This is also an excellent opportunity to phase out SHA-1. Updater will treat all hashes as SHA-256 when checking for updates in the new catalog - the future releases. While we keep hashing and signing the old catalog file using SHA-1 - for past releases. Signed-off-by: Simon Rozman <simon@rozman.si>
Preset version to 2.4
2020-02-25 13:32:48 +01:00 · 2020-02-25 09:54:48 +01:00 · 2020-02-25 08:53:45 +01:00 · 2020-02-25 08:53:45 +01:00 · 2020-02-25 08:53:45 +01:00 · 2020-02-25 08:53:44 +01:00
231 changed files with 21164 additions and 12355 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-/*.opensdf
-/*.sdf
-/*.suo
-/ipch
+/.vs
 *.user
 temp
--- a/LOCALIZATION.md
+++ b/LOCALIZATION.md
@@ -0,0 +1,21 @@
+# Localization of ZRCola
+
+In order to get ZRCola experience in your language the following resources should be translated:
+
+1. [ZRCola Application](https://www.transifex.com/amebis/zrcola/app/)
+2. [ZRCola Database](https://www.transifex.com/amebis/zrcola/database/)
+3. [ZRCola Core](https://www.transifex.com/amebis/zrcola/core/)
+4. [Updater](https://www.transifex.com/amebis/updater/updater/) and [Updater UpdCheck](https://www.transifex.com/amebis/updater/updcheck/)
+5. [wxExtend](https://www.transifex.com/amebis/wxextend/wxextend/)
+6. Setup
+   - [ZRCola Setup](https://www.transifex.com/amebis/zrcola/setup/)
+   - [MSIBuild UI](https://www.transifex.com/amebis/msibuild/ui/)
+   - [MSIBuild Core](https://www.transifex.com/amebis/msibuild/core/)
+   - [MSICALib](https://www.transifex.com/amebis/msicalib/msicalib/)
+   - [MSICA](https://www.transifex.com/amebis/msica/msica/)
+
+## 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).
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSI/MSICA
+++ b/MSI/MSICA
--- a/MSI/MSM/.gitignore
+++ b/MSI/MSM/.gitignore
@@ -1,5 +0,0 @@
-/*.log
-/Microsoft_VC100_CRT_x64.msm
-/Microsoft_VC100_CRT_x86.msm
-/Microsoft_VC100_DebugCRT_x64.msm
-/Microsoft_VC100_DebugCRT_x86.msm
--- a/MSI/MSM/Microsoft_VC100_CRT_x64.lst
+++ b/MSI/MSM/Microsoft_VC100_CRT_x64.lst
@@ -1,2 +0,0 @@
-Win\System64\msvcp100.dll
-Win\System64\msvcr100.dll
--- a/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/Microsoft_VC100_CRT_x86.lst
+++ b/MSI/MSM/Microsoft_VC100_CRT_x86.lst
@@ -1,2 +0,0 @@
-Win\System\msvcp100.dll
-Win\System\msvcr100.dll
--- a/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.lst
@@ -1,2 +0,0 @@
-Win\System64\msvcp100d.dll
-Win\System64\msvcr100d.dll
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.lst
@@ -1,2 +0,0 @@
-Win\System\msvcp100d.dll
-Win\System\msvcr100d.dll
--- a/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
+++ b/MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30u_net_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_net_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30u_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30u_xml_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30ud_net_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30ud_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxbase30ud_xml_vc100.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30u_adv_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_adv_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30u_aui_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_aui_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30u_core_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30ud_adv_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_adv_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30ud_aui_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_aui_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.lst
@@ -1 +0,0 @@
-System Folder\wxmsw30ud_core_vc100.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.lst
@@ -1 +0,0 @@
-System (64-bit) Folder\wxmsw30ud_core_vc100_x64.dll
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msm
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msm
--- a/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg
+++ b/MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg
@@ -1,24 +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/>.
-#
-
-[splosno]
-jezik=0
-deli=featZRCola featUpdCheck
-
-[parametri]
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
--- a/MSI/ZRCola/Makefile
+++ b/MSI/ZRCola/Makefile
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2017 Amebis
+#    Copyright 1991-2020 Amebis
 #
 #    This file is part of ZRCola.
 #
--- a/MSI/ZRCola/locale/ZRCola.pot
+++ b/MSI/ZRCola/locale/ZRCola.pot
--- a/MSI/ZRCola/locale/de_DE.po
+++ b/MSI/ZRCola/locale/de_DE.po
--- a/MSI/ZRCola/locale/ru_RU.po
+++ b/MSI/ZRCola/locale/ru_RU.po
--- a/MSI/ZRCola/locale/sl_SI.po
+++ b/MSI/ZRCola/locale/sl_SI.po
--- a/MSILocal.mak
+++ b/MSILocal.mak
--- a/317
+++ b/317
@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2017 Amebis
+#    Copyright 1991-2020 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -18,16 +18,25 @@
 #

 OUTPUT_DIR=output
-PUBLISH_DIR=\\amebis.doma\Splet\WWW\Apache\www.amebis.si-prenos\ZRCola
+PUBLISH_DIR_LEGACY=\\amebis.doma\Splet\WWW\Apache2\www.amebis.si-prenos\ZRCola
+PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola

 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
 PLAT=x64
 REG_FLAGS=/f /reg:64
 REG_FLAGS32=/f /reg:32
+PROGRAM_FILES_32=C:\Program Files (x86)
+!ELSEIF "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+PLAT=ARM64
+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
+MSBUILDFLAGS=/v:m /m


 All ::
@@ -36,43 +45,7 @@ Clean ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	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"
+	-if exist "$(OUTPUT_DIR)\catalog.xml" del /f /q "$(OUTPUT_DIR)\catalog.xml"

 !IFNDEF HAS_VERSION

@@ -107,7 +80,7 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "include\MSIBuildCfg.mak"

 PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
-PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
+PUBLISH_PACKAGE_URL=http://prenos.amebis.si/ZRCola/$(MSIBUILD_VERSION_STR)

 ######################################################################
 # Main targets
@@ -116,26 +89,6 @@ PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
 All :: \
 	Setup

-Setup :: \
-#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64.msi"
-
-SetupDebug :: \
-#	"$(OUTPUT_DIR)\ZRColaDe32D.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64D.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32D.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64D.msi"
-

 ######################################################################
 # Publishing
@@ -143,22 +96,12 @@ SetupDebug :: \

 PublishPre :: \
 	"$(PUBLISH_PACKAGE_DIR)" \
-#	"$(PUBLISH_PACKAGE_DIR)\ZRColaDe32.msi" \
-#	"$(PUBLISH_PACKAGE_DIR)\ZRColaDe64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaRu32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaRu64.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi" \
-	"$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi" \
-	"$(PUBLISH_DIR)" \
-#	"$(PUBLISH_DIR)\ZRColaInstallDe.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallEn.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallRu.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallSl.exe"
+	"$(PUBLISH_DIR_LEGACY)" \
+	"$(PUBLISH_DIR)"

 Publish :: \
 	PublishPre \
+	"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \
 	"$(PUBLISH_DIR)\catalog-0000.xml"


@@ -177,17 +120,21 @@ 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"
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+	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"
+!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "ARM64"
+	-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
@@ -203,16 +150,16 @@ 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

-UninstallFonts::
+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
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
 	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" /v "00 ZRCola"                     $(REG_FLAGS) > NUL
-	-if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Re.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_It.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_It.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_Bd.otf"
-	-if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" rd /s /q "$(WINDIR)\Fonts\ZRCola_BI.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_Re.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_Re.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_It.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_It.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_Bd.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_Bd.otf"
+	-if exist "$(WINDIR)\Fonts\ZRCola_BI.otf" del /f /q "$(WINDIR)\Fonts\ZRCola_BI.otf"

 RegisterShortcuts :: \
 	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
@@ -221,21 +168,6 @@ RegisterShortcuts :: \
 UnregisterShortcuts ::
 	-if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola"

-######################################################################
-# Localization
-######################################################################
-
-Localization :: \
-	"$(OUTPUT_DIR)\locale\de_DE" \
-	"$(OUTPUT_DIR)\locale\de_DE\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" \
-	"$(OUTPUT_DIR)\locale\ru_RU" \
-	"$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" \
-	"$(OUTPUT_DIR)\locale\sl_SI" \
-	"$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo" \
-	"$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-

 ######################################################################
 # Folder creation
@@ -244,9 +176,7 @@ Localization :: \
 "$(OUTPUT_DIR)" \
 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" \
-"$(OUTPUT_DIR)\locale\de_DE" \
-"$(OUTPUT_DIR)\locale\ru_RU" \
-"$(OUTPUT_DIR)\locale\sl_SI" \
+"$(PUBLISH_DIR_LEGACY)" \
 "$(PUBLISH_DIR)" \
 "$(PUBLISH_PACKAGE_DIR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
@@ -255,10 +185,6 @@ Localization :: \
 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)"

-"$(OUTPUT_DIR)\locale\de_DE" \
-"$(OUTPUT_DIR)\locale\ru_RU" \
-"$(OUTPUT_DIR)\locale\sl_SI" : "$(OUTPUT_DIR)\locale"
-
 "$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)"


@@ -291,143 +217,11 @@ Localization :: \
 # Building
 ######################################################################

-"$(OUTPUT_DIR)\locale\de_DE\wxstd.mo" : "$(WXWIN)\locale\de.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\ru_RU\wxstd.mo" : "$(WXWIN)\locale\ru.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\sl_SI\wxstd.mo" : "$(WXWIN)\locale\sl.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" : "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.po"
-	msgfmt.exe --output-file=$@ --alignment=1 --endianness=little $**
-
-"$(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" :: 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
-
-"$(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
-
-"$(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
-
-"$(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" ::
-	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" ::
-	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" ::
-	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" ::
-	devenv.com "ZRCola.sln" /build "Debug|x64"
-
-"$(OUTPUT_DIR)\ZRCola32.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.32.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.32.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola32" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola32D.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.32D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.32D.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola32D" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola64.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.64.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.64.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola64D.ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.64D.2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.64D.2.msi"
-	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola64D" /C:LZX
-	move /y "$(@:"=).tmp" $@ > NUL
-
-"$(OUTPUT_DIR)\ZRCola32.cab" \
-"$(OUTPUT_DIR)\ZRCola32.inf" \
-"$(OUTPUT_DIR)\ZRCola32.rpt" : "$(OUTPUT_DIR)\ZRCola32.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola32D.cab" \
-"$(OUTPUT_DIR)\ZRCola32D.inf" \
-"$(OUTPUT_DIR)\ZRCola32D.rpt" : "$(OUTPUT_DIR)\ZRCola32D.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola64.cab" \
-"$(OUTPUT_DIR)\ZRCola64.inf" \
-"$(OUTPUT_DIR)\ZRCola64.rpt" : "$(OUTPUT_DIR)\ZRCola64.ddf"
-	makecab.exe /F $**
-
-"$(OUTPUT_DIR)\ZRCola64D.cab" \
-"$(OUTPUT_DIR)\ZRCola64D.inf" \
-"$(OUTPUT_DIR)\ZRCola64D.rpt" : "$(OUTPUT_DIR)\ZRCola64D.ddf"
-	makecab.exe /F $**
-
+"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \
 "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
-	if exist $@  del /f /q $@
-	output\$(PLAT).Release\UpdSignXML.exe $** $@
+	copy /y $** $@ > NUL

 "$(OUTPUT_DIR)\catalog.xml" : \
-#	"$(OUTPUT_DIR)\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64.msi" \
 	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
 	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
 	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
@@ -435,33 +229,46 @@ Localization :: \
 	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
 	"$(OUTPUT_DIR)\ZRColaSl64.msi"
 	-if exist $@ del /f /q $@
-	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
 	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
-#	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
+	"$(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_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@
+	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"

 !ENDIF

+######################################################################
+# Platform Specific
+######################################################################

-#LANG=de_DE
-#LANG_OUT=De
-#!INCLUDE "MSILocal.mak"
+PLAT=Win32
+PLAT_SUFFIX=32
+!INCLUDE "MakefilePlat.mak"
+
+PLAT=x64
+PLAT_SUFFIX=64
+!INCLUDE "MakefilePlat.mak"
+
+
+######################################################################
+# Language Specific
+######################################################################

 LANG=en_US
-LANG_OUT=En
-!INCLUDE "MSILocal.mak"
+LANG_BASE=en
+LANG_SUFFIX=En
+!INCLUDE "MakefileLang.mak"

 LANG=ru_RU
-LANG_OUT=Ru
-!INCLUDE "MSILocal.mak"
+LANG_BASE=ru
+LANG_SUFFIX=Ru
+!INCLUDE "MakefileLang.mak"

 LANG=sl_SI
-LANG_OUT=Sl
-!INCLUDE "MSILocal.mak"
+LANG_BASE=sl
+LANG_SUFFIX=Sl
+!INCLUDE "MakefileLang.mak"
--- a/MakefileLang.mak
+++ b/MakefileLang.mak
--- a/MakefileLangPlatCfg.mak
+++ b/MakefileLangPlatCfg.mak
--- a/MakefilePlat.mak
+++ b/MakefilePlat.mak
--- a/MakefilePlatCfg.mak
+++ b/MakefilePlatCfg.mak
@@ -0,0 +1,66 @@
+#
+#    Copyright 1991-2020 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/>.
+#
+
+All ::
+
+Clean ::
+	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln"          /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+!IF "$(PLAT)" == "Win32"
+	msbuild.exe $(MSBUILDFLAGS) "ZRColaUtils.sln"     /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+!ENDIF
+	msbuild.exe $(MSBUILDFLAGS) "MSI\MSICA\MSICA.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+	msbuild.exe $(MSBUILDFLAGS) "Updater\Updater.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf"
+	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab"
+	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf"
+	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt"
+
+
+!IFDEF HAS_VERSION
+
+######################################################################
+# 2nd Phase
+# - The version is known, do the rest.
+######################################################################
+
+######################################################################
+# Building
+######################################################################
+
+"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" :: Localization
+
+"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" ::
+	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+
+"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" : \
+#	"$(OUTPUT_DIR)\ZRCola.de_DE.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
+	"$(OUTPUT_DIR)\ZRCola.en_US.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
+	"$(OUTPUT_DIR)\ZRCola.ru_RU.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
+	"$(OUTPUT_DIR)\ZRCola.sl_SI.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi"
+	-if exist $@ del /f /q $@
+	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
+	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX)" /C:LZX
+	move /y "$(@:"=).tmp" $@ > NUL
+
+"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" \
+"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" \
+"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" : "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf"
+	makecab.exe /F $**
+
+!ENDIF
--- a/README.md
+++ b/README.md
@@ -6,17 +6,35 @@ A Microsoft Windows application for composing texts using a wide range of Slavic
 http://zrcola.zrc-sazu.si/en/

 ## Binaries for Download
-https://www.amebis.si/prenos/ZRCola/
+https://prenos.amebis.si/ZRCola/

 ## Building

 ### Building Environment Requirements
 - Microsoft Windows Vista or later
- Microsoft Visual Studio 2010 SP1
+- Microsoft Visual Studio 2017
 - _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
+ZRCola is using wxWidgets static libraries. You have to compile static libraries yourself.
+
+#### Compiling wxWidgets Win32 static libraries
+1. Start _x86 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 BUILD=release`
+
+#### Compiling wxWidgets x64 static libraries
+1. Start _x64 Native Tools Command Prompt for VS 2017_
+2. Change working folder to `build\msw`
+3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64`
+4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=141 TARGET_CPU=X64 BUILD=release`
+
+#### Specifying wxWidgets path
+ZRCola compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets`).
+
 ### Digital Signing of Build Outputs
 In order to have the build process digitally sign output files, one should provide the following:

@@ -28,7 +46,7 @@ In order to have the build process digitally sign output files, one should provi
 Please note that only Release builds are configured for timestamp signing. Debug configurations do not attempt to timestamp sign the resulting DLL and EXE files in order to speed up the building process and enable offline building.

 ### Building
-Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder.
+Use Microsoft NMAKE to build the project. The resulting files can be found in output subfolder. Open _x64 Native Tools Command Prompt for VS 2017_ for building.

 - `nmake Clean`	Delete all intermediate and output files.
 - `nmake Setup`	Build a release version of project and release MSI setup files.
@@ -38,6 +56,9 @@ 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 
--- a/2
+++ b/2
--- a/ZRCola.sln
+++ b/ZRCola.sln
@@ -1,11 +1,13 @@

-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29728.190
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcxproj", "{CD9E4170-92DD-440E-980C-D15F62032249}"
 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.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}"
 	ProjectSection(SolutionItems) = preProject
@@ -16,72 +18,102 @@ 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.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.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.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|Win32.Build.0 = Debug|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.ActiveCfg = Debug|x64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Debug|x64.Build.0 = Debug|x64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|ARM64.Build.0 = Release|ARM64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.ActiveCfg = Release|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|Win32.Build.0 = Release|Win32
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.ActiveCfg = Release|x64
 		{CD9E4170-92DD-440E-980C-D15F62032249}.Release|x64.Build.0 = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|Win32.Build.0 = Debug|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.ActiveCfg = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Debug|x64.Build.0 = Debug|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|ARM64.Build.0 = Release|ARM64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.ActiveCfg = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|ARM64.Build.0 = Debug|ARM64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|Win32.Build.0 = Debug|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.ActiveCfg = Debug|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Debug|x64.Build.0 = Debug|x64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|ARM64.Build.0 = Release|ARM64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.ActiveCfg = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|Win32.Build.0 = Release|Win32
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.ActiveCfg = Release|x64
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}.Release|x64.Build.0 = Release|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|ARM64.Build.0 = Debug|ARM64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|Win32.Build.0 = Debug|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.ActiveCfg = Debug|x64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Debug|x64.Build.0 = Debug|x64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|ARM64.ActiveCfg = Release|ARM64
+		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|ARM64.Build.0 = Release|ARM64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.ActiveCfg = Release|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|Win32.Build.0 = Release|Win32
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.ActiveCfg = Release|x64
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579}.Release|x64.Build.0 = Release|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|ARM64.Build.0 = Debug|ARM64
 		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.ActiveCfg = Debug|Win32
 		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|Win32.Build.0 = Debug|Win32
 		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.ActiveCfg = Debug|x64
 		{518777CC-0A59-4415-A12A-82751ED75343}.Debug|x64.Build.0 = Debug|x64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|ARM64.ActiveCfg = Release|ARM64
+		{518777CC-0A59-4415-A12A-82751ED75343}.Release|ARM64.Build.0 = Release|ARM64
 		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.ActiveCfg = Release|Win32
 		{518777CC-0A59-4415-A12A-82751ED75343}.Release|Win32.Build.0 = Release|Win32
 		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.ActiveCfg = Release|x64
 		{518777CC-0A59-4415-A12A-82751ED75343}.Release|x64.Build.0 = Release|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|ARM64.Build.0 = Debug|ARM64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.ActiveCfg = Release|ARM64
+		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|ARM64.Build.0 = Release|ARM64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64
 		{990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
@@ -91,11 +123,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
+		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{3C61929E-7289-4101-8D0A-DA22D6E1AEA8} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{518777CC-0A59-4415-A12A-82751ED75343} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{990D8CF9-4457-4DC0-AA18-4968EF434741} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EECB5329-0607-4D77-8BC0-48BD8C08BEF9}
+	EndGlobalSection
 EndGlobal
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Simon Rozman	a6e337a2a1	Switch to new catalog update file and switch to SHA-256 (phase 1) Versions 2.2 and 2.3 require to update to 2.4 first (to fix Active Setup issue which works for minor updates only), before updating to 2.5 (requires major update). The 2.5 and beyond updates will have to be visible to 2.4 version only. Therefore, we switch the Updater in 2.4 to a new catalog file. While the 2.4 update itself needs to be published to the existing catalog file to instruct pre-2.4 versions to update to 2.4. In other words: - include\UpdaterCfg.h is about checking for future releases - Makefile publish is about upgrading the past releases This is also an excellent opportunity to phase out SHA-1. Updater will treat all hashes as SHA-256 when checking for updates in the new catalog - the future releases. While we keep hashing and signing the old catalog file using SHA-1 - for past releases. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:32:48 +01:00
Simon Rozman	0e1a347b5f	Preset version to 2.4 Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 09:54:48 +01:00
Simon Rozman	e28a146a39	Sub-module update Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:45 +01:00
Simon Rozman	dfedfc419e	Strip excessive custom action identifier prefixes Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:45 +01:00
Simon Rozman	9f9e5addcc	Fix the Active Setup StubPath issue affected products Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:45 +01:00
Simon Rozman	f0f3ce75d0	Revert "Unify component GUIDs across platforms" This reverts commit `2363016a76`. Due to Active Setup StubPath bug in already deployed MSI packages we can fix automatically using minor update only, we cannot change the component GUIDs just yet. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:44 +01:00
Simon Rozman	41c8cc01ed	Revert "Unify component GUIDs across languages" This reverts commit `f8f20f3667`. Due to Active Setup StubPath bug in already deployed MSI packages we can fix automatically using minor update only, we cannot change the component GUIDs just yet. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:44 +01:00
Simon Rozman	64ef4f5921	Preset version to 2.3.2 Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 08:53:44 +01:00
Simon Rozman	d6be99ed59	Stop hiding catalog-0000.xml file The hidden files cannot be downloaded (404) even when addressed directly. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-24 09:44:31 +01:00
Simon Rozman	c00e9cbe1f	Update legacy publish path Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-15 19:16:38 +01:00
Simon Rozman	867ab0f149	Fix upgrading from previous version As the language and platform-dependent component GUIDs changed and we wish to retain the original destination folders and filenames the RemoveExistingProducts custom action is now invoked differently according to the version of the product we are upgrading. When we are upgrading an old package with legacy component GUIDs, we're uninstalling it before installing the new one. When we will be upgrading a modern package with platform/language dependent component GUIDs, we will remove the leftover components after installing the new one. This should deliver compatible upgrades of existing versions while providing optimal upgrading in the future. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-15 19:08:00 +01:00
Simon Rozman	ebdbb84a29	Enable recommended code analysis and address warnings Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-13 13:18:11 +01:00
Simon Rozman	62702a0194	Remove excessive UTF-8 BOM Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 15:42:11 +01:00
Simon Rozman	b3702ed237	Extend copyright year Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 15:38:57 +01:00
Simon Rozman	d3af51adf8	Remove building of unused executables Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 14:54:09 +01:00
Simon Rozman	2363016a76	Unify component GUIDs across platforms Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 14:54:09 +01:00
Simon Rozman	f8f20f3667	Unify component GUIDs across languages Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 14:54:09 +01:00
Simon Rozman	c2b96dbcc1	Automate language-dependent folder property names Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 14:54:09 +01:00
Simon Rozman	90a53fb139	Unify upgrade GUID across platforms Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 11:46:26 +01:00
Simon Rozman	ac2c225540	Add missing MSIBUILD_LANG_GUID and MSIBUILD_PLAT_GUID properties Updated version of wxExtend sub-module requires them. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-11 11:46:05 +01:00
Simon Rozman	4a0bf118bf	Bump stdex Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-10 15:17:22 +01:00
Simon Rozman	2e04726dd7	Update font and database Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-10 15:05:07 +01:00
Simon Rozman	9c8ca4d7b1	Make enum wxHexDecodeMode scoped Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-10 14:59:24 +01:00
Simon Rozman	0800f813ff	Rename stdafx.h to pch.h Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-10 14:10:29 +01:00
Simon Rozman	dffc4bf9af	Unify platform designations .sln uses the same as .vcxproj files Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-10 14:03:44 +01:00
Simon Rozman	91d5c77e02	Clean Makefile Signed-off-by: Simon Rozman <simon@rozman.si>	2019-12-04 10:20:08 +01:00
Simon Rozman	94cbed643d	Move distribution to CDN server Signed-off-by: Simon Rozman <simon@rozman.si>	2019-12-04 10:18:01 +01:00
Simon Rozman	be687497e8	Bump MSICA, WinStd and wxExtend Signed-off-by: Simon Rozman <simon@rozman.si>	2019-12-04 10:07:00 +01:00
Simon Rozman	495b490dc2	Remove UTF-8 BOM Signed-off-by: Simon Rozman <simon@rozman.si>	2019-12-04 10:07:00 +01:00
Simon Rozman	f54c048b74	Preset version to 2.3.1 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-12-04 10:07:00 +01:00
Simon Rozman	81741eec8f	Update font and database Signed-off-by: Simon Rozman <simon@rozman.si>	2019-09-23 11:07:42 +02:00
Simon Rozman	ab065edda4	Update sub-modules Signed-off-by: Simon Rozman <simon@rozman.si>	2019-09-23 09:58:59 +02:00
Simon Rozman	6799a1f8a6	Preset version to 2.3 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-09-23 09:58:58 +02:00
Simon Rozman	84973a57d6	Set version to 2.2 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-08-09 15:01:06 +02:00
Simon Rozman	3b64c576fa	Update database Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-20 15:04:58 +02:00
Simon Rozman	0b777b89c2	Report error if database file don't open successfully Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-20 14:27:45 +02:00
Simon Rozman	b6567582e5	Enable function-level linking to allow LTCG Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-19 12:05:05 +02:00
Simon Rozman	8f1b412c1f	Switch to Visual Studio 2019 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-19 11:51:33 +02:00
Simon Rozman	79ec7c51ba	Fix UninstallFonts Makefile target Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-19 11:44:20 +02:00
Simon Rozman	33aa840e50	Update translations Signed-off-by: Simon Rozman <simon@rozman.si>	2019-06-19 10:22:58 +02:00
Simon Rozman	63ff924b76	Update font and database Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-15 11:43:43 +02:00
Simon Rozman	c790fff673	Remove auto-added translations from POT file POT files should not contain any translations at all. Transifex is picky. Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 19:40:54 +02:00
Simon Rozman	99283e806a	Preset version to 2.1.4. Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 19:35:49 +02:00
Simon Rozman	893dbf5783	Update year to 2019 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:50:04 +02:00
Simon Rozman	64e3735b12	Make character selection dialog non-modal This allows direct focusing in (de)compose text control even when the character selection dialog is open. Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:49:56 +02:00
Simon Rozman	c598fe4fe0	Invert order of translations and (de)composition Example: This allows a to be translated into ά, as a is first translated to α and finally ZRCola composed into ά. Otherwise we'd need to include all accented character translations in transliteration tables. Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:49:49 +02:00
Simon Rozman	4393b02323	Fix decomposition Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:49:41 +02:00
Simon Rozman	0dba3d4652	Update sub-module Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:49:33 +02:00
Simon Rozman	c9231078a6	Preset version to 2.1.3 Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:49:24 +02:00
Simon Rozman	d98987ec5f	Upgrade to latest WinStd library Signed-off-by: Simon Rozman <simon@rozman.si>	2019-04-01 14:48:40 +02:00
Simon Rozman	4900202d7e	Trigger per-user setup on logon	2019-04-01 14:48:31 +02:00
Simon Rozman	a3c73e1c4d	Preset version to 2.1.2	2018-11-19 12:07:10 +01:00
Simon Rozman	a8436ee3d7	Silence the missing shcore.dll warning on Windows 7	2018-11-06 09:33:17 +01:00
Simon Rozman	c8ea746474	Preset version to 2.1.1	2018-11-06 09:24:50 +01:00
Simon Rozman	039dae11bc	Set version to 2.1	2018-10-09 14:00:02 +02:00
Simon Rozman	ce11c7f4d4	Do not restore placement and sizing when GUI changes	2018-09-25 13:45:06 +02:00
Simon Rozman	ea5049172d	Revise main window minimization/hiding/restoring	2018-09-25 12:04:02 +02:00
Simon Rozman	1feebdbbf8	Pre-set version to 2.1-beta7	2018-09-25 12:02:39 +02:00
Simon Rozman	39708ad4cb	Set m_taskBarIcon to NULL after deleted	2018-09-25 12:00:04 +02:00
Simon Rozman	e0e8401482	Update translations	2018-09-25 11:02:15 +02:00
Simon Rozman	a5099d7424	Add Cyrillic >> Latin translations back	2018-09-25 10:37:25 +02:00
Simon Rozman	c6d567edfd	Resolve warning popup when GetDpiForWindow() is not available	2018-09-19 12:59:03 +02:00
Simon Rozman	3d104d4292	Swap composed and decomposed letters on ZRCola (de)compose icon ...to match the natural order of the decomposed and composed panels in GUI.	2018-09-19 12:41:09 +02:00
Simon Rozman	07706db14e	Switch to Transifex project for localization	2018-09-19 12:15:40 +02:00
Simon Rozman	10e53e431a	Update translation templates	2018-09-19 09:10:34 +02:00
Simon Rozman	5e751eb23e	Make (de)composition a separate translation set	2018-09-18 11:23:30 +02:00
Simon Rozman	30b2eb270b	Update fonts	2018-09-17 15:06:41 +02:00
Simon Rozman	ed98e1d588	Update sub-module	2018-09-17 15:04:35 +02:00
Simon Rozman	6c3b84b448	Revert MSI URLs from HTTPS to HTTP Updater doesn't handle HTTPS. Yet.	2018-09-17 09:40:02 +02:00
Simon Rozman	2d04361318	Add missing Updater public key to ZRCola.exe resources	2018-09-17 09:06:10 +02:00
Simon Rozman	2d82904b13	Check HTTP status 200 before parsing the response	2018-09-17 09:02:04 +02:00
Simon Rozman	640421be60	Make list of settings pages wider	2018-09-13 13:10:39 +02:00
Simon Rozman	75941da5a7	Fix window placement on DPI changes	2018-09-12 16:11:02 +02:00
Simon Rozman	974d6bd827	Honor monitor layout and DPI changes when persisting window placement	2018-09-11 15:32:13 +02:00
Simon Rozman	16dc9aff96	Add high DPI support	2018-09-10 12:38:40 +02:00
Simon Rozman	18f36e7fde	Add missing translation sequence dialog name	2018-09-10 10:02:27 +02:00
Simon Rozman	5d0ea994d7	Update wxFormBuilder	2018-09-10 09:45:36 +02:00
Simon Rozman	e86847f364	Introduce preliminary ARM64 support	2018-09-10 09:41:50 +02:00
Simon Rozman	c295fcfc12	Update documentation	2018-09-08 01:37:01 +02:00
Simon Rozman	9f0c831fb5	Split Makefile into multiple reusable .mak files	2018-09-08 01:32:00 +02:00
Simon Rozman	ddae64ca6d	Extend copyright year	2018-09-07 23:57:59 +02:00
Simon Rozman	bc48240e0a	Upgrade to Visual Studio 2017 and wxWidgets 3.1.2 static	2018-09-07 23:41:58 +02:00
Simon Rozman	6a3fbc063c	Fix down-casting	2018-09-07 20:30:01 +02:00
Simon Rozman	3672c8e87e	Distinguish variables with same names ...to resolve C4457 warnings.	2018-09-07 20:17:35 +02:00
Simon Rozman	dcabe36369	Remove MFC dependency	2018-09-07 19:40:28 +02:00
Simon Rozman	4b59582568	Add missing #include <algorithm>	2018-09-07 19:37:22 +02:00
Simon Rozman	692a37651d	Fix printf() parameters	2018-09-07 19:36:42 +02:00
Simon Rozman	59d06ae3dc	Make explicit int to unsigned __int6 conversion	2018-09-07 19:36:10 +02:00
Simon Rozman	4226774e21	Silence ADO .h warnings	2018-09-07 19:34:56 +02:00
Simon Rozman	3831012af9	Distinguish variables with same names ...to resolve C4457 warnings.	2018-09-07 19:32:54 +02:00
Simon Rozman	073311be78	Simplify property sheet inclusion	2018-09-07 18:02:30 +02:00
Simon Rozman	6636bf4211	Fix intermediate/output folder creation on nmake register	2018-09-03 13:08:53 +02:00
Simon Rozman	7f0e2cca04	Switch to wxWidgets 3.1.1	2018-09-03 13:08:14 +02:00
Simon Rozman	3976831d98	Update sub-modules	2018-09-03 10:42:43 +02:00
Simon Rozman	a22bbcb407	Use local wxWidget DLLs	2018-09-03 10:32:04 +02:00
Simon Rozman	aafa984d7c	Fix output path for Updater operations	2018-09-03 10:31:52 +02:00
Simon Rozman	707f57d6ae	Update wxExtend sub-module	2018-09-01 06:49:29 +02:00
Simon Rozman	ef2d61cac1	Update sub-modules	2018-08-31 14:28:01 +02:00
Simon Rozman	7edf4f452e	Update submodules	2018-08-24 14:51:25 +02:00
Simon Rozman	a3c6313f57	Register en_US language in nmake register When "Language" setting is absent in registry, the initialization of wxWidget localization raises asserts.	2018-08-24 14:49:08 +02:00
Simon Rozman	ab319af0b8	Update Amebis URL	2018-07-05 09:28:41 +02:00
Simon Rozman	14de0cbd23	Use absolute devenv.com path	2018-06-01 13:34:29 +02:00
Simon Rozman	7bd5441c31	Update MSIBuild sub-module to latest version	2018-06-01 13:33:08 +02:00
Simon Rozman	8358d3bf35	Update sub-module	2017-12-22 13:08:41 +01:00
Simon Rozman	8f5cd8cae7	Extend copyright to 2017	2017-12-22 10:32:55 +01:00
Simon Rozman	d301b6feed	Document localization	2017-12-19 14:21:46 +01:00
Simon Rozman	cc4baa3214	Preset version to 2.1-beta6	2017-12-19 14:18:14 +01:00
Simon Rozman	61d3369631	Set version to 2.1-beta5	2017-12-19 12:23:28 +01:00
Simon Rozman	a40d021404	Update sub-modules	2017-12-19 12:10:38 +01:00
Simon Rozman	bb4331d6f6	Update wxWidgets to 3.0.3	2017-12-19 10:39:15 +01:00
Simon Rozman	9d8c7d87ed	Update documentation	2017-12-19 09:11:47 +01:00
Simon Rozman	c0da04dcf4	Update submodule	2017-12-19 09:10:53 +01:00
Simon Rozman	44f00f0c40	Update to new wxFormBuilder	2017-12-18 12:02:26 +01:00
Simon Rozman	48945e15d6	Increase transliteration selector width	2017-12-18 11:15:15 +01:00
Simon Rozman	d0e367b881	Add translitarations	2017-12-18 10:49:06 +01:00
Simon Rozman	72e8e4893e	Update font and database	2017-12-18 08:37:46 +01:00
Simon Rozman	5502206810	Update translations	2017-12-18 08:36:28 +01:00
Simon Rozman	35f6b33f54	Update sub-modules	2017-12-18 08:23:19 +01:00
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30u_net_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30u_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30u_xml_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30ud_net_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30ud_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxbase30ud_xml_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxmsw30u_adv_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxmsw30u_aui_vc100_x64.dll`
				`@@ -1 +0,0 @@`
				`System (64-bit) Folder\wxmsw30u_core_vc100_x64.dll`