Update wxWidgets to 3.0.3

# Conflicts:
#	ZRCola/zrcolacomppnl.cpp

.gitmodules

@@ -1,24 +1,18 @@
-[submodule "lib/wxExtend"]
-	path = lib/wxExtend
-	url = https://github.com/Amebis/wxExtend.git
 [submodule "lib/stdex"]
 	path = lib/stdex
 	url = https://github.com/Amebis/stdex.git
+[submodule "lib/WinStd"]
+	path = lib/WinStd
+	url = https://github.com/Amebis/WinStd.git
+[submodule "lib/wxExtend"]
+	path = lib/wxExtend
+	url = https://github.com/Amebis/wxExtend.git
 [submodule "MSI/MSIBuild"]
 	path = MSI/MSIBuild
 	url = https://github.com/Amebis/MSIBuild.git
 [submodule "MSI/MSICA"]
 	path = MSI/MSICA
 	url = https://github.com/Amebis/MSICA.git
-[submodule "lib/atlex"]
-	path = lib/atlex
-	url = https://github.com/Amebis/atlex.git
-[submodule "lib/MSICALib"]
-	path = lib/MSICALib
-	url = https://github.com/Amebis/MSICALib.git
-[submodule "lib/WinStd"]
-	path = lib/WinStd
-	url = https://github.com/Amebis/WinStd.git
 [submodule "Updater"]
 	path = Updater
 	url = https://github.com/Amebis/Updater.git

LOCALIZATION.md

@@ -0,0 +1,20 @@
+# 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/Microsoft_VC100_CRT_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxbase30u_net_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30u_net_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxbase30u_xml_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30u_xml_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30ud_net_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxbase30ud_xml_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxbase30ud_xml_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featUpdCheck
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30u_adv_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxmsw30u_adv_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxmsw30u_aui_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30u_aui_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30u_core_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxmsw30ud_adv_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30ud_aui_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/MSM/wxMSW_wxmsw30ud_core_vc100_x64.msmcfg

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,6 @@
 
 [splosno]
 jezik=0
-deli=featZRCola
+deli=featZRCola featUpdCheck
 
 [parametri]

MSI/ZRCola/Makefile

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #

Makefile

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -36,16 +36,6 @@ Clean ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Debug
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64   CFG=Debug
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Debug
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64   CFG=Debug
-	cd "$(MAKEDIR)"
 	devenv.com "ZRCola.sln"          /clean "Release|Win32"
 	devenv.com "ZRCola.sln"          /clean "Debug|Win32"
 	devenv.com "ZRCola.sln"          /clean "Release|x64"
@@ -60,15 +50,29 @@ Clean ::
 	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)\Setup\ZRColaEn32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
-	-if exist "$(OUTPUT_DIR)\catalog.xml"           del /f /q "$(OUTPUT_DIR)\catalog.xml"
+	-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
 
@@ -82,6 +86,7 @@ Setup \
 SetupDebug \
 Register \
 Unregister \
+Localization \
 PublishPre \
 Publish :: "MSI\MSIBuild\Version\Version.mak"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
@@ -104,12 +109,6 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
 PUBLISH_PACKAGE_URL=http://www.amebis.si/prenos/ZRCola/$(MSIBUILD_VERSION_STR)
 
-REDIST_EN_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi"
-REDIST_EN_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi"
-REDIST_SL_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi"
-REDIST_SL_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi"
-
-
 ######################################################################
 # Main targets
 ######################################################################
@@ -118,18 +117,54 @@ All :: \
 	Setup
 
 Setup :: \
-	"$(OUTPUT_DIR)\Setup" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi"
+#	"$(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)\Setup" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi"
+#	"$(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
+######################################################################
+
+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 :: \
+	PublishPre \
+	"$(PUBLISH_DIR)\catalog-0000.xml"
+
+
+######################################################################
+# Registration
+######################################################################
 
 Register :: \
 	RegisterSettings \
@@ -158,24 +193,26 @@ UnregisterSettings ::
 !ENDIF
 
 InstallFonts :: \
-	"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_It.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" \
-	"$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             /t REG_SZ /d "00_ZRCola_Re.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      /t REG_SZ /d "00_ZRCola_It.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        /t REG_SZ /d "00_ZRCola_Bd.ttf" $(REG_FLAGS) > NUL
-	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" /t REG_SZ /d "00_ZRCola_BI.ttf" $(REG_FLAGS) > NUL
+	"$(WINDIR)\Fonts\ZRCola_Re.otf" \
+	"$(WINDIR)\Fonts\ZRCola_It.otf" \
+	"$(WINDIR)\Fonts\ZRCola_Bd.otf" \
+	"$(WINDIR)\Fonts\ZRCola_BI.otf"
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola (TrueType)"             /t REG_SZ /d "ZRCola_Re.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Italic (TrueType)"      /t REG_SZ /d "ZRCola_It.otf" $(REG_FLAGS) > NUL
+	reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts"           /v "ZRCola Bold (TrueType)"        /t REG_SZ /d "ZRCola_Bd.otf" $(REG_FLAGS) > NUL
+	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::
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola (TrueType)"             $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Italic (TrueType)"      $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold (TrueType)"        $(REG_FLAGS) > NUL
-	-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "00 ZRCola Bold Italic (TrueType)" $(REG_FLAGS) > NUL
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_Re.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Re.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_It.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_It.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_Bd.ttf"
-	-if exist "$(WINDIR)\Fonts\00_ZRCola_BI.ttf" rd /s /q "$(WINDIR)\Fonts\00_ZRCola_BI.ttf"
+	-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"
 
 RegisterShortcuts :: \
 	"$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" \
@@ -184,21 +221,20 @@ RegisterShortcuts :: \
 UnregisterShortcuts ::
 	-if exist "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" rd /s /q "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola"
 
-PublishPre :: \
-	"$(PUBLISH_PACKAGE_DIR)" \
-	$(REDIST_EN_WIN32) \
-	$(REDIST_EN_X64) \
-	$(REDIST_SL_WIN32) \
-	$(REDIST_SL_X64) \
-	"$(PUBLISH_DIR)" \
-	"$(PUBLISH_DIR)\ZRColaInstallDe.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallEn.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallRu.exe" \
-	"$(PUBLISH_DIR)\ZRColaInstallSl.exe"
+######################################################################
+# Localization
+######################################################################
 
-Publish :: \
-	PublishPre \
-	"$(PUBLISH_DIR)\catalog-0000.xml"
+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"
 
 
 ######################################################################
@@ -207,14 +243,21 @@ Publish :: \
 
 "$(OUTPUT_DIR)" \
 "$(OUTPUT_DIR)\Keys" \
-"$(OUTPUT_DIR)\Setup" \
+"$(OUTPUT_DIR)\locale" \
+"$(OUTPUT_DIR)\locale\de_DE" \
+"$(OUTPUT_DIR)\locale\ru_RU" \
+"$(OUTPUT_DIR)\locale\sl_SI" \
 "$(PUBLISH_DIR)" \
 "$(PUBLISH_PACKAGE_DIR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
 	if not exist $@ md $@
 
 "$(OUTPUT_DIR)\Keys" \
-"$(OUTPUT_DIR)\Setup" : "$(OUTPUT_DIR)"
+"$(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)"
 
@@ -223,56 +266,16 @@ Publish :: \
 # File copy
 ######################################################################
 
-"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-$(REDIST_EN_WIN32) : "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
+"$(WINDIR)\Fonts\ZRCola_Re.otf" : "$(OUTPUT_DIR)\ZRCola_Re.otf"
 	copy /y $** $@ > NUL
 
-"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" : "$(OUTPUT_DIR)\ZRColaEn32D.3.msi"
+"$(WINDIR)\Fonts\ZRCola_It.otf" : "$(OUTPUT_DIR)\ZRCola_It.otf"
 	copy /y $** $@ > NUL
 
-"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-$(REDIST_EN_X64) : "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
+"$(WINDIR)\Fonts\ZRCola_Bd.otf" : "$(OUTPUT_DIR)\ZRCola_Bd.otf"
 	copy /y $** $@ > NUL
 
-"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" : "$(OUTPUT_DIR)\ZRColaEn64D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \
-$(REDIST_SL_WIN32) : "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaSl32D.msi" : "$(OUTPUT_DIR)\ZRColaSl32D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaSl64.msi" \
-$(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaSl64D.msi" : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(WINDIR)\Fonts\00_ZRCola_Re.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Re.ttf"
-	copy /y $** $@ > NUL
-
-"$(WINDIR)\Fonts\00_ZRCola_It.ttf" : "$(OUTPUT_DIR)\00_ZRCola_It.ttf"
-	copy /y $** $@ > NUL
-
-"$(WINDIR)\Fonts\00_ZRCola_Bd.ttf" : "$(OUTPUT_DIR)\00_ZRCola_Bd.ttf"
-	copy /y $** $@ > NUL
-
-"$(WINDIR)\Fonts\00_ZRCola_BI.ttf" : "$(OUTPUT_DIR)\00_ZRCola_BI.ttf"
-	copy /y $** $@ > NUL
-
-"$(PUBLISH_DIR)\ZRColaInstallDe.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallDe.exe"
-	copy /y $** $@ > NUL
-
-"$(PUBLISH_DIR)\ZRColaInstallEn.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallEn.exe"
-	copy /y $** $@ > NUL
-
-"$(PUBLISH_DIR)\ZRColaInstallRu.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallRu.exe"
-	copy /y $** $@ > NUL
-
-"$(PUBLISH_DIR)\ZRColaInstallSl.exe" : "$(OUTPUT_DIR)\Win32.Release\ZRColaInstallSl.exe"
+"$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
 	copy /y $** $@ > NUL
 
 
@@ -288,130 +291,177 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 # 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" \
-"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
+"$(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" \
-"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
+"$(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" \
-"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
+"$(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" \
-"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
+"$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" ::
 	devenv.com "ZRCola.sln" /build "Debug|x64"
 
-"$(OUTPUT_DIR)\Win32.Release\ZRColaInstallDe.exe" \
-"$(OUTPUT_DIR)\Win32.Release\ZRColaInstallEn.exe" \
-"$(OUTPUT_DIR)\Win32.Release\ZRColaInstallRu.exe" \
-"$(OUTPUT_DIR)\Win32.Release\ZRColaInstallSl.exe" ::
-	devenv.com "ZRColaUtils.sln" /build "Release|Win32"
+"$(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)\Win32.Debug\ZRColaInstallDe.exe" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRColaInstallEn.exe" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRColaInstallRu.exe" \
-"$(OUTPUT_DIR)\Win32.Debug\ZRColaInstallSl.exe" ::
-	devenv.com "ZRColaUtils.sln" /build "Debug|Win32"
+"$(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)\ZRColaEn32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
-	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
-	devenv.com "Updater\Updater.sln" /build "Release|Win32"
+"$(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)\ZRColaEn32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
-	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
-	devenv.com "Updater\Updater.sln" /build "Debug|Win32"
+"$(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)\ZRColaEn64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
-	devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
-	devenv.com "Updater\Updater.sln" /build "Release|x64"
+"$(OUTPUT_DIR)\ZRCola32.cab" \
+"$(OUTPUT_DIR)\ZRCola32.inf" \
+"$(OUTPUT_DIR)\ZRCola32.rpt" : "$(OUTPUT_DIR)\ZRCola32.ddf"
+	makecab.exe /F $**
 
-"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
-	devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
-	devenv.com "Updater\Updater.sln" /build "Debug|x64"
+"$(OUTPUT_DIR)\ZRCola32D.cab" \
+"$(OUTPUT_DIR)\ZRCola32D.inf" \
+"$(OUTPUT_DIR)\ZRCola32D.rpt" : "$(OUTPUT_DIR)\ZRCola32D.ddf"
+	makecab.exe /F $**
 
-"$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release
-	cd "$(MAKEDIR)"
+"$(OUTPUT_DIR)\ZRCola64.cab" \
+"$(OUTPUT_DIR)\ZRCola64.inf" \
+"$(OUTPUT_DIR)\ZRCola64.rpt" : "$(OUTPUT_DIR)\ZRCola64.ddf"
+	makecab.exe /F $**
 
-"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaEn64.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Debug
-	cd "$(MAKEDIR)"
+"$(OUTPUT_DIR)\ZRCola64D.cab" \
+"$(OUTPUT_DIR)\ZRCola64D.inf" \
+"$(OUTPUT_DIR)\ZRCola64D.rpt" : "$(OUTPUT_DIR)\ZRCola64D.ddf"
+	makecab.exe /F $**
 
 "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
 	if exist $@  del /f /q $@
 	output\$(PLAT).Release\UpdSignXML.exe $** $@
 
 "$(OUTPUT_DIR)\catalog.xml" : \
-	"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32.3.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64.3.msi"
+#	"$(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"
 	-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   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.3.msi"
-	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.3.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
+
+
+#LANG=de_DE
+#LANG_OUT=De
+#!INCLUDE "MSILocal.mak"
+
+LANG=en_US
+LANG_OUT=En
+!INCLUDE "MSILocal.mak"
+
+LANG=ru_RU
+LANG_OUT=Ru
+!INCLUDE "MSILocal.mak"
+
+LANG=sl_SI
+LANG_OUT=Sl
+!INCLUDE "MSILocal.mak"

README.md

@@ -1 +1,48 @@
-# ZRCola
+# ZRCola
+
+A Microsoft Windows application for composing texts using a wide range of Slavic (and general) letters from or beyond Unicode.
+
+## Project Website
+http://zrcola.zrc-sazu.si/en/
+
+## Binaries for Download
+https://www.amebis.si/prenos/ZRCola/
+
+## Building
+
+### Building Environment Requirements
+- Microsoft Windows Vista or later
+- Microsoft Visual Studio 2010 SP1
+- _sed.exe_ and _grep.exe_
+- Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
+- Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
+- wxWidgets 3.0 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
+
+### Digital Signing of Build Outputs
+In order to have the build process digitally sign output files, one should provide the following:
+
+1. A signing certificate installed in the current user's certificate store.
+2. The following variables in the environment:
+  - `ManifestCertificateThumbprint` - set the value to certificate's SHA1 thumbprint (hexadecimal, without spaces, i.e. `bc0d8da45f9eeefcbe4e334e1fc262804df88d7e`).
+  - `ManifestTimestampUrl`          - set the value to URL used to perform timestamp signature (i.e. `http://timestamp.verisign.com/scripts/timstamp.dll`). In order to perform timestamp signing successfully, the computer running the build should be online and able to access this URL.
+
+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.
+
+- `nmake Clean`	Delete all intermediate and output files.
+- `nmake Setup`	Build a release version of project and release MSI setup files.
+- `nmake SetupDebug`	Build a debug version of project and debug MSI setup files.
+- `nmake Register`	Build a debug version of project, install fonts (reboot required), and Start Menu shortcuts. For development purposes only!
+- `nmake Unregister`	Remove Start Menu shortcuts, and fonts. For development purposes only!
+
+The `/ls` flag can be appended to the commands above to reduce NMAKE's verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
+
+## 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 
+- Amebis, info@amebis.si

ZRCola.sln

@@ -5,11 +5,11 @@ 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\wxExtend.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
-		include\zrcola.h = include\zrcola.h
+		include\version.h = include\version.h
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\build\libZRCola.vcxproj", "{3C61929E-7289-4101-8D0A-DA22D6E1AEA8}"

ZRCola/MSIBuild/Makefile

@@ -1,5 +1,5 @@
 #
-#    Copyright 1991-2016 Amebis
+#    Copyright 1991-2017 Amebis
 #
 #    This file is part of ZRCola.
 #
@@ -19,6 +19,10 @@
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
 
+!IFNDEF MSIBUILD_LANGID
+!ERROR Parameter MSIBUILD_LANGID is undefined.
+!ENDIF
+
 MSIBUILD_IS_LOCALIZEABLE=1
 
 
@@ -37,6 +41,36 @@ OLDZRCOLADIR	clZRCola.exe.$(PLAT)
 <<NOKEEP
 
 
+######################################################################
+# Binary
+
+All :: \
+	"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" \
+	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp"
+
+"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Name	Data
+s$(MSIBUILD_LENGTH_ID)	v0
+Binary	Name
+bintutorial1.bmp	tutorial1.bmp
+bintutorial2.bmp	tutorial2.bmp
+bintutorial3.bmp	tutorial3.bmp
+<<NOKEEP
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial1.bmp" : "Binary\tutorial1.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial2.bmp" : "Binary\tutorial2.bmp"
+	copy /y $** $@ > NUL
+
+"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp" : "Binary\tutorial3.bmp"
+	copy /y $** $@ > NUL
+
+
 ######################################################################
 # CompLocator
 
@@ -74,18 +108,110 @@ compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		file
 !IF "$(PLAT)" == "x64"
 compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
 !ENDIF
-!IF "$(LANG)" == "Sl"
+!IF "$(LANG)" == "ru_RU"
+compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
+!ENDIF
+!IF "$(LANG)" == "sl_SI"
 compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 !ENDIF
 <<NOKEEP
 
 
+######################################################################
+# Control
+
+All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt"
+
+"en_US.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
+s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
+1252	Control	Dialog_	Control
+dlgTutorial1	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial1	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Starting	ctlScreenshot	
+dlgTutorial1	ctlScreenshot	Bitmap	154	60	92	54	5		bintutorial1.bmp	ctlText1	
+dlgTutorial1	ctlText1	Text	15	119	370	24	196611		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.	ctlText2	
+dlgTutorial1	ctlText2	Text	15	148	370	36	196611		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!	ctlContinue	
+dlgTutorial1	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial2	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial2	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Composition	ctlScreenshot	
+dlgTutorial2	ctlScreenshot	Bitmap	81	60	238	137	5		bintutorial2.bmp	ctlText1	
+dlgTutorial2	ctlText1	Text	15	202	370	36	196611		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.	ctlContinue	
+dlgTutorial2	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+dlgTutorial3	ctlBannerBitmap	Bitmap	0	0	400	45	1		binUIHeader.bmp	ctlTitle	
+dlgTutorial3	ctlTitle	Text	15	15	320	15	196611		[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters	ctlScreenshot	
+dlgTutorial3	ctlScreenshot	Bitmap	147	60	106	112	5		bintutorial3.bmp	ctlText1	
+dlgTutorial3	ctlText1	Text	15	177	370	24	196611		Characters can be entered using keyboard shortcuts, the character catalogue (F4) or the character finding tool (F8).	ctlContinue	
+dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
+<<NOKEEP
+
+!IF "$(LANG)" == "en_US"
+"en_US.$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx"
+	copy /y $** $@ > NUL
+!ELSE
+"$(LANG).$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(LANG).po"
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
+!ENDIF
+
+
+######################################################################
+# ControlEvent
+
+All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog_	Control_	Event	Argument	Condition	Ordering
+s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
+ControlEvent	Dialog_	Control_	Event	Argument	Condition
+dlgTutorial1	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial2	ctlContinue	EndDialog	Return	1	1000
+dlgTutorial3	ctlContinue	EndDialog	Return	1	1000
+<<NOKEEP
+
+
+######################################################################
+# Dialog
+
+All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).Dialog-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
+s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
+Dialog	Dialog
+dlgTutorial1	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial2	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+dlgTutorial3	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTitle	ctlContinue	ctlContinue
+<<NOKEEP
+
+
+######################################################################
+# InstallUISequence
+
+All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt"
+
+"$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+	-if exist $@ del /f /q $@
+	move /y << $@ > NUL
+Action	Condition	Sequence
+s$(MSIBUILD_LENGTH_ID)	S255	I2
+InstallUISequence	Action
+dlgTutorial1	NOT Installed AND &featZRCola>=3	1400
+dlgTutorial2	NOT Installed AND &featZRCola>=3	1401
+dlgTutorial3	NOT Installed AND &featZRCola>=3	1402
+<<NOKEEP
+
+
 ######################################################################
 # Feature
 
 All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt"
 
-"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+"en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
@@ -94,17 +220,13 @@ s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	L64	L255	I2	i2	S$(MSIBUILD_LENGTH_
 featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\de_DE.po"
-	rcxgettext.exe idtp $@ $**
-
-"En.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx"
+!IF "$(LANG)" == "en_US"
+"en_US.$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx"
 	copy /y $** $@ > NUL
-
-"It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po"
-	rcxgettext.exe idtp $@ $**
-
-"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po"
-	rcxgettext.exe idtp $@ $**
+!ELSE
+"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po"
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
+!ENDIF
 
 
 ######################################################################
@@ -127,14 +249,14 @@ featZRCola	compLocalizationRepositoryPath
 featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
-featZRCola	comp00_ZRCola_Re.ttf
-!IF "$(LANG)" == "Sl"
-featZRCola	compZRCola.mo.sl_SI
-featZRCola	compZRCola.zrcdb.mo.sl_SI
-featZRCola	complibZRColaUI.mo.sl_SI
-featZRCola	compwxExtend.mo.sl_SI
-featZRCola	compUpdater.mo.sl_SI
-featZRCola	compwxstd.mo.sl_SI
+featZRCola	compZRCola_Re.otf
+!IF "$(LANG)" != "en_US"
+featZRCola	compZRCola.mo.$(LANG)
+featZRCola	compZRCola.zrcdb.mo.$(LANG)
+featZRCola	complibZRColaUI.mo.$(LANG)
+featZRCola	compwxExtend.mo.$(LANG)
+featZRCola	compUpdater.mo.$(LANG)
+featZRCola	compwxstd.mo.$(LANG)
 !ENDIF
 <<NOKEEP
 
@@ -151,8 +273,8 @@ 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
 fileZRCola.exe.$(PLAT)	compZRCola.exe.$(PLAT)	ZRCola.exe	0		0	1536	1
-!IF "$(LANG)" == "Sl"
-fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		1060	0	1
+!IF "$(LANG)" != "en_US"
+fileZRCola.mo.$(LANG)	compZRCola.mo.$(LANG)	ZRCola.mo	0		$(MSIBUILD_LANGID)	0	1
 !ENDIF
 <<NOKEEP
 
@@ -197,7 +319,7 @@ rmfiZRCola	compZRCola.exe.$(PLAT)		ZRColaShortcutDir	2
 
 All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt"
 
-"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+"en_US.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Shortcut	Directory_	Name	Component_	Target	Arguments	Description	Hotkey	Icon_	IconIndex	ShowCmd	WkDir
@@ -206,17 +328,13 @@ s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l128	s$(MSIBUILD_LENGTH_ID)	s$(MSI
 shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input system for linguistic use		iconZRCola.ico			ZRCOLABINDIR
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\de_DE.po"
-	rcxgettext.exe idtp $@ $**
-
-"En.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx"
+!IF "$(LANG)" == "en_US"
+"en_US.$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx"
 	copy /y $** $@ > NUL
-
-"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po"
-	rcxgettext.exe idtp $@ $**
-
-"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po"
-	rcxgettext.exe idtp $@ $**
+!ELSE
+"$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(LANG).po"
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
+!ENDIF
 
 
 ######################################################################

ZRCola/ZRCola.vcxproj

@@ -115,7 +115,10 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\lib\wxExtend\build\wxExtend.vcxproj">
+    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\lib\wxExtend\build\wxExtendDll.vcxproj">
       <Project>{a3a36689-ac35-4026-93da-a3ba0c0e767c}</Project>
     </ProjectReference>
     <ProjectReference Include="..\Updater\Updater\build\Updater.vcxproj">

ZRCola/locale/de_DE.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:53+0200\n"
-"PO-Revision-Date: 2016-06-02 20:53+0200\n"
+"POT-Creation-Date: 2016-10-18 10:10+0200\n"
+"PO-Revision-Date: 2016-10-18 10:10+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.8\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -20,57 +20,74 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
-#, fuzzy
+#: 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
+#: 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:."
+msgstr "ZRCola"
 
-#: zrcolachrreq.cpp:49 zrcolagui.cpp:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
 #, fuzzy
 msgid "Character"
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
 #, fuzzy
 msgid "Context"
 msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:363
 msgid "Request a New Character"
 msgstr ""
 
-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+msgid "▸ Search Options"
+msgstr ""
+
+# Recitation separator
+#: zrcolachrslct.cpp:164
+#, fuzzy
+msgid ", "
+msgstr ", "
+
+#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+msgid "▾ Search Options"
+msgstr ""
+
+#: zrcolafrm.cpp:141
 msgid ""
 "ZRCola keyboard shortcut Win+F5 could not be registered. Some functionality "
 "will not be available."
 msgstr ""
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 #, fuzzy
 msgid "Warning"
 msgstr "Warnung: "
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
 msgstr ""
 
 #: zrcolafrm.cpp:351
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/de/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/de/info/instructions/"
 
 #: zrcolafrm.cpp:375
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 
 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -204,6 +221,10 @@ msgstr ""
 msgid "Check online for product update"
 msgstr ""
 
+#: zrcolagui.cpp:162
+msgid "&About..."
+msgstr ""
+
 #: zrcolagui.cpp:165
 #, fuzzy
 msgid "&Help"
@@ -287,233 +308,260 @@ msgstr ""
 msgid "Composed Unicode Dump"
 msgstr ""
 
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr ""
+
+#: zrcolagui.cpp:389
+#, fuzzy
+msgid "Show &All"
+msgstr "Alles zeigen"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr ""
+
+#: zrcolagui.cpp:430
 #, fuzzy
 msgid "&Browse"
 msgstr "Durchsuchen"
 
-#: zrcolagui.cpp:428
+#: zrcolagui.cpp:437
 msgid ""
 "Full or partial terms from Unicode character description (in English) to "
 "search for"
 msgstr ""
 
-#: zrcolagui.cpp:434
+#: zrcolagui.cpp:441
+msgid "Search Options"
+msgstr ""
+
+#: zrcolagui.cpp:442
+msgid "Shows/hides additional search options"
+msgstr ""
+
+#: zrcolagui.cpp:454
 msgid "List of Unicode character categories to search in"
 msgstr ""
 
-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 #, fuzzy
 msgid "All"
 msgstr "Alle"
 
-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 msgid "Select all categories"
 msgstr ""
 
-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 #, fuzzy
 msgid "None"
 msgstr "Kein"
 
-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 #, fuzzy
 msgid "Clear category selection"
 msgstr "Auswahl kopieren"
 
-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 msgid "Invert"
 msgstr ""
 
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 #, fuzzy
 msgid "Invert category selection"
 msgstr "Auswahl einfügen"
 
-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 #, fuzzy
 msgid "Character search results"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 msgid "Re&cently Used"
 msgstr ""
 
-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 msgid "List of recently inserted characters"
 msgstr ""
 
-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 #, fuzzy
 msgid "Preview"
 msgstr " Vorschau"
 
-#: zrcolagui.cpp:542
-#, fuzzy
+#: zrcolagui.cpp:568
 msgid "U+"
-msgstr "Hilfeverzeichnis %u nicht gefunden."
+msgstr "U+"
 
-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
 msgstr ""
 
-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 msgid "Keyboard shortcut in Composer window"
 msgstr ""
 
-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 #, fuzzy
 msgid "Character preview"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 msgid "Unicode character description"
 msgstr ""
 
-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
+#, fuzzy
+msgid "Character tags"
+msgstr "Eingabe eines Zeichenstils"
+
+#: zrcolagui.cpp:628
 msgid "Unicode character category"
 msgstr ""
 
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:635
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"
 
-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:637
 msgid "To previously viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:641
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"
 
-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:643
 msgid "To following viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:654
 msgid "Re&lated"
 msgstr ""
 
-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:681
 msgid "List of related characters"
 msgstr ""
 
-#: zrcolagui.cpp:737
+#: 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:741
+#: zrcolagui.cpp:774
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""
 
-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:777
 msgid "&Manually select the language from the list below:"
 msgstr ""
 
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:789
 msgid "Text Language"
 msgstr ""
 
-#: zrcolagui.cpp:761
+#: 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."
 msgstr ""
 
-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:798
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:805
 msgid "Startup"
 msgstr ""
 
-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:885
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
-"Development and maintenance (2004-2015): dr. Peter Weiss"
+"Translation into English: Janoš Ježovnik\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:859
+#: zrcolagui.cpp:893
 msgid "zrcola.zrc-sazu.si"
 msgstr ""
 
-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"Texts made using ZRCola have to include in a footnote or some other "
+"appropriate part of the publication the note below:"
 msgstr ""
 
-#: zrcolagui.cpp:869
+#: 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 Dr. Peter Weiss."
+"(http://www.zrc-sazu.si) by Peter Weiss."
 msgstr ""
 
-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:944
 #, fuzzy
 msgid "Log"
 msgstr "&Log"
 
-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:960
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
 
-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:962
 msgid "Exit this program and launch product update"
 msgstr ""
 
-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:966
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"
 
-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:967
 #, fuzzy
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1006
 msgid "Enter the &character you would like to request:"
 msgstr ""
 
-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1013
 msgid "Decomposed character to request"
 msgstr ""
 
-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1017
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
 "it from the Decomposed window."
 msgstr ""
 
-#: zrcolagui.cpp:993
+#: zrcolagui.cpp:1027
 msgid ""
-"The &context, examples or short description why and where the character is "
+"The &context, examples or description why and where the character is "
 "required:"
 msgstr ""
 
-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1033
 msgid "Additional notes for character request"
 msgstr ""
 
-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1040
 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 "
-"we'll encode the necessarry information so the Editor will be able to read "
-"it correctly."
+"the Editor will be able to read them correctly anyway."
 msgstr ""
 
 #: zrcolakeyhndlr.cpp:44
@@ -532,35 +580,142 @@ msgid ""
 "Are you sure?"
 msgstr ""
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:334
 msgid "Product Update"
 msgstr ""
 
-#: zrcolagui.h:240
+#: zrcolagui.h:246
 #, fuzzy
 msgid "Character Search"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.h:277
+#: zrcolagui.h:283
 msgid "Settings"
 msgstr ""
 
-#: zrcolagui.h:303
+#: zrcolagui.h:309
 msgid "About ZRCola"
 msgstr ""
 
-# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
-#, fuzzy
-msgid "1252"
-msgstr "1252"
+#: 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.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+#: 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."
+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!"
+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."
+
+#: 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."
+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)."
+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"
 msgstr ""

ZRCola/locale/sl_SI.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-02 20:52+0200\n"
-"PO-Revision-Date: 2016-06-02 20:52+0200\n"
+"POT-Creation-Date: 2016-10-18 10:08+0200\n"
+"PO-Revision-Date: 2016-10-18 10:09+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.8\n"
+"X-Generator: Poedit 1.8.10\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"
@@ -21,27 +21,44 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:841 zrcolagui.h:104
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+#: 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
+#: 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:970
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
 msgid "Character"
 msgstr "Znak"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:991
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
 msgid "Context"
 msgstr "Kontekst"
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:357
+#: zrcolachrreq.cpp:64 zrcolagui.h:363
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: zrcolafrm.cpp:111
+#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
+msgid "▸ Search Options"
+msgstr "▸ Možnosti iskanja"
+
+# Recitation separator
+#: zrcolachrslct.cpp:164
+msgid ", "
+msgstr ", "
+
+#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
+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."
@@ -49,11 +66,11 @@ msgstr ""
 "ZRColine bližnjice na tipkovnici Win+F5 ni mogoče registrirati. Nekaj "
 "funkcionalnosti ne bo na voljo."
 
-#: zrcolafrm.cpp:111 zrcolafrm.cpp:113
+#: zrcolafrm.cpp:141 zrcolafrm.cpp:143
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: zrcolafrm.cpp:113
+#: zrcolafrm.cpp:143
 msgid ""
 "ZRCola keyboard shortcut Win+F6 could not be registered. Some functionality "
 "will not be available."
@@ -62,16 +79,16 @@ msgstr ""
 "funkcionalnosti ne bo na voljo."
 
 #: zrcolafrm.cpp:351
-msgid "http://zrcola-2.amebis.si/en/info/instructions/"
-msgstr "http://zrcola-2.amebis.si/info/instructions/"
+msgid "http://zrcola.zrc-sazu.si/en/info/instructions/"
+msgstr "http://zrcola.zrc-sazu.si/info/instructions/"
 
 #: zrcolafrm.cpp:375
 msgid ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 msgstr ""
-"http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-"
-"Tipkovnica_2009-06-21.pdf"
+"http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/"
+"ZRCola_tipkovnica_Jun2016.pdf"
 
 #: zrcolagui.cpp:36
 msgid "E&xit"
@@ -187,16 +204,20 @@ msgstr "&Zahtevaj nov znak ..."
 
 #: zrcolagui.cpp:152
 msgid "Submit a request to ZRC to add a new character"
-msgstr "Oddaj prošnjo ZRC-u za dodajanje novega znaka"
+msgstr "Oddaj prošnjo za dodajanje novega znaka"
 
 #: zrcolagui.cpp:156
 msgid "Check for &Updates..."
-msgstr "Preveri za &posodobitev ..."
+msgstr "Preveri &posodobitve ..."
 
 #: zrcolagui.cpp:156
 msgid "Check online for product update"
 msgstr "Preveri na spletu za posodobitev izdelka"
 
+#: zrcolagui.cpp:162
+msgid "&About..."
+msgstr "O progr&amu ..."
+
 #: zrcolagui.cpp:165
 msgid "&Help"
 msgstr "Po&moč"
@@ -251,7 +272,7 @@ msgstr "Katalog znakov"
 
 #: zrcolagui.cpp:195
 msgid "(De)Composer"
-msgstr "Raz/Sestavljalnik"
+msgstr "Razstavljalnik/Sestavljalnik"
 
 #: zrcolagui.cpp:234
 msgid "Decomposed Text"
@@ -269,252 +290,278 @@ msgstr "Sestavljeno besedilo"
 msgid "Composed Unicode Dump"
 msgstr "Unicode sestavljenega"
 
-#: zrcolagui.cpp:421
+#: zrcolagui.cpp:355
+msgid "Select category to display"
+msgstr "Izberi kategorijo za prikaz"
+
+#: zrcolagui.cpp:389
+msgid "Show &All"
+msgstr "Prik&aži vse"
+
+#: zrcolagui.cpp:390
+msgid "Toggle display of less frequent characters"
+msgstr "Prikaži/skrij manj pogoste znake"
+
+#: zrcolagui.cpp:430
 msgid "&Browse"
 msgstr "Pre&brskaj"
 
-#: zrcolagui.cpp:428
+#: 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:434
+#: zrcolagui.cpp:441
+msgid "Search Options"
+msgstr "Možnosti iskanja"
+
+#: zrcolagui.cpp:442
+msgid "Shows/hides additional search options"
+msgstr "Prikaže/skrije dodatne možnosti iskanja"
+
+#: zrcolagui.cpp:454
 msgid "List of Unicode character categories to search in"
 msgstr "Seznam kategorij znaka Unicode za iskanje"
 
-#: zrcolagui.cpp:441
+#: zrcolagui.cpp:461
 msgid "All"
 msgstr "Vse"
 
-#: zrcolagui.cpp:442
+#: zrcolagui.cpp:462
 msgid "Select all categories"
 msgstr "Izberi vse kategorije"
 
-#: zrcolagui.cpp:446
+#: zrcolagui.cpp:466
 msgid "None"
 msgstr "Nič"
 
-#: zrcolagui.cpp:447
+#: zrcolagui.cpp:467
 msgid "Clear category selection"
 msgstr "Počisti izbor kategorij"
 
-#: zrcolagui.cpp:451
+#: zrcolagui.cpp:471
 msgid "Invert"
 msgstr "Obrni"
 
-#: zrcolagui.cpp:452
+#: zrcolagui.cpp:472
 msgid "Invert category selection"
 msgstr "Obrni izbor kategorij"
 
-#: zrcolagui.cpp:485
+#: zrcolagui.cpp:511
 msgid "Character search results"
 msgstr "Rezultati iskanja znakov"
 
-#: zrcolagui.cpp:495
+#: zrcolagui.cpp:521
 msgid "Re&cently Used"
 msgstr "Nedavno &uporabljeni"
 
-#: zrcolagui.cpp:523
+#: zrcolagui.cpp:549
 msgid "List of recently inserted characters"
 msgstr "Seznam nedavno vstavljenih znakov"
 
-#: zrcolagui.cpp:537
+#: zrcolagui.cpp:563
 msgid "Preview"
 msgstr "Predogled"
 
-#: zrcolagui.cpp:542
+#: zrcolagui.cpp:568
 msgid "U+"
 msgstr "U+"
 
-#: zrcolagui.cpp:547
+#: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
 msgstr "Šestnajstiška koda Unicode"
 
-#: zrcolagui.cpp:552
+#: zrcolagui.cpp:578
 msgid "Keyboard shortcut in Composer window"
 msgstr "Bližnjica na tipkovnici v oknu sestavljalnika"
 
-#: zrcolagui.cpp:587
+#: zrcolagui.cpp:613
 msgid "Character preview"
 msgstr "Predogled znaka"
 
-#: zrcolagui.cpp:592
+#: zrcolagui.cpp:618
 msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
-#: zrcolagui.cpp:597
+#: zrcolagui.cpp:623
+msgid "Character tags"
+msgstr "Oznake znaka"
+
+#: zrcolagui.cpp:628
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: zrcolagui.cpp:604
+#: zrcolagui.cpp:635
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: zrcolagui.cpp:606
+#: zrcolagui.cpp:637
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: zrcolagui.cpp:610
+#: zrcolagui.cpp:641
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: zrcolagui.cpp:612
+#: zrcolagui.cpp:643
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: zrcolagui.cpp:623
+#: zrcolagui.cpp:654
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: zrcolagui.cpp:650
+#: zrcolagui.cpp:681
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: zrcolagui.cpp:737
+#: 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 ""
 "Nekateri znaki iz posameznih jezikov, s katerimi delate, se ne smejo "
-"razstaviti v dele.\n"
+"razstavljati.\n"
 "Za optimalno razstavljanje izberite pravilni jezik."
 
-#: zrcolagui.cpp:741
+#: zrcolagui.cpp:774
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: zrcolagui.cpp:744
+#: zrcolagui.cpp:777
 msgid "&Manually select the language from the list below:"
-msgstr "Ročno izberi jezik na spodnje&m spisku:"
+msgstr "&Ročno izberi jezik s seznama spodaj:"
 
-#: zrcolagui.cpp:756
+#: zrcolagui.cpp:789
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: zrcolagui.cpp:761
+#: 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."
 msgstr ""
 "ZRCola se lahko zažene ob vsaki prijavi v vaš računalnik.\n"
-"Na voljo bo na vrstici za sistemska obvestila ter preko registriranih "
+"Na voljo bo v vrstici za sistemska obvestila ter preko registriranih "
 "bližnjic Win+F5 in Win+F6."
 
-#: zrcolagui.cpp:765
+#: zrcolagui.cpp:798
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:805
 msgid "Startup"
 msgstr "Zagon"
 
-#: zrcolagui.cpp:851
+#: zrcolagui.cpp:885
 msgid ""
 "Program and Website Editor: Janoš Ježovnik\n"
 "Development: Amebis, d. o. o., Kamnik\n"
-"Development and maintenance (2004-2015): dr. Peter Weiss"
+"Translation into English: Janoš Ježovnik\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"
 "Razvoj: Amebis, d. o. o., Kamnik\n"
-"Razvoj in vzdrževanje (2004-2015): dr. Peter Weiss"
+"Prevod v angleški jezik: Janoš Ježovnik\n"
+"Prevod v ruski jezik: Domen Krvina, Silvo Torkar, Anastasija Plotnikova\n"
+"Razvoj in vzdrževanje prvotnega programa (2004–2015): Peter Weiss"
 
-#: zrcolagui.cpp:859
+#: zrcolagui.cpp:893
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: zrcolagui.cpp:865
+#: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"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 kolofonu, predgovoru, v "
-"opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim "
-"zapisom:"
+"Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem "
+"ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
-#: zrcolagui.cpp:869
+#: 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 Dr. Peter Weiss."
+"(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 dr. Peter Weiss."
+"(http://www.zrc-sazu.si) razvil Peter Weiss."
 
-#: zrcolagui.cpp:910
+#: zrcolagui.cpp:944
 msgid "Log"
 msgstr "Dnevnik"
 
-#: zrcolagui.cpp:926
+#: zrcolagui.cpp:960
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: zrcolagui.cpp:928
+#: zrcolagui.cpp:962
 msgid "Exit this program and launch product update"
-msgstr "Zaustavi ta program in zaženi posodobitev izdelka"
+msgstr "Zaustavi program in zaženi posodobitev izdelka"
 
-#: zrcolagui.cpp:932
+#: zrcolagui.cpp:966
 msgid "&Close"
 msgstr "&Zapri"
 
-#: zrcolagui.cpp:933
+#: zrcolagui.cpp:967
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: zrcolagui.cpp:972
+#: zrcolagui.cpp:1006
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: zrcolagui.cpp:979
+#: zrcolagui.cpp:1013
 msgid "Decomposed character to request"
-msgstr "Razstavljen znak, ki ga zahtevate"
+msgstr "Zahtevani znak v razstavljeni obliki"
 
 # Please use a double && for final "&" character
-#: zrcolagui.cpp:983
+#: zrcolagui.cpp:1017
 msgid ""
 "Please, use the decomposed form.\n"
 "You can use ZRCola keyboard shortcuts to enter the character or Copy&&Paste "
 "it from the Decomposed window."
 msgstr ""
 "Uporabite razstavljeno obliko.\n"
-"Za vnos znaka lahko uporavite ZRColine bližnjice na tipkovnici ali 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:993
+#: zrcolagui.cpp:1027
 msgid ""
-"The &context, examples or short description why and where the character is "
+"The &context, examples or description why and where the character is "
 "required:"
-msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"
+msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
 
-#: zrcolagui.cpp:999
+#: zrcolagui.cpp:1033
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: zrcolagui.cpp:1006
+#: zrcolagui.cpp:1040
 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 "
-"we'll encode the necessarry information so the Editor will be able to read "
-"it correctly."
+"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 novi znak uredniku ZRCole.\n"
-"Vaš e-poštni program mogoče ne bo prikazal vseh znakov pravilno, toda mi "
-"bomo vse potrebne podatke ustrezno kodirali, da jih bo urednik lahko "
-"pravilno prebral."
+"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."
 
 #: 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 ""
-"Pritisnjena tipka INS. Zdaj vtpikajte kodo Unicode želenega znaka (do štiri "
-"šestnajstiške števke: 0-9, A-F), nato izpustite INS."
+"Pritisnili ste tipko INS. Vtipkajte kodo Unicode želenega znaka (do štiri "
+"šestnajstiške števke: 0–9, A–F), nato izpustite INS."
 
 #: zrcolasettings.cpp:93
 msgid "Start ZRCola automatically on logon"
@@ -525,302 +572,153 @@ msgid ""
 "This program will now close and the upgrade will be launched.\n"
 "Are you sure?"
 msgstr ""
-"Ta program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
-"Ali ste prepričani?"
+"Program se bo zdaj zaprl in zagnala se bo posodobitev.\n"
+"Ali ste prepričani, da želite nadaljevati?"
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:328
+#: zrcolaupdater.cpp:94 zrcolagui.h:334
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: zrcolagui.h:240
+#: zrcolagui.h:246
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: zrcolagui.h:277
+#: zrcolagui.h:283
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: zrcolagui.h:303
+#: zrcolagui.h:309
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
-msgid "1252"
-msgstr "1250"
+#: 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.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
+#: 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."
+
+#: 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!"
+
+#: 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."
+
+#: 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)."
+
+#: 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 "Auto Start"
-#~ msgstr "Samodejni zagon"
-
-#~ msgid "Select %s language for decomposition"
-#~ msgstr "Izberi jezik %s za razstavljanje"
-
-#~ msgid "&Start on Logon"
-#~ msgstr "Z&aženi ob prijavi"
-
-#, fuzzy
-#~ msgid "Start this program automatically on logon"
-#~ msgstr "Samodejno zaženi ZRColo ob prijavi"
-
-#~ msgid "Set language according to keyboard layout automatically"
-#~ msgstr "Samodejno nastavi jezik glede na izbrano tipkovnico"
-
-#~ msgid "&Unicode"
-#~ msgstr "&Unicode"
-
-#~ msgid "Esc"
-#~ msgstr "Esc"
-
-#~ msgid "F1"
-#~ msgstr "F1"
-
-#~ msgid "F2"
-#~ msgstr "F2"
-
-#~ msgid "F3"
-#~ msgstr "F3"
-
-#~ msgid "F4"
-#~ msgstr "F4"
-
-#~ msgid "F5"
-#~ msgstr "F5"
-
-#~ msgid "F6"
-#~ msgstr "F6"
-
-#~ msgid "F7"
-#~ msgstr "F7"
-
-#~ msgid "F8"
-#~ msgstr "F8"
-
-#~ msgid "F9"
-#~ msgstr "F9"
-
-#~ msgid "F10"
-#~ msgstr "F10"
-
-#~ msgid "F11"
-#~ msgstr "F11"
-
-#~ msgid "F12"
-#~ msgstr "F12"
-
-#~ msgid "Print Screen"
-#~ msgstr "Print Screen"
-
-#~ msgid "Scroll Lock"
-#~ msgstr "Scroll Lock"
-
-#~ msgid "Pause"
-#~ msgstr "Pause"
-
-#~ msgid "Backspace"
-#~ msgstr "Backspace"
-
-#~ msgid "Tab"
-#~ msgstr "Tab"
-
-#~ msgid "Caps Lock"
-#~ msgstr "Caps Lock"
-
-#~ msgid "Return"
-#~ msgstr "Return"
-
-#~ msgid "Space"
-#~ msgstr "preslednica"
-
-#~ msgid "Shift"
-#~ msgstr "Shift"
-
-#, fuzzy
-#~ msgid "Alt"
-#~ msgstr "Vse"
-
-#~ msgid "Ctrl"
-#~ msgstr "Ctrl"
-
-#~ msgid "Menu"
-#~ msgstr "Menu"
-
-#~ msgid "Insert"
-#~ msgstr "Insert"
-
-#~ msgid "Delete"
-#~ msgstr "Delete"
-
-#~ msgid "Page Up"
-#~ msgstr "Page Up"
-
-#~ msgid "Page Down"
-#~ msgstr "Page Down"
-
-#~ msgid "Home"
-#~ msgstr "Home"
-
-#~ msgid "End"
-#~ msgstr "End"
-
-#~ msgid "Left"
-#~ msgstr "Left"
-
-#~ msgid "Up"
-#~ msgstr "Up"
-
-#~ msgid "Right"
-#~ msgstr "Right"
-
-#~ msgid "Down"
-#~ msgstr "Down"
-
-#~ msgid "Num Lock"
-#~ msgstr "Num Lock"
-
-#~ msgid "`"
-#~ msgstr "`"
-
-#~ msgid "-"
-#~ msgstr "-"
-
-#~ msgid "["
-#~ msgstr "["
-
-#~ msgid "]"
-#~ msgstr "]"
-
-#~ msgid ":"
-#~ msgstr ":"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "\\"
-#~ msgstr "\\"
-
-#~ msgid ","
-#~ msgstr ","
-
-#~ msgid "."
-#~ msgstr "."
-
-#~ msgid "/"
-#~ msgstr "/"
-
-#~ msgid "INS"
-#~ msgstr "INS"
-
-#, fuzzy
-#~ msgid "Character &Groups"
-#~ msgstr "Znak"
-
-#, fuzzy
-#~ msgid "Language:"
-#~ msgstr "Jezik besedila"
-
-#~ msgid "&About"
-#~ msgstr "O progr&amu"
-
-#~ msgid "Cuts selected text and puts it on the clipboard"
-#~ msgstr "Izreže izbrano besedilo in ga shrani na odložišče"
-
-#~ msgid "Copies selected text to the clipboard"
-#~ msgstr "Kopira izbrano besedilo na odložišče"
-
-#~ msgid "Inserts text from the clipboard"
-#~ msgstr "Vstavi besedilo z odložišča"
-
-#, fuzzy
-#~ msgid "&Copy"
-#~ msgstr "Kopiraj"
-
-#, fuzzy
-#~ msgid "&Paste"
-#~ msgstr "Prilepi"
-
-#~ msgid "&File"
-#~ msgstr "&Datoteka"
-
-#, fuzzy
-#~ msgid "Send Decomposed (F6)"
-#~ msgstr "Pošlji razstavljeno"
-
-#, fuzzy
-#~ msgid "Send Composed (F5)"
-#~ msgstr "Pošlji sestavljeno"
-
-#, fuzzy
-#~ msgid ""
-#~ "ZRCola keyboard shortcut Win+Shift+Z 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."
-
-#, fuzzy
-#~ msgid "Authentication progress real time monitor"
-#~ msgstr "Nadzira postopek overovljanja v realnem času"
-
-#~ msgid "Grave\t&7"
-#~ msgstr "Krativec\t&7"
-
-#~ msgid "Acute\t&9"
-#~ msgstr "Ostrivec\t&9"
-
-#~ msgid "Circumflex\t&3"
-#~ msgstr "Cirkumfleks\t&3"
-
-#~ msgid "Inverted &breve"
-#~ msgstr "O&brnjen polkrog"
-
-#~ msgid "&Accents"
-#~ msgstr "N&aglasi"
-
-#~ msgid ""
-#~ "There is already an auto hidden bar on this edge.\n"
-#~ "Only one auto hidden bar is allowed on each edge.\n"
-#~ "Auto-hide feature is now off."
-#~ msgstr ""
-#~ "Ob tem robu je že samodejno skrita pasica.\n"
-#~ "Na vsakem robu je lahko samo ena samodejno skrita pasica.\n"
-#~ "Samodejno skrivanje je zdaj izklopljeno."
-
-#~ msgid "Hello World"
-#~ msgstr "Zdravo svet"
-
-#~ msgid "&Hello...\tCtrl+H"
-#~ msgstr "&Pozdrav ...\tCtrl+H"
-
-#~ msgid "Help string shown in status bar for this menu item"
-#~ msgstr "Niz s pomočjo prikazan v statusni vrstici za to točko menija"
-
-#~ msgid "This is a wxWidgets' Hello world sample"
-#~ msgstr "To je primer Zdravo svet v wxWidgets"
-
-#~ msgid "About Hello World"
-#~ msgstr "O Zdravo svet"
-
-#~ msgid "Hello world from wxWidgets!"
-#~ msgstr "Zdravo svet iz wxWidgets!"
-
-#~ msgid "Welcome to wxWidgets!"
-#~ msgstr "Dobrodošli v wxWidgets!"
-
-#~ msgid "Character Selector"
-#~ msgstr "Izbirnik znaka"
-
-#~ msgid "Display character selector to select character to insert into text"
-#~ msgstr "Prikaži izbirnik znaka za izbor znaka za vstavljanje v besedilo"
-
-#~ msgid "C&haracter Selector..."
-#~ msgstr "Izbirnik &znaka ..."

ZRCola/res/desktop.ini

@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Pictures

ZRCola/stdafx.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 

ZRCola/stdafx.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../include/zrcola.h"
+#include "../include/version.h"
 #include "zrcolaabout.h"
 #include "zrcolaapp.h"
 #include "zrcolachrcatpnl.h"

ZRCola/zrcolaabout.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -26,7 +26,7 @@
 
 wxZRColaAbout::wxZRColaAbout(wxWindow* parent) : wxZRColaAboutBase(parent)
 {
-    m_staticTextVersion->SetLabelText(wxT(ZRCOLA_VERSION_STR));
+    m_staticTextVersion->SetLabelText(wxT(PRODUCT_VERSION_STR));
 
-    m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(ZRCOLA_BUILD_YEAR_STR)));
+    m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(PRODUCT_BUILD_YEAR_STR)));
 }

ZRCola/zrcolaabout.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 

ZRCola/zrcolaapp.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -32,9 +32,7 @@ wxIMPLEMENT_APP(ZRColaApp);
 
 ZRColaApp::ZRColaApp() :
     m_mainWnd(NULL),
-#ifdef __WXMSW__
-    m_running(NULL),
-#endif
+    m_lang_ui(wxLANGUAGE_DEFAULT),
     wxApp()
 {
 }
@@ -46,25 +44,21 @@ bool ZRColaApp::OnInit()
     // To compensate migration to non-advertised shortcut, do the Microsoft Installer's feature completeness check manually.
     // If execution got this far in the first place (EXE and dependent DLLs are present and loadable).
     // Furthermore, this increments program usage counter.
-    if (::MsiQueryFeatureState(_T(ZRCOLA_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN)
-        ::MsiUseFeature(_T(ZRCOLA_VERSION_GUID), _T("featZRCola"));
+    if (::MsiQueryFeatureState(_T(PRODUCT_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN)
+        ::MsiUseFeature(_T(PRODUCT_VERSION_GUID), _T("featZRCola"));
 #endif
 
-    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR)));
+    // Initialize configuration.
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR)));
     if (cfgPrev) wxDELETE(cfgPrev);
 
     if (!wxApp::OnInit())
         return false;
 
-    // Set desired locale.
-    wxLanguage language = (wxLanguage)wxConfigBase::Get()->Read(wxT("Language"), wxLANGUAGE_DEFAULT);
-    if (wxLocale::IsAvailable(language)) {
-        wxString sPath;
-        if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
-            m_locale.AddCatalogLookupPathPrefix(sPath);
-        wxVERIFY(m_locale.Init(language));
+    // Initialize locale.
+    if (wxInitializeLocale(m_locale, &m_lang_ui)) {
         wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
-        wxVERIFY(m_locale.AddCatalog(wxT("Updater") wxT(wxUpdaterVersion)));
+        wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola")));
         wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));
         wxVERIFY(m_locale.AddCatalog(wxT("ZRCola")));
         wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb")));
@@ -72,8 +66,7 @@ bool ZRColaApp::OnInit()
 
 #ifdef __WXMSW__
     // Create global event.
-    m_running = ::CreateEvent(NULL, FALSE, FALSE, _T(ZRCOLA_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}"));
-    wxASSERT(m_running);
+    m_running.attach(::CreateEvent(NULL, FALSE, FALSE, _T(PRODUCT_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}")));
     if (::GetLastError() == ERROR_ALREADY_EXISTS) {
         // ZRCola is already running. Find its window.
         HWND okno = ::FindWindow(_T("wxWindowNR"), _("ZRCola"));
@@ -107,49 +100,49 @@ bool ZRColaApp::OnInit()
                             has_translation_data = true;
                         } else {
                             wxFAIL_MSG(wxT("Error reading translation data from ZRCola.zrcdb."));
-                            m_t_db.idxComp  .clear();
-                            m_t_db.idxDecomp.clear();
-                            m_t_db.data     .clear();
+                            m_t_db.clear();
                         }
                     } else if (id == ZRCola::langchar_rec::id) {
                         dat >> ZRCola::langchar_rec(m_lc_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading language character data from ZRCola.zrcdb."));
-                            m_lc_db.idxChr.clear();
-#ifdef ZRCOLA_LANGCHAR_LANG_IDX
-                            m_lc_db.idxLng.clear();
-#endif
-                            m_lc_db.data  .clear();
+                            m_lc_db.clear();
                         }
                     } else if (id == ZRCola::language_rec::id) {
                         dat >> ZRCola::language_rec(m_lang_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading language character data from ZRCola.zrcdb."));
-                            m_lang_db.idxLng.clear();
-                            m_lang_db.data  .clear();
+                            m_lang_db.clear();
                         }
                     } else if (id == ZRCola::keyseq_rec::id) {
                         dat >> ZRCola::keyseq_rec(m_ks_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading key sequences data from ZRCola.zrcdb."));
-                            m_ks_db.idxChr.clear();
-                            m_ks_db.idxKey.clear();
-                            m_ks_db.data  .clear();
+                            m_ks_db.clear();
                         }
                     } else if (id == ZRCola::character_rec::id) {
                         dat >> ZRCola::character_rec(m_chr_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading character data from ZRCola.zrcdb."));
-                            m_chr_db.idxChr.clear();
-                            m_chr_db.data  .clear();
+                            m_chr_db.clear();
                         }
                     } else if (id == ZRCola::chrcat_rec::id) {
                         dat >> ZRCola::chrcat_rec(m_cc_db);
                         if (!dat.good()) {
                             wxFAIL_MSG(wxT("Error reading character category data from ZRCola.zrcdb."));
-                            m_cc_db.idxChrCat.clear();
-                            m_cc_db.idxRnk   .clear();
-                            m_cc_db.data     .clear();
+                            m_cc_db.clear();
+                        }
+                    } else if (id == ZRCola::chrtag_rec::id) {
+                        dat >> ZRCola::chrtag_rec(m_ct_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading character tag data from ZRCola.zrcdb."));
+                            m_ct_db.clear();
+                        }
+                    } else if (id == ZRCola::tagname_rec::id) {
+                        dat >> ZRCola::tagname_rec(m_tn_db);
+                        if (!dat.good()) {
+                            wxFAIL_MSG(wxT("Error reading tag name data from ZRCola.zrcdb."));
+                            m_tn_db.clear();
                         }
                     } else
                         stdex::idrec::ignore<ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat);
@@ -180,10 +173,7 @@ int ZRColaApp::OnExit()
     int res = wxApp::OnExit();
 
 #ifdef __WXMSW__
-    if (m_running) {
-        wxVERIFY(::CloseHandle(m_running));
-        m_running = NULL;
-    }
+    m_running.free();
 #endif
 
     return res;

ZRCola/zrcolaapp.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -26,12 +26,14 @@ class ZRColaApp;
 #pragma once
 
 #include "zrcolafrm.h"
+#include <WinStd/Win.h>
 #include <wx/app.h>
 #include <wx/config.h>
 #include <wx/intl.h>
 #include <zrcola/character.h>
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
+#include <zrcola/tag.h>
 #include <zrcolaui/keyboard.h>
 
 
@@ -76,14 +78,17 @@ public:
     ZRCola::keyseq_db m_ks_db;      ///< Key sequence database
     ZRCola::character_db m_chr_db;  ///< Character database
     ZRCola::chrcat_db m_cc_db;      ///< Characted category database
+    ZRCola::chrtag_db m_ct_db;      ///< Character tag database
+    ZRCola::tagname_db m_tn_db;     ///< Tag name database
 
     wxZRColaFrame *m_mainWnd;       ///< Main window
 
     wxLocale m_locale;              ///< Current locale
+    wxLanguage m_lang_ui;           ///< Translation language (language of User Interface, wxLANGUAGE_DEFAULT = English)
 
 protected:
 #ifdef __WXMSW__
-    HANDLE m_running;               ///< Global Win32 event to determine if another instance of ZRCola is already running
+    winstd::win_handle m_running;   ///< Global Win32 event to determine if another instance of ZRCola is already running
 #endif
 };
 

ZRCola/zrcolachrcatpnl.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -31,7 +31,7 @@ END_EVENT_TABLE()
 
 wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) : wxZRColaCharacterCatalogPanelBase(parent)
 {
-    std::fstream dat((LPCTSTR)((ZRColaApp*)wxTheApp)->GetDatabaseFilePath(), std::ios_base::in | std::ios_base::binary);
+    std::fstream dat((LPCTSTR)dynamic_cast<ZRColaApp*>(wxTheApp)->GetDatabaseFilePath(), std::ios_base::in | std::ios_base::binary);
     if (dat.good()) {
         if (stdex::idrec::find<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dat, ZRCOLA_DB_ID, sizeof(ZRCola::recordid_t))) {
             ZRCola::recordsize_t size;
@@ -64,10 +64,7 @@ wxZRColaCharacterCatalogPanel::wxZRColaCharacterCatalogPanel(wxWindow* parent) :
         m_cg_id = m_cg_db.idxRnk[0].id;
         m_choice->Select(0);
 
-        // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
-        wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, m_grid->GetId());
-        e.SetInt(0);
-        OnChoice(e);
+        Update();
     }
 
     // Register frame specific hotkey(s).
@@ -86,13 +83,12 @@ wxZRColaCharacterCatalogPanel::~wxZRColaCharacterCatalogPanel()
 
 void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
 {
-    ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[event.GetSelection()];
 
-    m_cg_id = cg.id;
-    m_grid->SetCharacters(wxString(cg.data + cg.name_len, cg.char_len));
-
-    // As size of the grid might have changed, relayout the panel.
-    Layout();
+    if (m_cg_id != cg.id) {
+        m_cg_id = cg.id;
+        Update();
+    }
 
     event.Skip();
 }
@@ -100,7 +96,7 @@ void wxZRColaCharacterCatalogPanel::OnChoice(wxCommandEvent& event)
 
 void wxZRColaCharacterCatalogPanel::OnGridClick(wxGridEvent& event)
 {
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     if (app->m_mainWnd) {
         app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(event.GetRow(), event.GetCol()));
         app->m_mainWnd->m_panel->m_decomposed->SetFocus();
@@ -115,7 +111,7 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
     switch (event.GetKeyCode()) {
     case WXK_RETURN:
     case WXK_NUMPAD_ENTER:
-        ZRColaApp *app = (ZRColaApp*)wxTheApp;
+        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
         if (app->m_mainWnd) {
             app->m_mainWnd->m_panel->m_decomposed->WriteText(m_grid->GetCellValue(m_grid->GetCursorRow(), m_grid->GetCursorColumn()));
             app->m_mainWnd->m_panel->m_decomposed->SetFocus();
@@ -129,9 +125,19 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
 }
 
 
+void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
+{
+    UNREFERENCED_PARAMETER(event);
+
+    Update();
+
+    event.Skip();
+}
+
+
 void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
 {
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     if (app->m_mainWnd) {
         app->m_mainWnd->m_panel->m_decomposed->SetFocus();
 
@@ -143,6 +149,33 @@ void wxZRColaCharacterCatalogPanel::OnFocusDecomposed(wxCommandEvent& event)
 }
 
 
+void wxZRColaCharacterCatalogPanel::Update()
+{
+    const ZRCola::chrgrp_db::chrgrp &cg = m_cg_db.idxRnk[m_choice->GetSelection()];
+
+    if (m_show_all->GetValue()) {
+        m_grid->SetCharacters(
+            wxString(cg.get_chars(), cg.char_len),
+            wxArrayShort((const short*)cg.get_char_shown(), (const short*)cg.get_char_shown() + (cg.char_len + 15)/16));
+    } else {
+        // Select frequently used characters only.
+        const wchar_t *src = cg.get_chars();
+        const unsigned __int16 *shown = cg.get_char_shown();
+        wxString chars;
+        for (unsigned __int16 i = 0, j = 0; i < cg.char_len; j++) {
+            for (unsigned __int16 k = 0, mask = shown[j]; k < 16 && i < cg.char_len; k++, mask >>= 1, i++) {
+                if (mask & 1)
+                    chars += src[i];
+            }
+        }
+        m_grid->SetCharacters(chars);
+    }
+
+    // As size of the grid might have changed, relayout the panel.
+    Layout();
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentZRColaCharacterCatalogPanel
 //////////////////////////////////////////////////////////////////////////
@@ -160,15 +193,17 @@ wxString wxPersistentZRColaCharacterCatalogPanel::GetKind() const
 
 void wxPersistentZRColaCharacterCatalogPanel::Save() const
 {
-    const wxZRColaCharacterCatalogPanel * const wnd = static_cast<const wxZRColaCharacterCatalogPanel*>(GetWindow());
+    auto wnd = static_cast<const wxZRColaCharacterCatalogPanel*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("charGroup"), wnd->m_cg_id);
+    SaveValue(wxT("showAll"  ), wnd->m_show_all->GetValue());
 }
 
 
 bool wxPersistentZRColaCharacterCatalogPanel::Restore()
 {
-    wxZRColaCharacterCatalogPanel * const wnd = static_cast<wxZRColaCharacterCatalogPanel*>(GetWindow());
+    auto wnd = dynamic_cast<wxZRColaCharacterCatalogPanel*>(GetWindow());
+    bool update = false;
 
     // Restore selected character group.
     int cg_id;
@@ -176,18 +211,27 @@ bool wxPersistentZRColaCharacterCatalogPanel::Restore()
         for (size_t i = 0, n = wnd->m_cg_db.idxRnk.size(); i < n; i++) {
             const ZRCola::chrgrp_db::chrgrp &cg = wnd->m_cg_db.idxRnk[i];
             if (cg.id == cg_id) {
-                wnd->m_cg_id = cg.id;
-                wnd->m_choice->Select(i);
-
-                // Update grid by simulating wxEVT_COMMAND_CHOICE_SELECTED event.
-                wxCommandEvent e(wxEVT_COMMAND_CHOICE_SELECTED, wnd->m_grid->GetId());
-                e.SetInt(i);
-                wnd->OnChoice(e);
+                if (wnd->m_cg_id != cg.id) {
+                    wnd->m_cg_id = cg.id;
+                    wnd->m_choice->Select(i);
+                    update = true;
+                }
 
                 break;
             }
         }
     }
 
+    bool show_all;
+    if (RestoreValue(wxT("showAll"), &show_all)) {
+        if (wnd->m_show_all->GetValue() != show_all) {
+            wnd->m_show_all->SetValue(show_all);
+            update = true;
+        }
+    }
+
+    if (update)
+        wnd->Update();
+
     return true;
 }

ZRCola/zrcolachrcatpnl.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -50,9 +50,12 @@ protected:
     virtual void OnChoice(wxCommandEvent& event);
     virtual void OnGridClick(wxGridEvent& event);
     virtual void OnGridKeyDown(wxKeyEvent& event);
+    virtual void OnShowAll(wxCommandEvent& event);
     void OnFocusDecomposed(wxCommandEvent& event);
     DECLARE_EVENT_TABLE()
 
+    void Update();
+
 protected:
     ZRCola::chrgrp_db m_cg_db;      ///< Character group database
     int m_cg_id;                    ///< Selected character group ID

ZRCola/zrcolachrgrid.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -68,8 +68,22 @@ void wxZRColaCharGrid::Init()
 
 
 void wxZRColaCharGrid::SetCharacters(const wxString &chars)
+{
+    m_chars = chars;
+    m_relevance.Clear();
+    m_regenerate = true;
+
+    // Invoke OnSize(), which will populate the grid.
+    wxSizeEvent e(GetSize(), m_windowId);
+    e.SetEventObject(this);
+    HandleWindowEvent(e);
+}
+
+
+void wxZRColaCharGrid::SetCharacters(const wxString &chars, const wxArrayShort &relevance)
 {
     m_chars      = chars;
+    m_relevance  = relevance;
     m_regenerate = true;
 
     // Invoke OnSize(), which will populate the grid.
@@ -83,16 +97,13 @@ wxString wxZRColaCharGrid::GetToolTipText(int idx)
 {
     wxASSERT_MSG(idx < (int)m_chars.Length(), wxT("index out of bounds"));
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
     // See if this character has a key sequence registered.
-    ZRCola::keyseq_db::indexKey::size_type start;
-    bool found;
     char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
     ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_chars[idx];
-    found = app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start);
-
-    if (found) {
+    ZRCola::keyseq_db::indexKey::size_type start;
+    if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
         ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
         wxString ks_str;
         if (ZRCola::keyseq_db::GetSequenceAsText(seq.seq, seq.seq_len, ks_str))
@@ -137,6 +148,17 @@ void wxZRColaCharGrid::OnSize(wxSizeEvent& event)
             for (int c = 0; c < cols; c++, i++)
                 table->SetValue(r, c, i < (int)char_len ? wxString(1, m_chars[i]) : wxEmptyString);
         SetTable(table, true);
+        if (!m_relevance.IsEmpty()) {
+            const wxColour colour_def;
+            const wxColour colour_irr = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNHIGHLIGHT);
+            for (int r = 0, i = 0; r < rows; r++)
+                for (int c = 0; c < cols; c++, i++)
+                    SetCellBackgroundColour(r, c, i >= (int)char_len || ((unsigned short)(m_relevance[i/16]) & (1<<(i%16))) ? colour_def : colour_irr);
+        } else {
+            for (int r = 0, i = 0; r < rows; r++)
+                for (int c = 0; c < cols; c++, i++)
+                    SetAttr(r, c, NULL);
+        }
         m_regenerate = false;
     }
 

ZRCola/zrcolachrgrid.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -58,6 +58,14 @@ public:
     ///
     void SetCharacters(const wxString &chars);
 
+    ///
+    /// Sets new array of characters to display
+    ///
+    /// \param[in] chars      The string containing characters to display
+    /// \param[in] relevance  Bit-array of \p chars relevance (1=more relevant, 0=less relevant)
+    ///
+    void SetCharacters(const wxString &chars, const wxArrayShort &relevance);
+
     ///
     /// Returns displayed characters
     ///
@@ -91,14 +99,15 @@ protected:
     DECLARE_EVENT_TABLE()
 
 private:
-    void Init();            // common part of all ctors
+    void Init();                // common part of all ctors
 
 protected:
-    wxString m_chars;       ///< Array of Unicode characters to display in the grid
+    wxString m_chars;           ///< Array of Unicode characters to display in the grid
+    wxArrayShort m_relevance;   ///< Bit-array of `m_chars` relevance
 
 private:
-    bool m_regenerate;      ///< Force regenerate grid table
-    bool m_isResizing;      ///< Prevents nesting of OnSize() method.
-    wxTimer m_timerToolTip; ///< Timer for displaying tooltip
-    size_t m_toolTipIdx;    ///< Index of cell for tooltip display
+    bool m_regenerate;          ///< Force regenerate grid table
+    bool m_isResizing;          ///< Prevents nesting of OnSize() method.
+    wxTimer m_timerToolTip;     ///< Timer for displaying tooltip
+    size_t m_toolTipIdx;        ///< Index of cell for tooltip display
 };

ZRCola/zrcolachrreq.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -80,7 +80,7 @@ void wxPersistentZRColaCharRequest::Save() const
 {
     wxPersistentDialog::Save();
 
-    const wxZRColaCharRequest * const wnd = static_cast<const wxZRColaCharRequest*>(GetWindow());
+    auto wnd = static_cast<const wxZRColaCharRequest*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("character"), wnd->m_character->GetValue());
     SaveValue(wxT("context"), wnd->m_context->GetValue());
@@ -89,7 +89,7 @@ void wxPersistentZRColaCharRequest::Save() const
 
 bool wxPersistentZRColaCharRequest::Restore()
 {
-    wxZRColaCharRequest * const wnd = static_cast<wxZRColaCharRequest*>(GetWindow());
+    auto wnd = dynamic_cast<wxZRColaCharRequest*>(GetWindow());
 
     wxString str;
     if (RestoreValue(wxT("character"), &str))

ZRCola/zrcolachrreq.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 

ZRCola/zrcolachrslct.cpp

@@ -1,5 +1,5 @@
-/*
-    Copyright 2015-2016 Amebis
+/*
+    Copyright 2015-2017 Amebis
 
     This file is part of ZRCola.
 
@@ -34,14 +34,24 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
     m_searchThread(NULL),
     wxZRColaCharSelectBase(parent)
 {
+    // Set tag lookup locale.
+    wxLanguage language = dynamic_cast<ZRColaApp*>(wxTheApp)->m_lang_ui;
+         if (wxLANGUAGE_DEFAULT   == language ||
+             wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
+    else if (wxLANGUAGE_RUSSIAN   <= language && language <= wxLANGUAGE_RUSSIAN_UKRAINE ) m_locale = MAKELCID(MAKELANGID(LANG_RUSSIAN  , SUBLANG_DEFAULT), SORT_DEFAULT);
+    else if (wxLANGUAGE_SLOVENIAN == language                                           ) m_locale = MAKELCID(MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), SORT_DEFAULT);
+    else                                                                                  m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
+
     Connect(wxID_ANY, wxEVT_SEARCH_COMPLETE, wxThreadEventHandler(wxZRColaCharSelect::OnSearchComplete), NULL, this);
 
+    m_search_more->SetLabel(_(L"▸ Search Options"));
+
     m_unicode->SetValidator(wxHexValidator<wchar_t>(&m_char, wxNUM_VAL_DEFAULT, 4));
 
     // Fill categories.
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const ZRCola::chrcat_db::chrcat &cc = app->m_cc_db.idxRnk[i];
+        const auto &cc = app->m_cc_db.idxRnk[i];
         int idx = m_categories->Insert(wxGetTranslation(wxString(cc.name, cc.name_len), wxT("ZRCola-zrcdb")), i);
         m_categories->Check(idx);
         m_ccOrder.insert(std::make_pair(cc.id, idx));
@@ -72,7 +82,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
 
     if (m_unicodeChanged) {
         if (m_unicode->GetValidator()->TransferFromWindow()) {
-            ZRColaApp *app = (ZRColaApp*)wxTheApp;
+            auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
             m_gridPreview->SetCellValue(wxString(1, m_char), 0, 0);
 
@@ -80,14 +90,14 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
             ((ZRCola::character_db::character*)chr)->chr = m_char;
             size_t start;
             if (app->m_chr_db.idxChr.find(*(ZRCola::character_db::character*)chr, start)) {
-                const ZRCola::character_db::character &chr = app->m_chr_db.idxChr[start];
-                // Update characted description.
+                const auto &chr = app->m_chr_db.idxChr[start];
+                // Update character description.
                 m_description->SetValue(wxString(chr.data, chr.desc_len));
                 {
                     // See if this character has a key sequence registered.
-                    ZRCola::keyseq_db::indexKey::size_type start;
                     char ks[sizeof(ZRCola::keyseq_db::keyseq)] = {};
                     ((ZRCola::keyseq_db::keyseq*)ks)->chr = m_char;
+                    ZRCola::keyseq_db::indexKey::size_type start;
                     if (app->m_ks_db.idxChr.find(*(ZRCola::keyseq_db::keyseq*)ks, start)) {
                         ZRCola::keyseq_db::keyseq &seq = app->m_ks_db.idxChr[start];
                         wxString ks_str;
@@ -104,7 +114,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                     size_t start;
                     // Update character category.
                     if (app->m_cc_db.idxChrCat.find(*((ZRCola::chrcat_db::chrcat*)cc), start)) {
-                        const ZRCola::chrcat_db::chrcat &cat = app->m_cc_db.idxChrCat[start];
+                        const auto &cat = app->m_cc_db.idxChrCat[start];
                         m_category->SetValue(wxGetTranslation(wxString(cat.name, cat.name_len), wxT("ZRCola-zrcdb")));
                     } else
                         m_category->SetValue(wxEmptyString);
@@ -118,6 +128,45 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
                 m_gridRelated->ClearGrid();
             }
 
+            // Find character tags.
+            std::list<std::wstring> tag_names;
+            ZRCola::chrtag_db::chrtag ct = { m_char };
+            size_t end;
+            if (app->m_ct_db.idxChr.find(ct, start, end)) {
+                for (size_t i = start; i < end; i++) {
+                    const ZRCola::chrtag_db::chrtag &ct = app->m_ct_db.idxChr[i];
+
+                    // Find tag names.
+                    char tn[sizeof(ZRCola::tagname_db::tagname)] = {};
+                    ((ZRCola::tagname_db::tagname*)tn)->locale = m_locale;
+                    ((ZRCola::tagname_db::tagname*)tn)->tag    = ct.tag;
+                    size_t start, end;
+                    if (app->m_tn_db.idxTag.find(*((ZRCola::tagname_db::tagname*)tn), start, end)) {
+                        for (size_t i = start; i < end; i++) {
+                            const ZRCola::tagname_db::tagname &tn = app->m_tn_db.idxTag[i];
+
+                            // Add tag name to the list (prevent duplicates).
+                            for (auto name = tag_names.cbegin(), name_end = tag_names.cend();; ++name) {
+                                if (name == name_end) {
+                                    // Add name to the list.
+                                    tag_names.push_back(std::wstring(tn.name, tn.name + tn.name_len));
+                                    break;
+                                } else if (ZRCola::tagname_db::tagname::CompareName(m_locale, name->data(), (unsigned __int16)name->length(), tn.name, tn.name_len) == 0)
+                                    // Name is already on the list.
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+            wxString tags;
+            for (auto name = tag_names.cbegin(), name_end = tag_names.cend(); name != name_end; ++name) {
+                if (!tags.empty())
+                    tags += _(", ");
+                tags += *name;
+            }
+            m_tags->SetValue(tags);
+
             m_gridRelated->GoToCell(m_historyCursor->m_related.m_selected);
 
             wxGridCellCoords coord(m_gridResults->GetCharacterCoords(m_char));
@@ -135,7 +184,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
 
         wxString val(m_search->GetValue());
         if (!val.IsEmpty()) {
-            ZRColaApp *app = (ZRColaApp*)wxTheApp;
+            auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
             m_searchThread = new SearchThread(this);
 
@@ -143,7 +192,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
 
             // Select categories.
             for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-                const ZRCola::chrcat_db::chrcat &cc = app->m_cc_db.idxRnk[i];
+                const auto &cc = app->m_cc_db.idxRnk[i];
                 if (m_categories->IsChecked(i))
                     m_searchThread->m_cats.insert(cc.id);
             }
@@ -169,11 +218,27 @@ void wxZRColaCharSelect::OnSearchText(wxCommandEvent& event)
 }
 
 
+void wxZRColaCharSelect::OnSearchMore(wxHyperlinkEvent& event)
+{
+    event.StopPropagation();
+
+    if (m_search_panel->IsShown()) {
+        m_search_panel->Show(false);
+        m_search_more->SetLabel(_(L"▸ Search Options"));
+    } else {
+        m_search_panel->Show(true);
+        m_search_more->SetLabel(_(L"▾ Search Options"));
+    }
+
+    this->Layout();
+}
+
+
 void wxZRColaCharSelect::OnCategoriesAll(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
         m_categories->Check(i, true);
 
@@ -185,7 +250,7 @@ void wxZRColaCharSelect::OnCategoriesNone(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
         m_categories->Check(i, false);
 
@@ -197,7 +262,7 @@ void wxZRColaCharSelect::OnCategoriesInvert(wxHyperlinkEvent& event)
 {
     event.StopPropagation();
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++)
         m_categories->Check(i, !m_categories->IsChecked(i));
 
@@ -221,7 +286,7 @@ void wxZRColaCharSelect::OnSearchComplete(wxThreadEvent& event)
         // Display results.
         wxString chars;
         chars.reserve(m_searchThread->m_hits.size());
-        for (std::vector<std::pair<ZRCola::charrank_t, wchar_t> >::const_iterator i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
+        for (auto i = m_searchThread->m_hits.cbegin(), i_end = m_searchThread->m_hits.cend(); i != i_end; ++i)
             chars += i->second;
         m_gridResults->SetCharacters(chars);
 
@@ -390,13 +455,13 @@ void wxZRColaCharSelect::OnOKButtonClick(wxCommandEvent& event)
 void wxZRColaCharSelect::ResetResults()
 {
     // Fill the results.
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     size_t i, n = app->m_chr_db.idxChr.size();
     wxString val;
     val.reserve(n);
     for (i = 0; i < n; i++) {
-        const ZRCola::character_db::character &chr = app->m_chr_db.idxChr[i];
-        std::map<ZRCola::chrcatid_t, int>::const_iterator idx = m_ccOrder.find(chr.cat);
+        const auto &chr = app->m_chr_db.idxChr[i];
+        auto idx = m_ccOrder.find(chr.cat);
         if (idx == m_ccOrder.end() || m_categories->IsChecked(idx->second))
             val += chr.chr;
     }
@@ -432,7 +497,7 @@ void wxZRColaCharSelect::NavigateBy(int offset)
         }
 
         m_navigateBack->Enable(m_historyCursor != m_history.begin());
-        std::list<NavigationState>::iterator cursor_next(m_historyCursor);
+        auto cursor_next = m_historyCursor;
         ++cursor_next;
         m_navigateForward->Enable(cursor_next != m_history.end());
 
@@ -459,7 +524,7 @@ void wxZRColaCharSelect::NavigateTo(wchar_t c)
         m_historyCursor = m_history.insert(m_historyCursor, state);
 
         // Purge the history's tail.
-        std::list<NavigationState>::iterator cursor_next(m_historyCursor);
+        auto cursor_next = m_historyCursor;
         ++cursor_next;
         m_history.erase(cursor_next, m_history.end());
 
@@ -482,18 +547,25 @@ wxZRColaCharSelect::SearchThread::SearchThread(wxZRColaCharSelect *parent) :
 
 wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
 {
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     std::map<wchar_t, ZRCola::charrank_t> hits;
 
     if (TestDestroy()) return (wxThread::ExitCode)1;
 
     {
-        // Search by indexes and merge results.
+        // Search by tags: Get tags with given names. Then, get characters of found tags.
+        std::map<ZRCola::tagid_t, unsigned __int16> hits_tag;
+        if (!app->m_tn_db.Search(m_search.c_str(), m_parent->m_locale, hits_tag, TestDestroyS, this)) return (wxThread::ExitCode)1;
+        if (!app->m_ct_db.Search(hits_tag, app->m_chr_db, m_cats, hits, TestDestroyS, this)) return (wxThread::ExitCode)1;
+    }
+
+    {
+        // Search by description and merge results.
         std::map<wchar_t, ZRCola::charrank_t> hits_sub;
         if (!app->m_chr_db.Search(m_search.c_str(), m_cats, hits, hits_sub, TestDestroyS, this)) return (wxThread::ExitCode)1;
-        for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
+        for (auto i = hits_sub.cbegin(), i_end = hits_sub.cend(); i != i_end; ++i) {
             if (TestDestroy()) return (wxThread::ExitCode)1;
-            std::map<wchar_t, ZRCola::charrank_t>::iterator idx = hits.find(i->first);
+            auto idx = hits.find(i->first);
             if (idx == hits.end())
                 hits.insert(std::make_pair(i->first, i->second / 4));
             else
@@ -503,7 +575,7 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
 
     // Get best rank.
     ZRCola::charrank_t rank_ref = 0;
-    for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
+    for (auto i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
         if (TestDestroy()) return (wxThread::ExitCode)1;
         if (i->second > rank_ref)
             rank_ref = i->second;
@@ -512,7 +584,7 @@ wxThread::ExitCode wxZRColaCharSelect::SearchThread::Entry()
     // Now sort the characters by rank (taking only top 3/4 by rank).
     ZRCola::charrank_t rank_threshold = rank_ref*3/4;
     m_hits.reserve(hits.size());
-    for (std::map<wchar_t, ZRCola::charrank_t>::const_iterator i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
+    for (auto i = hits.cbegin(), i_end = hits.cend(); i != i_end; ++i) {
         if (TestDestroy()) return (wxThread::ExitCode)1;
         if (i->second > rank_threshold)
             m_hits.push_back(std::make_pair(i->second, i->first));
@@ -562,37 +634,51 @@ void wxPersistentZRColaCharSelect::Save() const
 {
     wxPersistentDialog::Save();
 
-    const wxZRColaCharSelect * const wnd = static_cast<const wxZRColaCharSelect*>(GetWindow());
+    auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
     SaveValue(wxT("recentChars"), wnd->m_gridRecent->GetCharacters());
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const ZRCola::chrcat_db::chrcat &cc = app->m_cc_db.idxRnk[i];
+        const auto &cc = app->m_cc_db.idxRnk[i];
         wxString name(wxT("category"));
         name.Append(cc.id.data, _countof(cc.id.data));
         SaveValue(name, wnd->m_categories->IsChecked(i));
     }
+
+    SaveValue(wxT("searchPanel"), wnd->m_search_panel->IsShown());
 }
 
 
 bool wxPersistentZRColaCharSelect::Restore()
 {
-    wxZRColaCharSelect * const wnd = static_cast<wxZRColaCharSelect*>(GetWindow());
+    auto wnd = dynamic_cast<wxZRColaCharSelect*>(GetWindow());
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
 
     wxString recent;
     if (RestoreValue(wxT("recentChars"), &recent))
         wnd->m_gridRecent->SetCharacters(recent);
 
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
     for (size_t i = 0, n = app->m_cc_db.idxRnk.size(); i < n; i++) {
-        const ZRCola::chrcat_db::chrcat &cc = app->m_cc_db.idxRnk[i];
+        const auto &cc = app->m_cc_db.idxRnk[i];
         wxString name(wxT("category"));
         name.Append(cc.id.data, _countof(cc.id.data));
         bool val;
         if (RestoreValue(name, &val))
             wnd->m_categories->Check(i, val);
     }
+
+    bool search_panel;
+    if (RestoreValue(wxT("searchPanel"), &search_panel)) {
+        if (search_panel) {
+            wnd->m_search_panel->Show(true);
+            wnd->m_search_more->SetLabel(_(L"▾ Search Options"));
+        } else {
+            wnd->m_search_panel->Show(false);
+            wnd->m_search_more->SetLabel(_(L"▸ Search Options"));
+        }
+    }
+
     wnd->ResetResults();
 
     return wxPersistentDialog::Restore();