Version set to 2.0-beta14

# Conflicts:
#	ZRCola/zrcolacomppnl.cpp

.gitmodules

@@ -1,24 +1,24 @@
-[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 "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/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 "Updater"]
 	path = Updater
 	url = https://github.com/Amebis/Updater.git

Makefile

@@ -36,24 +36,6 @@ Clean ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Debug
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64   CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64   CFG=Debug
-	$(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=Ru PLAT=Win32 CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=Win32 CFG=Debug
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=x64   CFG=Release
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru 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"
@@ -68,23 +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\ZRColaDe32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe32.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe64.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi"
-	-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\ZRColaRu32.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu32.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu64.msi"  del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu64.msi"
-	-if exist "$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaRu64D.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
 
@@ -98,6 +86,7 @@ Setup \
 SetupDebug \
 Register \
 Unregister \
+Localization \
 PublishPre \
 Publish :: "MSI\MSIBuild\Version\Version.mak"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
@@ -120,16 +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_DE_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaDe32.msi"
-REDIST_DE_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaDe64.msi"
-REDIST_EN_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaEn32.msi"
-REDIST_EN_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaEn64.msi"
-REDIST_RU_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaRu32.msi"
-REDIST_RU_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaRu64.msi"
-REDIST_SL_WIN32="$(PUBLISH_PACKAGE_DIR)\ZRColaSl32.msi"
-REDIST_SL_X64="$(PUBLISH_PACKAGE_DIR)\ZRColaSl64.msi"
-
-
 ######################################################################
 # Main targets
 ######################################################################
@@ -138,26 +117,54 @@ All :: \
 	Setup
 
 Setup :: \
-	"$(OUTPUT_DIR)\Setup" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaRu64.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\ZRColaDe32D.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" \
-	"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" \
-#	"$(OUTPUT_DIR)\Setup\ZRColaRu64D.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 \
@@ -214,25 +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_DE_WIN32) \
-#	$(REDIST_DE_X64) \
-	$(REDIST_EN_WIN32) \
-	$(REDIST_EN_X64) \
-#	$(REDIST_RU_WIN32) \
-#	$(REDIST_RU_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"
 
 
 ######################################################################
@@ -241,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)"
 
@@ -257,62 +266,6 @@ Publish :: \
 # File copy
 ######################################################################
 
-"$(OUTPUT_DIR)\Setup\ZRColaDe32.msi" \
-$(REDIST_DE_WIN32) : "$(OUTPUT_DIR)\ZRColaDe32.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaDe32D.msi" : "$(OUTPUT_DIR)\ZRColaDe32D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaDe64.msi" \
-$(REDIST_DE_X64) : "$(OUTPUT_DIR)\ZRColaDe64.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaDe64D.msi" : "$(OUTPUT_DIR)\ZRColaDe64D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" \
-$(REDIST_EN_WIN32) : "$(OUTPUT_DIR)\ZRColaEn32.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" : "$(OUTPUT_DIR)\ZRColaEn32D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" \
-$(REDIST_EN_X64) : "$(OUTPUT_DIR)\ZRColaEn64.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaEn64D.msi" : "$(OUTPUT_DIR)\ZRColaEn64D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \
-$(REDIST_RU_WIN32) : "$(OUTPUT_DIR)\ZRColaRu32.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" : "$(OUTPUT_DIR)\ZRColaRu32D.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \
-$(REDIST_RU_X64) : "$(OUTPUT_DIR)\ZRColaRu64.3.msi"
-	copy /y $** $@ > NUL
-
-"$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" : "$(OUTPUT_DIR)\ZRColaRu64D.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\ZRCola_Re.otf" : "$(OUTPUT_DIR)\ZRCola_Re.otf"
 	copy /y $** $@ > NUL
 
@@ -325,18 +278,6 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi"
 "$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
 	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"
-	copy /y $** $@ > NUL
-
 
 ######################################################################
 # Shortcut creation
@@ -350,194 +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)\ZRColaDe32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu32.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)\ZRColaDe32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu32D.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)\ZRColaDe64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu64.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)\ZRColaDe64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu64D.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)\ZRColaDe32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu32.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)\ZRColaDe32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu32D.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)\ZRColaDe64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu64.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)\ZRColaDe64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
-"$(OUTPUT_DIR)\ZRColaRu64D.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)\ZRColaDe32.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De 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)\ZRColaDe32D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=Win32 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaDe64.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaDe64D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(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)\ZRColaRu32.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Debug
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaRu64.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=x64 CFG=Release
-	cd "$(MAKEDIR)"
-
-"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" ::
-	cd "MSI\ZRCola"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru 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)\ZRColaDe32.3.msi" \
-#	"$(OUTPUT_DIR)\ZRColaDe64.3.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
-#	"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \
-#	"$(OUTPUT_DIR)\ZRColaRu64.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   de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe32.msi" -f "$(OUTPUT_DIR)\ZRColaDe32.3.msi"
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 de_DE "$(PUBLISH_PACKAGE_URL)/ZRColaDe64.msi" -f "$(OUTPUT_DIR)\ZRColaDe64.3.msi"
-	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   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.3.msi"
-#	output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.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

@@ -3,7 +3,7 @@
 A Microsoft Windows application for composing texts using a wide range of Slavic (and general) letters from or beyond Unicode.
 
 ## Project Website
-http://zrcola-2.amebis.si/en/ (Development version)
+http://zrcola.zrc-sazu.si/en/
 
 ## Binaries for Download
 https://www.amebis.si/prenos/ZRCola/

ZRCola.sln

@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\bu
 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

@@ -19,6 +19,10 @@
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
 
+!IFNDEF MSIBUILD_LANGID
+!ERROR Parameter MSIBUILD_LANGID is undefined.
+!ENDIF
+
 MSIBUILD_IS_LOCALIZEABLE=1
 
 
@@ -104,10 +108,10 @@ 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)" == "Ru"
+!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"
+!IF "$(LANG)" == "sl_SI"
 compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 !ENDIF
 <<NOKEEP
@@ -118,7 +122,7 @@ compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MS
 
 All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt"
 
-"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
+"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
@@ -142,20 +146,13 @@ dlgTutorial3	ctlText1	Text	15	177	370	24	196611		Characters can be entered using
 dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap	
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\de_DE.po"
-	rcxgettext.exe idtp $@ $**
-
-"En.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx"
+!IF "$(LANG)" == "en_US"
+"en_US.$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx"
 	copy /y $** $@ > NUL
-
-"It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po"
-	rcxgettext.exe idtp $@ $**
-
-"Ru.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\ru_RU.po"
-	rcxgettext.exe idtp $@ $**
-
-"Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po"
-	rcxgettext.exe idtp $@ $**
+!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
 
 
 ######################################################################
@@ -214,7 +211,7 @@ dlgTutorial3	NOT Installed	1402
 
 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
@@ -223,20 +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 $@ $**
-
-"Ru.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\ru_RU.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
 
 
 ######################################################################
@@ -260,21 +250,13 @@ featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
 featZRCola	compZRCola_Re.otf
-!IF "$(LANG)" == "Ru"
-featZRCola	compZRCola.mo.ru_RU
-featZRCola	compZRCola.zrcdb.mo.ru_RU
-featZRCola	complibZRColaUI.mo.ru_RU
-featZRCola	compwxExtend.mo.ru_RU
-featZRCola	compUpdater.mo.ru_RU
-featZRCola	compwxstd.mo.ru_RU
-!ENDIF
-!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
+!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
 
@@ -291,11 +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)" == "Ru"
-fileZRCola.mo.ru_RU	compZRCola.mo.ru_RU	ZRCola.mo	0		1060	0	1
-!ENDIF
-!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
 
@@ -340,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
@@ -349,20 +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 $@ $**
-
-"Ru.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\ru_RU.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.fbp

@@ -442,7 +442,7 @@
                         <property name="help"></property>
                         <property name="id">wxID_ABOUT</property>
                         <property name="kind">wxITEM_NORMAL</property>
-                        <property name="label"></property>
+                        <property name="label">&amp;About...</property>
                         <property name="name">m_menuHelpAbout</property>
                         <property name="permission">none</property>
                         <property name="shortcut"></property>
@@ -3887,6 +3887,97 @@
                                                 <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
+                                        <object class="sizeritem" expanded="0">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxALL|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxTextCtrl" expanded="0">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="maxlength"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_tags</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style">wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY</property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip">Character tags</property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
@@ -5444,7 +5535,7 @@
                                         <property name="label">ZRCola</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
+                                        <property name="maximum_size">400,-1</property>
                                         <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
                                         <property name="minimum_size"></property>
@@ -5607,7 +5698,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Program and Website Editor: Janoš Ježovnik&#x0A;Development: Amebis, d. o. o., Kamnik&#x0A;Development and maintenance (2004-2015): dr. Peter Weiss</property>
+                                        <property name="label">Program and Website Editor: Janoš Ježovnik&#x0A;Development: Amebis, d. o. o., Kamnik&#x0A;Translation into English: Janoš Ježovnik&#x0A;Translation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova&#x0A;Development and maintenance of the original program (2004–2015): Peter Weiss</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -5632,7 +5723,7 @@
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
-                                        <property name="wrap">-1</property>
+                                        <property name="wrap">400</property>
                                         <event name="OnChar"></event>
                                         <event name="OnEnterWindow"></event>
                                         <event name="OnEraseBackground"></event>
@@ -5870,7 +5961,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:</property>
+                                        <property name="label">Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>
@@ -5979,7 +6070,7 @@
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
                                         <property name="validator_variable"></property>
-                                        <property name="value">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.</property>
+                                        <property name="value">This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss.</property>
                                         <property name="window_extra_style"></property>
                                         <property name="window_name"></property>
                                         <property name="window_style"></property>
@@ -6807,7 +6898,7 @@
                                 <property name="gripper">0</property>
                                 <property name="hidden">0</property>
                                 <property name="id">wxID_ANY</property>
-                                <property name="label">The &amp;context, examples or short description why and where the character is required:</property>
+                                <property name="label">The &amp;context, examples or description why and where the character is required:</property>
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
@@ -6983,7 +7074,7 @@
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                        <property name="label">After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.&#x0A;Your e-mail application might not display all the characters correctly, but we&apos;ll encode the necessarry information so the Editor will be able to read it correctly.</property>
+                        <property name="label">After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.&#x0A;Your e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway.</property>
                         <property name="max_size"></property>
                         <property name="maximize_button">0</property>
                         <property name="maximum_size"></property>

ZRCola/ZRCola.vcxproj

@@ -115,6 +115,9 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
+    <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>

ZRCola/locale/de_DE.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-06-14 11:33+0200\n"
-"PO-Revision-Date: 2016-06-14 11:34+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,34 +20,43 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr ""
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 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:998
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
 #, fuzzy
 msgid "Character"
 msgstr "Eingabe eines Zeichenstils"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
 #, fuzzy
 msgid "Context"
 msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:362
+#: zrcolachrreq.cpp:64 zrcolagui.h:363
 msgid "Request a New Character"
 msgstr ""
 
-#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
 msgid "▸ Search Options"
 msgstr ""
 
-#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+# Recitation separator
+#: zrcolachrslct.cpp:164
+#, fuzzy
+msgid ", "
+msgstr ", "
+
+#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
 msgid "▾ Search Options"
 msgstr ""
 
@@ -69,16 +78,16 @@ msgid ""
 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"
@@ -212,6 +221,10 @@ msgstr ""
 msgid "Check online for product update"
 msgstr ""
 
+#: zrcolagui.cpp:162
+msgid "&About..."
+msgstr ""
+
 #: zrcolagui.cpp:165
 #, fuzzy
 msgid "&Help"
@@ -378,9 +391,8 @@ msgid "Preview"
 msgstr " Vorschau"
 
 #: zrcolagui.cpp:568
-#, fuzzy
 msgid "U+"
-msgstr "Hilfeverzeichnis %u nicht gefunden."
+msgstr "U+"
 
 #: zrcolagui.cpp:573
 msgid "Unicode hexadecimal code"
@@ -400,149 +412,156 @@ msgid "Unicode character description"
 msgstr ""
 
 #: zrcolagui.cpp:623
+#, fuzzy
+msgid "Character tags"
+msgstr "Eingabe eines Zeichenstils"
+
+#: zrcolagui.cpp:628
 msgid "Unicode character category"
 msgstr ""
 
-#: zrcolagui.cpp:630
+#: zrcolagui.cpp:635
 #, fuzzy
 msgid "« Back"
 msgstr "< &Zurück"
 
-#: zrcolagui.cpp:632
+#: zrcolagui.cpp:637
 msgid "To previously viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:636
+#: zrcolagui.cpp:641
 #, fuzzy
 msgid "Forward »"
 msgstr "&Vorwärts"
 
-#: zrcolagui.cpp:638
+#: zrcolagui.cpp:643
 msgid "To following viewed character"
 msgstr ""
 
-#: zrcolagui.cpp:649
+#: zrcolagui.cpp:654
 msgid "Re&lated"
 msgstr ""
 
-#: zrcolagui.cpp:676
+#: zrcolagui.cpp:681
 msgid "List of related characters"
 msgstr ""
 
-#: zrcolagui.cpp:765
+#: 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:769
+#: zrcolagui.cpp:774
 msgid "Select language &automatically according to selected keyboard"
 msgstr ""
 
-#: zrcolagui.cpp:772
+#: zrcolagui.cpp:777
 msgid "&Manually select the language from the list below:"
 msgstr ""
 
-#: zrcolagui.cpp:784
+#: zrcolagui.cpp:789
 msgid "Text Language"
 msgstr ""
 
-#: zrcolagui.cpp:789
+#: 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:793
+#: zrcolagui.cpp:798
 msgid "Start ZRCola &automatically on logon"
 msgstr ""
 
-#: zrcolagui.cpp:800
+#: zrcolagui.cpp:805
 msgid "Startup"
 msgstr ""
 
-#: zrcolagui.cpp:879
+#: 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"
-msgstr ""
-
-#: zrcolagui.cpp:887
-msgid "zrcola.zrc-sazu.si"
+"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:893
-msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+msgid "zrcola.zrc-sazu.si"
 msgstr ""
 
-#: zrcolagui.cpp:897
+#: zrcolagui.cpp:899
+msgid ""
+"Texts made using ZRCola have to include in a footnote or some other "
+"appropriate part of the publication the note below:"
+msgstr ""
+
+#: 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:938
+#: zrcolagui.cpp:944
 #, fuzzy
 msgid "Log"
 msgstr "&Log"
 
-#: zrcolagui.cpp:954
+#: zrcolagui.cpp:960
 #, fuzzy
 msgid "Quit and &Update..."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht aktualisieren."
 
-#: zrcolagui.cpp:956
+#: zrcolagui.cpp:962
 msgid "Exit this program and launch product update"
 msgstr ""
 
-#: zrcolagui.cpp:960
+#: zrcolagui.cpp:966
 #, fuzzy
 msgid "&Close"
 msgstr "&Schließen"
 
-#: zrcolagui.cpp:961
+#: zrcolagui.cpp:967
 #, fuzzy
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: zrcolagui.cpp:1000
+#: zrcolagui.cpp:1006
 msgid "Enter the &character you would like to request:"
 msgstr ""
 
-#: zrcolagui.cpp:1007
+#: zrcolagui.cpp:1013
 msgid "Decomposed character to request"
 msgstr ""
 
-#: zrcolagui.cpp:1011
+#: 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:1021
+#: 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:1027
+#: zrcolagui.cpp:1033
 msgid "Additional notes for character request"
 msgstr ""
 
-#: zrcolagui.cpp:1034
+#: 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
@@ -561,93 +580,65 @@ msgid ""
 "Are you sure?"
 msgstr ""
 
-#: zrcolaupdater.cpp:94 zrcolagui.h:333
+#: zrcolaupdater.cpp:94 zrcolagui.h:334
 msgid "Product Update"
 msgstr ""
 
-#: zrcolagui.h:245
+#: zrcolagui.h:246
 #, fuzzy
 msgid "Character Search"
 msgstr "Skupine &znakov"
 
-#: zrcolagui.h:282
+#: zrcolagui.h:283
 msgid "Settings"
 msgstr ""
 
-#: zrcolagui.h:308
+#: zrcolagui.h:309
 msgid "About ZRCola"
 msgstr ""
 
-#: MSIBuild/En.Win32.Release.Control-2.idtx:14
-#: MSIBuild/En.Win32.Release.Control-2.idtx:19
-#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Release.Control-2.idtx:14
-#: MSIBuild/En.x64.Release.Control-2.idtx:19
-#: MSIBuild/En.x64.Release.Control-2.idtx:9
-#, fuzzy
-msgid "&Continue"
-msgstr "Konnte den Kontext auf dem überlagerten Fenster nicht initialisieren."
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Release.Control-2.idtx:11
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Release.Control-2.idtx:16
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Release.Control-2.idtx:5
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
-msgstr ""
-
-# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Release.Control-2.idtx:3
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Control-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.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Release.Control-2.idtx:6
-msgid "bintutorial1.bmp"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Release.Control-2.idtx:12
-msgid "bintutorial2.bmp"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Release.Control-2.idtx:17
-msgid "bintutorial3.bmp"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:10
-#: MSIBuild/En.Win32.Release.Control-2.idtx:15
-#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Release.Control-2.idtx:10
-#: MSIBuild/En.x64.Release.Control-2.idtx:15
-#: MSIBuild/En.x64.Release.Control-2.idtx:4
-#, fuzzy
+#: 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.Control-2.idtx:18
-#: MSIBuild/En.x64.Release.Control-2.idtx:18
-msgid ""
-"Characters can be entered using keyboard shortcuts, the character catalogue "
-"(F4) or the character finding tool (F8)."
+#: 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.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Release.Control-2.idtx:8
+#: 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 "
@@ -655,278 +646,76 @@ msgid ""
 "where to insert the special characters!"
 msgstr ""
 
-#: 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
-msgid "Input system for linguistic use"
+#: 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.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Release.Control-2.idtx:13
+#: 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.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.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."
+#: 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 ""
 
-#~ 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"
-
-#~ msgid "Start this program automatically on logon"
-#~ msgstr "Samodejno zaženi ta program 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 "Alle"
-
-#~ 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 "Eingabe eines Zeichenstils"
-
-#~ msgid "Language:"
-#~ msgstr "Jezik:"
-
-#~ 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 "Kopieren"
-
-#, fuzzy
-#~ msgid "&Paste"
-#~ msgstr "Einfügen"
-
-#~ msgid "&File"
-#~ msgstr "&Datoteka"
-
-#, fuzzy
-#~ msgid "Send Decomposed (F6)"
-#~ msgstr "Pošlji razstavljeno (F6)"
-
-#, fuzzy
-#~ msgid "Send Composed (F5)"
-#~ msgstr "Pošlji sestavljeno (F5)"
-
-#~ msgid ""
-#~ "ZRCola keyboard shortcut Win+Shift+Z could not be registered. Some "
-#~ "functionality will not be available."
-#~ msgstr ""
-#~ "ZRColine bližnjice na tipkovnici Win+Shift+Z ni mogoče registrirati. "
-#~ "Nekaj funkcionalnosti ne bo na voljo."
-
-#, 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!"
+#: 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-14 11:33+0200\n"
-"PO-Revision-Date: 2016-06-14 11:33+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,31 +21,40 @@ msgstr ""
 msgid "© 2004-%s ZRC SAZU"
 msgstr "© 2004-%s ZRC SAZU"
 
-#: zrcolaapp.cpp:79 zrcolafrm.cpp:90 zrcolagui.cpp:869 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:998
+#: zrcolachrreq.cpp:49 zrcolagui.cpp:1004
 msgid "Character"
 msgstr "Znak"
 
-#: zrcolachrreq.cpp:58 zrcolagui.cpp:1019
+#: zrcolachrreq.cpp:58 zrcolagui.cpp:1025
 msgid "Context"
 msgstr "Kontekst"
 
-#: zrcolachrreq.cpp:64 zrcolagui.h:362
+#: zrcolachrreq.cpp:64 zrcolagui.h:363
 msgid "Request a New Character"
 msgstr "Zahtevaj nov znak"
 
-#: zrcolachrslct.cpp:39 zrcolachrslct.cpp:180 zrcolachrslct.cpp:624
+#: zrcolachrslct.cpp:46 zrcolachrslct.cpp:226 zrcolachrslct.cpp:677
 msgid "▸ Search Options"
 msgstr "▸ Možnosti iskanja"
 
-#: zrcolachrslct.cpp:183 zrcolachrslct.cpp:621
+# Recitation separator
+#: zrcolachrslct.cpp:164
+msgid ", "
+msgstr ", "
+
+#: zrcolachrslct.cpp:229 zrcolachrslct.cpp:674
 msgid "▾ Search Options"
 msgstr "▾ Možnosti iskanja"
 
@@ -70,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"
@@ -195,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č"
@@ -259,7 +272,7 @@ msgstr "Katalog znakov"
 
 #: zrcolagui.cpp:195
 msgid "(De)Composer"
-msgstr "Raz/Sestavljalnik"
+msgstr "Razstavljalnik/Sestavljalnik"
 
 #: zrcolagui.cpp:234
 msgid "Decomposed Text"
@@ -373,176 +386,182 @@ msgid "Unicode character description"
 msgstr "Opis znaka Unicode"
 
 #: zrcolagui.cpp:623
+msgid "Character tags"
+msgstr "Oznake znaka"
+
+#: zrcolagui.cpp:628
 msgid "Unicode character category"
 msgstr "Kategorija znaka Unicode"
 
-#: zrcolagui.cpp:630
+#: zrcolagui.cpp:635
 msgid "« Back"
 msgstr "« Nazaj"
 
-#: zrcolagui.cpp:632
+#: zrcolagui.cpp:637
 msgid "To previously viewed character"
 msgstr "Na prejšnji prikazan znak"
 
-#: zrcolagui.cpp:636
+#: zrcolagui.cpp:641
 msgid "Forward »"
 msgstr "Naprej »"
 
-#: zrcolagui.cpp:638
+#: zrcolagui.cpp:643
 msgid "To following viewed character"
 msgstr "Na naslednji prikazan znak"
 
-#: zrcolagui.cpp:649
+#: zrcolagui.cpp:654
 msgid "Re&lated"
 msgstr "&Sorodni"
 
-#: zrcolagui.cpp:676
+#: zrcolagui.cpp:681
 msgid "List of related characters"
 msgstr "Seznam sorodnih znakov"
 
-#: zrcolagui.cpp:765
+#: 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:769
+#: zrcolagui.cpp:774
 msgid "Select language &automatically according to selected keyboard"
 msgstr "S&amodejno izberi jezik glede na izbrano tipkovnico"
 
-#: zrcolagui.cpp:772
+#: 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:784
+#: zrcolagui.cpp:789
 msgid "Text Language"
 msgstr "Jezik besedila"
 
-#: zrcolagui.cpp:789
+#: 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:793
+#: zrcolagui.cpp:798
 msgid "Start ZRCola &automatically on logon"
 msgstr "S&amodejno zaženi ZRColo ob prijavi"
 
-#: zrcolagui.cpp:800
+#: zrcolagui.cpp:805
 msgid "Startup"
 msgstr "Zagon"
 
-#: zrcolagui.cpp:879
+#: 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:887
+#: zrcolagui.cpp:893
 msgid "zrcola.zrc-sazu.si"
 msgstr "zrcola.zrc-sazu.si"
 
-#: zrcolagui.cpp:893
+#: 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:897
+#: 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:938
+#: zrcolagui.cpp:944
 msgid "Log"
 msgstr "Dnevnik"
 
-#: zrcolagui.cpp:954
+#: zrcolagui.cpp:960
 msgid "Quit and &Update..."
 msgstr "Za&ustavi in posodobi ..."
 
-#: zrcolagui.cpp:956
+#: 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:960
+#: zrcolagui.cpp:966
 msgid "&Close"
 msgstr "&Zapri"
 
-#: zrcolagui.cpp:961
+#: zrcolagui.cpp:967
 msgid "Close this window"
 msgstr "Zapri to okno"
 
-#: zrcolagui.cpp:1000
+#: zrcolagui.cpp:1006
 msgid "Enter the &character you would like to request:"
 msgstr "Vpišite &znak, ki ga želite zahtevati:"
 
-#: zrcolagui.cpp:1007
+#: 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:1011
+#: 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."
-
-#: zrcolagui.cpp:1021
-msgid ""
-"The &context, examples or short description why and where the character is "
-"required:"
-msgstr "&Kontekst, primeri oz. kratek opis zakaj in kje potrebujete novi znak:"
+"Za vnos znaka lahko uporabite ZRColine bližnjice na tipkovnici ali ga "
+"kopirate in prilepite iz okna z razstavljenim besedilom."
 
 #: zrcolagui.cpp:1027
+msgid ""
+"The &context, examples or description why and where the character is "
+"required:"
+msgstr "&Kontekst, primeri oziroma opis, zakaj in kje potrebujete novi znak:"
+
+#: zrcolagui.cpp:1033
 msgid "Additional notes for character request"
 msgstr "Dodatne opombe za zahtevo znaka"
 
-#: zrcolagui.cpp:1034
+#: 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"
@@ -553,94 +572,69 @@ 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:333
+#: zrcolaupdater.cpp:94 zrcolagui.h:334
 msgid "Product Update"
 msgstr "Posodabljanje izdelka"
 
-#: zrcolagui.h:245
+#: zrcolagui.h:246
 msgid "Character Search"
 msgstr "Poišči znak"
 
-#: zrcolagui.h:282
+#: zrcolagui.h:283
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: zrcolagui.h:308
+#: zrcolagui.h:309
 msgid "About ZRCola"
 msgstr "O ZRColi"
 
-#: MSIBuild/En.Win32.Release.Control-2.idtx:14
-#: MSIBuild/En.Win32.Release.Control-2.idtx:19
-#: MSIBuild/En.Win32.Release.Control-2.idtx:9
-#: MSIBuild/En.x64.Release.Control-2.idtx:14
-#: MSIBuild/En.x64.Release.Control-2.idtx:19
-#: MSIBuild/En.x64.Release.Control-2.idtx:9
-msgid "&Continue"
-msgstr "&Nadaljuj"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:11
-#: MSIBuild/En.x64.Release.Control-2.idtx:11
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Composition"
-msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:16
-#: MSIBuild/En.x64.Release.Control-2.idtx:16
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Entering Characters"
-msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:5
-#: MSIBuild/En.x64.Release.Control-2.idtx:5
-msgid "[DlgTitleFont][SimpleProductName] Tutorial : Starting"
-msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon"
-
-# Windows charset for this language (decimal)
-#: MSIBuild/En.Win32.Release.Control-2.idtx:3
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Control-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.Win32.Release.Control-2.idtx:6
-#: MSIBuild/En.x64.Release.Control-2.idtx:6
-msgid "bintutorial1.bmp"
-msgstr "bintutorial1.bmp"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:12
-#: MSIBuild/En.x64.Release.Control-2.idtx:12
-msgid "bintutorial2.bmp"
-msgstr "bintutorial2.bmp"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:17
-#: MSIBuild/En.x64.Release.Control-2.idtx:17
-msgid "bintutorial3.bmp"
-msgstr "bintutorial3.bmp"
-
-#: MSIBuild/En.Win32.Release.Control-2.idtx:10
-#: MSIBuild/En.Win32.Release.Control-2.idtx:15
-#: MSIBuild/En.Win32.Release.Control-2.idtx:4
-#: MSIBuild/En.x64.Release.Control-2.idtx:10
-#: MSIBuild/En.x64.Release.Control-2.idtx:15
-#: MSIBuild/En.x64.Release.Control-2.idtx:4
+#: 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.Control-2.idtx:18
-#: MSIBuild/En.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.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.Win32.Release.Control-2.idtx:8
-#: MSIBuild/En.x64.Release.Control-2.idtx:8
+#: 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 "
@@ -651,15 +645,39 @@ msgstr ""
 "besedilu. Če ZRColo povečamo brez pritiska na ti dve tipki, program ne bo "
 "vedel, kam vstaviti želene znake!"
 
-#: 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
-msgid "Input system for linguistic use"
-msgstr "Vnašalni sistem za jezikoslovno rabo"
+#: 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.Win32.Release.Control-2.idtx:13
-#: MSIBuild/En.x64.Release.Control-2.idtx:13
+#: 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 "
@@ -669,283 +687,38 @@ msgstr ""
 "programu. V spodnji vrstici se prikažejo sestavljeni znaki. V besedilo jih "
 "vnesemo s pritiskom na tipko F5."
 
-#: MSIBuild/En.Win32.Release.Control-2.idtx:7
-#: MSIBuild/En.x64.Release.Control-2.idtx:7
+#: 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 ""
-"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."
+"Characters can be entered using keyboard shortcuts, the character catalogue "
+"(F4) or the character finding tool (F8)."
 msgstr ""
-"Če jo tako nastavimo, se ZRCola zažene samodejno in teče v ozadju. V "
-"ospredje jo prikličemo s pritiskom na bližnjico Win+F5."
-
-#~ msgid "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 "▼ Search Options"
-#~ msgstr "▼ Možnosti iskanja"
-
-#~ msgid "Less Search Options ▲"
-#~ msgstr "Manj možnosti iskanja ▲"
-
-#~ 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 ..."
+"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"

ZRCola/stdafx.h

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

@@ -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/zrcolaapp.cpp

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

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

@@ -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;
@@ -96,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();
@@ -111,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();
@@ -137,7 +137,7 @@ void wxZRColaCharacterCatalogPanel::OnShowAll(wxCommandEvent& event)
 
 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();
 
@@ -193,7 +193,7 @@ 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());
@@ -202,8 +202,7 @@ void wxPersistentZRColaCharacterCatalogPanel::Save() const
 
 bool wxPersistentZRColaCharacterCatalogPanel::Restore()
 {
-    wxZRColaCharacterCatalogPanel * const wnd = static_cast<wxZRColaCharacterCatalogPanel*>(GetWindow());
-
+    auto wnd = dynamic_cast<wxZRColaCharacterCatalogPanel*>(GetWindow());
     bool update = false;
 
     // Restore selected character group.

ZRCola/zrcolachrgrid.cpp

@@ -97,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))

ZRCola/zrcolachrreq.cpp

@@ -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/zrcolachrslct.cpp

@@ -34,6 +34,14 @@ 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"));
@@ -41,9 +49,9 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
     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));
@@ -74,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);
 
@@ -82,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;
@@ -106,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);
@@ -120,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));
@@ -137,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);
 
@@ -145,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);
             }
@@ -191,7 +238,7 @@ 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);
 
@@ -203,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);
 
@@ -215,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));
 
@@ -239,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);
 
@@ -408,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;
     }
@@ -450,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());
 
@@ -477,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());
 
@@ -500,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
@@ -521,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;
@@ -530,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));
@@ -580,13 +634,13 @@ 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));
@@ -598,15 +652,15 @@ void wxPersistentZRColaCharSelect::Save() const
 
 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;

ZRCola/zrcolachrslct.h

@@ -82,6 +82,7 @@ public:
     wchar_t m_char;                                 ///< Currently selected character (0 when none)
 
 protected:
+    LCID m_locale;                                  ///< Locale for tag lookup
     bool m_searchChanged;                           ///< Did Search field or category selection change?
     std::map<ZRCola::chrcatid_t, int> m_ccOrder;    ///< Character category order
     bool m_unicodeChanged;                          ///< Did Unicode field change?

ZRCola/zrcolacomppnl.cpp

@@ -86,14 +86,15 @@ void wxZRColaComposerPanel::SynchronizePanels()
     if (m_decomposedChanged) {
         m_timerSave.Stop();
 
+        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
         wxString src;
         size_t len = GetValue(m_decomposed, src);
 
         std::wstring norm;
-        ((ZRColaApp*)wxTheApp)->m_t_db.Decompose(src.data(), len, norm, &m_mapping1);
+        app->m_t_db.Decompose(src.data(), len, norm, &m_mapping1);
 
         std::wstring dst;
-        ((ZRColaApp*)wxTheApp)->m_t_db.Compose(norm.data(), norm.size(), dst, &m_mapping2);
+        app->m_t_db.Compose(norm.data(), norm.size(), dst, &m_mapping2);
 
         m_decomposed->GetSelection(&m_selDecomposed.first, &m_selDecomposed.second);
 
@@ -115,7 +116,7 @@ void wxZRColaComposerPanel::SynchronizePanels()
         wxString src;
         size_t len = GetValue(m_composed, src);
 
-        ZRColaApp *app = (ZRColaApp*)wxTheApp;
+        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
         std::wstring dst;
         wxZRColaFrame *mainWnd = dynamic_cast<wxZRColaFrame*>(wxGetActiveWindow());
         if (mainWnd)
@@ -382,7 +383,7 @@ wxString wxPersistentZRColaComposerPanel::GetKind() const
 
 void wxPersistentZRColaComposerPanel::Save() const
 {
-    const wxZRColaComposerPanel * const wnd = static_cast<const wxZRColaComposerPanel*>(GetWindow());
+    auto const wnd = static_cast<const wxZRColaComposerPanel*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("splitDecomposed"), wnd->m_splitterDecomposed->GetSashPosition());
     SaveValue(wxT("splitComposed"  ), wnd->m_splitterComposed  ->GetSashPosition());
@@ -391,7 +392,7 @@ void wxPersistentZRColaComposerPanel::Save() const
 
 bool wxPersistentZRColaComposerPanel::Restore()
 {
-    wxZRColaComposerPanel * const wnd = static_cast<wxZRColaComposerPanel*>(GetWindow());
+    auto wnd = dynamic_cast<wxZRColaComposerPanel*>(GetWindow());
 
     int sashVal;
 

ZRCola/zrcolafrm.cpp

@@ -348,7 +348,7 @@ void wxZRColaFrame::OnPanelCharacterCatalogFocus(wxCommandEvent& event)
 
 void wxZRColaFrame::OnHelpInstructions(wxCommandEvent& event)
 {
-    wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/en/info/instructions/"));
+    wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/en/info/instructions/"));
 }
 
 
@@ -358,21 +358,21 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
 
 #ifdef __WXMSW__
     // Search and try to launch installed PDF.
-    INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(ZRCOLA_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
+    INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(PRODUCT_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
     if ((pdf_is == INSTALLSTATE_LOCAL || pdf_is == INSTALLSTATE_SOURCE) &&
         wxFileExists(pdf_path) &&
         (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
 #endif
 
     // Search and try to launch local PDF copy.
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     pdf_path  = app->GetDatabasePath();
     pdf_path += _T("ZRCola_keyboard.pdf");
     if (wxFileExists(pdf_path) &&
         (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
 
     // When everything else fail, try the online version.
-    wxLaunchDefaultBrowser(_("http://zrcola-2.amebis.si/wp-content/uploads/2016/04/5_ZRCola-Tipkovnica_2009-06-21.pdf"));
+    wxLaunchDefaultBrowser(_("http://zrcola.zrc-sazu.si/wp-content/uploads/2016/06/ZRCola_tipkovnica_Jun2016.pdf"));
 }
 
 
@@ -459,7 +459,7 @@ void wxZRColaFrame::DoSend(const wxString& str)
 {
     // Prepare the INPUT table.
     wxString::size_type n = str.length();
-    wxString::const_iterator i_str = str.begin();
+    auto i_str = str.begin();
     std::vector<INPUT> input;
     input.reserve(n*2);
     for (std::vector<INPUT>::size_type i = 0; i < n; i++, i_str++) {
@@ -549,23 +549,21 @@ wxPersistentZRColaFrame::wxPersistentZRColaFrame(wxZRColaFrame *wnd) : wxPersist
 
 void wxPersistentZRColaFrame::Save() const
 {
-    const wxZRColaFrame * const wnd = static_cast<const wxZRColaFrame*>(GetWindow());
+    wxPersistentTLW::Save();
+
+    auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     wxPersistentZRColaComposerPanel(wnd->m_panel).Save();
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Save();
-
-    wxPersistentTLW::Save();
 }
 
 
 bool wxPersistentZRColaFrame::Restore()
 {
-    const bool r = wxPersistentTLW::Restore();
-
-    wxZRColaFrame * const wnd = static_cast<wxZRColaFrame*>(GetWindow());
+    auto wnd = dynamic_cast<wxZRColaFrame*>(GetWindow());
 
     wxPersistentZRColaCharacterCatalogPanel(wnd->m_panelChrCat).Restore();
     wxPersistentZRColaComposerPanel(wnd->m_panel).Restore();
 
-    return r;
+    return wxPersistentTLW::Restore();
 }

ZRCola/zrcolagui.cpp

@@ -159,7 +159,7 @@ wxZRColaFrameBase::wxZRColaFrameBase( wxWindow* parent, wxWindowID id, const wxS
 	m_menuHelp->AppendSeparator();
 	
 	wxMenuItem* m_menuHelpAbout;
-	m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( wxEmptyString ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuHelpAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuHelp->Append( m_menuHelpAbout );
 	
 	m_menubar->Append( m_menuHelp, _("&Help") ); 
@@ -619,6 +619,11 @@ wxZRColaCharSelectBase::wxZRColaCharSelectBase( wxWindow* parent, wxWindowID id,
 	
 	sbSizerPreview->Add( m_description, 1, wxALL|wxEXPAND, 5 );
 	
+	m_tags = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_MULTILINE|wxTE_READONLY );
+	m_tags->SetToolTip( _("Character tags") );
+	
+	sbSizerPreview->Add( m_tags, 1, wxALL|wxEXPAND, 5 );
+	
 	m_category = new wxTextCtrl( sbSizerPreview->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CENTRE|wxTE_READONLY );
 	m_category->SetToolTip( _("Unicode character category") );
 	
@@ -869,6 +874,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	m_staticTextZRCola = new wxStaticText( this, wxID_ANY, _("ZRCola"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextZRCola->Wrap( -1 );
 	m_staticTextZRCola->SetFont( wxFont( 20, 70, 90, 90, false, wxT("ZRCola") ) );
+	m_staticTextZRCola->SetMaxSize( wxSize( 400,-1 ) );
 	
 	bSizerText->Add( m_staticTextZRCola, 0, wxALL|wxEXPAND, 5 );
 	
@@ -876,8 +882,8 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	m_staticTextVersion->Wrap( -1 );
 	bSizerText->Add( m_staticTextVersion, 0, wxALL|wxEXPAND, 5 );
 	
-	m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Program and Website Editor: Janoš Ježovnik\nDevelopment: Amebis, d. o. o., Kamnik\nDevelopment and maintenance (2004-2015): dr. Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextColophone->Wrap( -1 );
+	m_staticTextColophone = new wxStaticText( this, wxID_ANY, _("Program and Website Editor: Janoš Ježovnik\nDevelopment: Amebis, d. o. o., Kamnik\nTranslation into English: Janoš Ježovnik\nTranslation into Russian language: Domen Krvina, Silvo Torkar, Anastasia Plotnikova\nDevelopment and maintenance of the original program (2004–2015): Peter Weiss"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextColophone->Wrap( 400 );
 	bSizerText->Add( m_staticTextColophone, 0, wxALL|wxEXPAND, 5 );
 	
 	m_staticTextCopyright = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
@@ -890,11 +896,11 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	bSizerText->Add( 0, 0, 0, wxALL|wxEXPAND, 5 );
 	
-	m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextDeclaration->Wrap( 400 );
 	bSizerText->Add( m_staticTextDeclaration, 0, wxALL|wxEXPAND, 5 );
 	
-	m_declaration = new wxTextCtrl( this, wxID_ANY, _("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."), wxDefaultPosition, wxSize( -1,80 ), wxTE_MULTILINE|wxTE_READONLY );
+	m_declaration = new wxTextCtrl( this, wxID_ANY, _("This text was written using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Peter Weiss."), wxDefaultPosition, wxSize( -1,80 ), wxTE_MULTILINE|wxTE_READONLY );
 	m_declaration->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 90, false, wxEmptyString ) );
 	
 	bSizerText->Add( m_declaration, 0, wxALL|wxEXPAND, 5 );
@@ -1018,7 +1024,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	wxStaticBoxSizer* sbSizerContext;
 	sbSizerContext = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Context") ), wxVERTICAL );
 	
-	m_contextLbl = new wxStaticText( sbSizerContext->GetStaticBox(), wxID_ANY, _("The &context, examples or short description why and where the character is required:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_contextLbl = new wxStaticText( sbSizerContext->GetStaticBox(), wxID_ANY, _("The &context, examples or description why and where the character is required:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_contextLbl->Wrap( 400 );
 	sbSizerContext->Add( m_contextLbl, 0, wxALL|wxEXPAND, 5 );
 	
@@ -1031,7 +1037,7 @@ wxZRColaCharRequestBase::wxZRColaCharRequestBase( wxWindow* parent, wxWindowID i
 	
 	bSizerContent->Add( sbSizerContext, 60, wxALL|wxEXPAND, 5 );
 	
-	m_note = new wxStaticText( this, wxID_ANY, _("After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\nYour 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."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_note = new wxStaticText( this, wxID_ANY, _("After clicking OK button, your e-mail application should open allowing you to submit the new character request to ZRCola Editor.\nYour e-mail application might not display all the characters correctly, but the Editor will be able to read them correctly anyway."), wxDefaultPosition, wxDefaultSize, 0 );
 	m_note->Wrap( 400 );
 	bSizerContent->Add( m_note, 0, wxALL|wxEXPAND, 5 );
 	

ZRCola/zrcolagui.h

@@ -210,6 +210,7 @@ class wxZRColaCharSelectBase : public wxDialog
 		wxTextCtrl* m_shortcut;
 		wxGrid* m_gridPreview;
 		wxTextCtrl* m_description;
+		wxTextCtrl* m_tags;
 		wxTextCtrl* m_category;
 		wxHyperlinkCtrl* m_navigateBack;
 		wxHyperlinkCtrl* m_navigateForward;

ZRCola/zrcolakeyhndlr.cpp

@@ -39,7 +39,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
         if (e.GetKeyCode() == WXK_INSERT) {
             // Insert key has been pressed.
             m_is_insert = true;
-            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
+            wxFrame *pFrame = wxDynamicCast(dynamic_cast<ZRColaApp*>(wxTheApp)->m_mainWnd, wxFrame);
             if (pFrame && pFrame->GetStatusBar())
                 pFrame->SetStatusText(_("INS key is pressed. Type the Unicode code of desired character now (up to four hexadecimal digits: 0-9, A-F), then release INS."));
         } else if (m_is_insert) {
@@ -49,7 +49,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                 if (WXK_NUMPAD0 <= key && key <= WXK_NUMPAD9)
                     chr = '0' + (key - WXK_NUMPAD0);
             }
-            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
+            wxFrame *pFrame = wxDynamicCast(dynamic_cast<ZRColaApp*>(wxTheApp)->m_mainWnd, wxFrame);
             if (('0' <= chr && chr <= '9' || 'A' <= chr && chr <= 'F') && m_insert_seq.size() < 4) {
                 // A hex-digit pressed. Save it.
                 m_insert_seq.push_back((char)chr);
@@ -73,7 +73,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
 #endif
             )
         {
-            ZRColaApp *app = (ZRColaApp*)wxTheApp;
+            auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
             ZRCola::keyseq_db::indexKey::size_type start;
             bool found;
             wxFrame *pFrame = wxDynamicCast(app->m_mainWnd, wxFrame);
@@ -96,7 +96,7 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
                     (e.AltDown()     ? ZRCola::keyseq_db::keyseq::ALT   : 0);
                 m_seq.push_back(key);
 
-                std::vector<ZRCola::keyseq_db::keyseq::key_t>::size_type n = m_seq.size();
+                auto n = m_seq.size();
                 ZRCola::keyseq_db::keyseq *ks = (ZRCola::keyseq_db::keyseq*)new char[sizeof(ZRCola::keyseq_db::keyseq) + sizeof(ZRCola::keyseq_db::keyseq::key_t)*n];
                 ks->chr = 0;
                 ks->seq_len = n;
@@ -143,11 +143,11 @@ bool wxZRColaKeyHandler::ProcessEvent(wxEvent& event)
         wxKeyEvent &e = (wxKeyEvent&)event;
         if (m_is_insert && e.GetKeyCode() == WXK_INSERT) {
             // Insert key has been depressed.
-            wxFrame *pFrame = wxDynamicCast(((ZRColaApp*)wxTheApp)->m_mainWnd, wxFrame);
+            wxFrame *pFrame = wxDynamicCast(dynamic_cast<ZRColaApp*>(wxTheApp)->m_mainWnd, wxFrame);
             if (pFrame && pFrame->GetStatusBar())
                 pFrame->SetStatusText(wxEmptyString);
 
-            std::vector<char>::size_type count = m_insert_seq.size();
+            auto count = m_insert_seq.size();
             if (count) {
                 // Zero terminate sequence and parse the Unicode value.
                 m_insert_seq.push_back(0);

ZRCola/zrcolasettings.cpp

@@ -26,13 +26,13 @@
 
 wxZRColaSettings::wxZRColaSettings(wxWindow* parent) :
     m_lang_auto(true),
-    m_lang(ZRCola::langid_t_blank),
+    m_lang(ZRCola::langid_t::blank),
     wxZRColaSettingsBase(parent)
 {
-    ZRColaApp *app = ((ZRColaApp*)wxTheApp);
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     m_languages->Clear();
     for (size_t i = 0, n = app->m_lang_db.idxLng.size(); i < n; i++) {
-        const ZRCola::language_db::language &lang = app->m_lang_db.idxLng[i];
+        const auto &lang = app->m_lang_db.idxLng[i];
         wxString
             label(lang.name, lang.name_len),
             label_tran(wxGetTranslation(label, wxT("ZRCola-zrcdb")));
@@ -57,7 +57,7 @@ void wxZRColaSettings::OnInitDialog(wxInitDialogEvent& event)
     m_languages->Enable(!m_lang_auto);
     (m_lang_auto ? m_langAuto : m_langManual)->SetValue(true);
 
-    ZRColaApp *app = ((ZRColaApp*)wxTheApp);
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     char l[sizeof(ZRCola::language_db::language)] = {};
     ((ZRCola::language_db::language*)l)->id = m_lang;
     ZRCola::language_db::indexLang::size_type start;
@@ -121,8 +121,8 @@ void wxZRColaSettings::OnApplyButtonClick(wxCommandEvent& event)
     } else {
         m_lang_auto = false;
 
-        ZRColaApp *app = ((ZRColaApp*)wxTheApp);
-        const ZRCola::language_db::language &lang = app->m_lang_db.idxLng[m_languages->GetSelection()];
+        auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+        const auto &lang = app->m_lang_db.idxLng[m_languages->GetSelection()];
 
         if (m_lang != lang.id) {
             m_lang = lang.id;
@@ -155,7 +155,7 @@ void wxPersistentZRColaSettings::Save() const
 {
     wxPersistentDialog::Save();
 
-    const wxZRColaSettings * const wnd = static_cast<const wxZRColaSettings*>(GetWindow());
+    auto wnd = static_cast<const wxZRColaSettings*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
     SaveValue(wxT("langAuto"), wnd->m_lang_auto);
     SaveValue(wxT("lang"    ), wxString::FromAscii(wnd->m_lang.data, _countof(wnd->m_lang.data)));
@@ -164,9 +164,8 @@ void wxPersistentZRColaSettings::Save() const
 
 bool wxPersistentZRColaSettings::Restore()
 {
-    wxZRColaSettings * const wnd = static_cast<wxZRColaSettings*>(GetWindow());
-
-    ZRColaApp *app = ((ZRColaApp*)wxTheApp);
+    auto wnd = dynamic_cast<wxZRColaSettings*>(GetWindow());
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
     wxString lang;
 
     // Restore automatic language detection setting first.
@@ -181,10 +180,10 @@ bool wxPersistentZRColaSettings::Restore()
         // The language was read from configuration.
         wnd->m_lang = lang.c_str();
     } else if (!app->m_lang_db.idxLng.empty()) {
-        const ZRCola::language_db::language &lang = app->m_lang_db.idxLng[0];
+        const auto &lang = app->m_lang_db.idxLng[0];
         wnd->m_lang = lang.id;
     } else
-        wnd->m_lang = ZRCola::langid_t_blank;
+        wnd->m_lang = ZRCola::langid_t::blank;
 
     return wxPersistentDialog::Restore();
 }

ZRCola/zrcolaupdater.cpp

@@ -40,8 +40,8 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
     //Connect(wxID_ANY, wxEVT_UPDATER_CHECK_COMPLETE, wxThreadEventHandler(wxZRColaUpdater::OnCheckComplete), NULL, this);
 
     // Prepare Updater.
-    ZRColaApp *app = (ZRColaApp*)wxTheApp;
-    m_updater = new wxUpdCheckThread(app->m_locale.GetCanonicalName(), this);
+    auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
+    m_updater = new wxUpdCheckThread(app->m_lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(app->m_lang_ui), this);
     //if (m_updater->Run() != wxTHREAD_NO_ERROR) {
     //    wxFAIL_MSG(wxT("Can't create the thread!"));
     //    delete m_updater;
@@ -95,7 +95,7 @@ void wxZRColaUpdater::OnUpdate(wxCommandEvent& event)
             m_updater->LaunchUpdate();
 
             Close(true);
-            ((ZRColaApp*)wxTheApp)->m_mainWnd->Close();
+            dynamic_cast<ZRColaApp*>(wxTheApp)->m_mainWnd->Close();
         }
     }
 }

ZRColaCompile/ZRColaCompile.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib\wxExtend\include;..\lib\WinStd\include;..\lib\stdex\include;..\lib\libZRCola\include;..\lib\libZRColaUI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>

ZRColaCompile/ZRColaCompile.vcxproj

@@ -19,14 +19,12 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Dynamic</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Dynamic</UseOfAtl>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -63,6 +61,9 @@
     <ProjectReference Include="..\lib\libZRCola\build\libZRCola.vcxproj">
       <Project>{3c61929e-7289-4101-8d0a-da22d6e1aea8}</Project>
     </ProjectReference>
+    <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>

ZRColaCompile/dbsource.cpp

@@ -21,6 +21,7 @@
 
 using namespace std;
 using namespace stdex;
+using namespace winstd;
 
 
 //////////////////////////////////////////////////////////////////////////
@@ -71,21 +72,14 @@ void ZRCola::DBSource::character_bank::build_related()
 
 
 ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ size_type from, _In_ size_type to) :
-    thread_type((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
+    win_handle((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
     m_heap(HeapCreate(0, 0, 0)),
     m_cb(cb),
     m_from(from),
     m_to(to)
 {
     // Now that members of this class are surely initialized, proceed.
-    ResumeThread(get());
-}
-
-
-ZRCola::DBSource::character_bank::build_related_worker::~build_related_worker()
-{
-    assert(m_heap);
-    HeapDestroy(m_heap);
+    ResumeThread(m_h);
 }
 
 
@@ -96,13 +90,13 @@ unsigned int ZRCola::DBSource::character_bank::build_related_worker::process()
     set<wstring, less<wstring>, heap_allocator<wstring> > matching(less<wstring>(), al);
 
     for (size_type i = m_from; i < m_to; i++) {
-        ZRCola::DBSource::character &chr = *(m_cb->at(i).get());
+        auto &chr = *(m_cb->at(i).get());
         if (&chr == NULL) continue;
 
         rel.clear();
 
         // Remove all unexisting, inactive, or self related characters.
-        for (wstring::size_type j = chr.rel.length(); j--;) {
+        for (auto j = chr.rel.length(); j--;) {
             wchar_t c = chr.rel[j];
             if (m_cb->at(c) && (wchar_t)j != c)
                 rel += c;
@@ -112,17 +106,17 @@ unsigned int ZRCola::DBSource::character_bank::build_related_worker::process()
         for (size_type j = 0, j_end = m_cb->size(); j < j_end; j++) {
             if (i == j || rel.find((wchar_t)j) != wstring::npos)
                 continue;
-            const ZRCola::DBSource::character &chr2 = *(m_cb->at(j).get());
+            const auto &chr2 = *(m_cb->at(j).get());
             if (&chr2 == NULL)
                 continue;
 
             set<wstring>::size_type comparisons = 0;
             matching.clear();
-            for (set<wstring>::const_iterator term = chr.terms.cbegin(), term_end = chr.terms.cend(); term != term_end; ++term) {
+            for (auto term = chr.terms.cbegin(), term_end = chr.terms.cend(); term != term_end; ++term) {
                 // Test for ignored word(s).
                 if (m_cb->m_ignore.find(*term) != m_cb->m_ignore.cend())
                     continue;
-                for (set<wstring>::const_iterator term2 = chr2.terms.cbegin(), term2_end = chr2.terms.cend(); term2 != term2_end; ++term2) {
+                for (auto term2 = chr2.terms.cbegin(), term2_end = chr2.terms.cend(); term2 != term2_end; ++term2) {
                     // Test for ignored word(s).
                     if (m_cb->m_ignore.find(*term2) != m_cb->m_ignore.cend())
                         continue;
@@ -134,7 +128,7 @@ unsigned int ZRCola::DBSource::character_bank::build_related_worker::process()
 
             if (comparisons) {
                 // If 1/2 terms match, assume related.
-                set<wstring>::size_type hits = matching.size();
+                auto hits = matching.size();
                 if (hits*hits*2 >= comparisons)
                     rel += chr2.chr;
             }
@@ -205,7 +199,7 @@ void ZRCola::DBSource::character_desc_idx::parse_keywords(const wchar_t *str, se
 
 void ZRCola::DBSource::character_desc_idx::add_keywords(const set<wstring> &terms, wchar_t chr, size_t sub)
 {
-    for (set<wstring>::const_iterator term = terms.cbegin(), term_end = terms.cend(); term != term_end; ++term) {
+    for (auto term = terms.cbegin(), term_end = terms.cend(); term != term_end; ++term) {
         if (sub) {
             wstring::size_type j_end = term->size();
             if (j_end >= sub) {
@@ -261,11 +255,9 @@ ZRCola::DBSource::DBSource()
 
 ZRCola::DBSource::~DBSource()
 {
-    if (m_pCharacterGroup1)
-        m_pCharacterGroup1.Release();
-
-    if (m_comCharacterGroup)
-        m_comCharacterGroup.Release();
+    // Manually release all COM objects related to the database before we close the database.
+    m_pCharacterGroup1.free();
+    m_comCharacterGroup.free();
 
     if (m_db)
         m_db->Close();
@@ -288,7 +280,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
         cn += L"Dbq=";
         cn += filename;
         cn += L";Uid=;Pwd=;";
-        hr = m_db->Open(ATL::CComBSTR(cn.c_str()));
+        hr = m_db->Open(bstr(cn.c_str()));
         if (SUCCEEDED(hr)) {
             // Database open and ready.
             m_filename = filename;
@@ -298,15 +290,15 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
 
             // Create ADO command(s).
             wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADOCommand, NULL, CLSCTX_ALL, IID_IADOCommand, (LPVOID*)&m_comCharacterGroup)));
-            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_ActiveConnection(ATL::CComVariant(m_db))));
+            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_ActiveConnection(variant(m_db))));
             wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandType(adCmdText)));
-            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(ATL::CComBSTR(L"SELECT [VRS_SkupineZnakov].[Znak], [VRS_SkupineZnakov].[pogost] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
+            wxVERIFY(SUCCEEDED(m_comCharacterGroup->put_CommandText(bstr(L"SELECT [VRS_SkupineZnakov].[Znak], [VRS_SkupineZnakov].[pogost] FROM [VRS_SkupineZnakov] LEFT JOIN [VRS_CharList] ON [VRS_SkupineZnakov].[Znak]=[VRS_CharList].[znak] WHERE [VRS_CharList].[aktiven]=1 AND [VRS_SkupineZnakov].[Skupina]=? ORDER BY [VRS_SkupineZnakov].[Rang] ASC, [VRS_SkupineZnakov].[Znak] ASC"))));
             {
                 // Create and add command parameters.
-                ATL::CComPtr<ADOParameters> params;
+                com_obj<ADOParameters> params;
                 wxVERIFY(SUCCEEDED(m_comCharacterGroup->get_Parameters(&params)));
                 wxASSERT_MSG(!m_pCharacterGroup1, wxT("ADO command parameter already created"));
-                wxVERIFY(SUCCEEDED(m_comCharacterGroup->CreateParameter(ATL::CComBSTR(L"@Skupina"), adVarWChar, adParamInput, 50, ATL::CComVariant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pCharacterGroup1)));
+                wxVERIFY(SUCCEEDED(m_comCharacterGroup->CreateParameter(bstr(L"@Skupina"), adVarWChar, adParamInput, 50, variant(DISP_E_PARAMNOTFOUND, VT_ERROR), &m_pCharacterGroup1)));
                 wxVERIFY(SUCCEEDED(params->Append(m_pCharacterGroup1)));
             }
 
@@ -315,7 +307,7 @@ bool ZRCola::DBSource::Open(LPCTSTR filename)
             _ftprintf(stderr, wxT("%s: error ZCC0011: Could not open database (0x%x).\n"), (LPCTSTR)filename, hr);
             LogErrors();
         }
-        m_db.Release();
+        m_db.free();
     } else
         _ftprintf(stderr, wxT("%s: error ZCC0012: Creating ADOConnection object failed (0x%x).\n"), (LPCTSTR)filename, hr);
 
@@ -337,12 +329,12 @@ void ZRCola::DBSource::LogErrors() const
         // Iterate the errors.
         for (long i = 0; i < n; i++) {
             ADOError *err = NULL;
-            if (SUCCEEDED(errors->get_Item(ATL::CComVariant(i), &err))) {
+            if (SUCCEEDED(errors->get_Item(variant(i), &err))) {
                 // Write error number and description to the log.
                 long num = 0;
                 wxVERIFY(SUCCEEDED(err->get_Number(&num)));
 
-                ATL::CComBSTR desc;
+                bstr desc;
                 wxVERIFY(SUCCEEDED(err->get_Description(&desc)));
 
                 _ftprintf(stderr, wxT("    error ADO%x: %ls\n"), num, (BSTR)desc);
@@ -356,13 +348,13 @@ void ZRCola::DBSource::LogErrors() const
 }
 
 
-bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, bool& val) const
+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, bool& val) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.ChangeType(VT_BOOL)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_BOOL)), false);
 
     val = V_BOOL(&v) ? true : false;
 
@@ -370,13 +362,13 @@ bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, bool& val) cons
 }
 
 
-bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, int& val) const
+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, int& val) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.ChangeType(VT_I4)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_I4)), false);
 
     val = V_I4(&v);
 
@@ -384,14 +376,14 @@ bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, int& val) const
 }
 
 
-bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, wstring& val) const
+bool ZRCola::DBSource::GetValue(const com_obj<ADOField>& f, wstring& val) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
     if (V_VT(&v) != VT_NULL) {
-        wxCHECK(SUCCEEDED(v.ChangeType(VT_BSTR)), false);
+        wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
 
         val.reserve(::SysStringLen(V_BSTR(&v)));
         val = V_BSTR(&v);
@@ -402,14 +394,14 @@ bool ZRCola::DBSource::GetValue(const ATL::CComPtr<ADOField>& f, wstring& val) c
 }
 
 
-bool ZRCola::DBSource::GetUnicodeCharacter(const ATL::CComPtr<ADOField>& f, wchar_t& chr) const
+bool ZRCola::DBSource::GetUnicodeCharacter(const com_obj<ADOField>& f, wchar_t& chr) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
     if (V_VT(&v) != VT_NULL) {
-        wxCHECK(SUCCEEDED(v.ChangeType(VT_BSTR)), false);
+        wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
 
         // Parse the field. Must be exactly one Unicode code.
         UINT i = 0, n = ::SysStringLen(V_BSTR(&v));
@@ -421,12 +413,12 @@ bool ZRCola::DBSource::GetUnicodeCharacter(const ATL::CComPtr<ADOField>& f, wcha
             else break;
         }
         if (i <= 0 && 4 < i) {
-            ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-            _ftprintf(stderr, wxT("%s: error ZCC0030: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+            bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+            _ftprintf(stderr, wxT("%s: error ZCC0030: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
             return false;
         } else if (i != n) {
-            ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-            _ftprintf(stderr, wxT("%s: error ZCC0031: Syntax error in \"%.*ls\" field (\"%.*ls\"). Extra trailing characters.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+            bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+            _ftprintf(stderr, wxT("%s: error ZCC0031: Syntax error in \"%.*ls\" field (\"%.*ls\"). Extra trailing characters.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
             return false;
         }
     } else
@@ -436,13 +428,13 @@ bool ZRCola::DBSource::GetUnicodeCharacter(const ATL::CComPtr<ADOField>& f, wcha
 }
 
 
-bool ZRCola::DBSource::GetUnicodeString(const ATL::CComPtr<ADOField>& f, wstring& str) const
+bool ZRCola::DBSource::GetUnicodeString(const com_obj<ADOField>& f, wstring& str) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.ChangeType(VT_BSTR)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
 
     // Parse the field. Must be "xxxx+xxxx+xxxx..." sequence.
     str.clear();
@@ -457,8 +449,8 @@ bool ZRCola::DBSource::GetUnicodeString(const ATL::CComPtr<ADOField>& f, wstring
             else break;
         }
         if (j <= 0 || 4 < j) {
-            ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-            _ftprintf(stderr, wxT("%s: error ZCC0020: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+            bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+            _ftprintf(stderr, wxT("%s: error ZCC0020: Syntax error in \"%.*ls\" field (\"%.*ls\"). Unicode code must be one to four hexadecimal characters long.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
             return false;
         }
         str += c;
@@ -471,13 +463,13 @@ bool ZRCola::DBSource::GetUnicodeString(const ATL::CComPtr<ADOField>& f, wstring
 }
 
 
-bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADOField>& f, ZRCola::langid_t& lang) const
+bool ZRCola::DBSource::GetLanguage(const com_obj<ADOField>& f, ZRCola::langid_t& lang) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
-    wxCHECK(SUCCEEDED(v.ChangeType(VT_BSTR)), false);
+    wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
 
     // Convert to lowercase.
     _wcslwr_l(V_BSTR(&v), m_locale);
@@ -485,8 +477,8 @@ bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADOField>& f, ZRCola::lang
     // Parse the field.
     size_t n = wcsnlen(V_BSTR(&v), ::SysStringLen(V_BSTR(&v)));
     if (n != 3) {
-            ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-            _ftprintf(stderr, wxT("%s: error ZCC0080: Syntax error in \"%.*ls\" field (\"%.*ls\"). Language ID must be exactly three (3) characters long.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+            bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+            _ftprintf(stderr, wxT("%s: error ZCC0080: Syntax error in \"%.*ls\" field (\"%.*ls\"). Language ID must be exactly three (3) characters long.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
             return false;
     }
     for (size_t i = 0;; i++) {
@@ -494,8 +486,8 @@ bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADOField>& f, ZRCola::lang
             if (i < n) {
                 wchar_t c = V_BSTR(&v)[i];
                 if ((unsigned short)c > 0x7f) {
-                    ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-                    _ftprintf(stderr, wxT("%s: error ZCC0081: Syntax error in \"%.*ls\" field (\"%.*ls\"). Language ID must contain ASCII characters only.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+                    bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+                    _ftprintf(stderr, wxT("%s: error ZCC0081: Syntax error in \"%.*ls\" field (\"%.*ls\"). Language ID must contain ASCII characters only.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
                     return false;
                 }
                 lang.data[i] = (char)c;
@@ -509,20 +501,20 @@ bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADOField>& f, ZRCola::lang
 }
 
 
-bool ZRCola::DBSource::GetChrCat(const ATL::CComPtr<ADOField>& f, chrcatid_t& cc) const
+bool ZRCola::DBSource::GetChrCat(const com_obj<ADOField>& f, chrcatid_t& cc) const
 {
     wxASSERT_MSG(f, wxT("field is empty"));
 
-    ATL::CComVariant v;
+    variant v;
     wxVERIFY(SUCCEEDED(f->get_Value(&v)));
     if (V_VT(&v) != VT_NULL) {
-        wxCHECK(SUCCEEDED(v.ChangeType(VT_BSTR)), false);
+        wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
 
         // Parse the field.
         size_t n = wcsnlen(V_BSTR(&v), ::SysStringLen(V_BSTR(&v)));
         if (n < 1 || 2 < n) {
-                ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-                _ftprintf(stderr, wxT("%s: error ZCC0110: Syntax error in \"%.*ls\" field (\"%.*ls\"). Character category ID must be one (1) or two (2) characters long.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+                bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+                _ftprintf(stderr, wxT("%s: error ZCC0110: Syntax error in \"%.*ls\" field (\"%.*ls\"). Character category ID must be one (1) or two (2) characters long.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
                 return false;
         }
         for (size_t i = 0;; i++) {
@@ -530,8 +522,8 @@ bool ZRCola::DBSource::GetChrCat(const ATL::CComPtr<ADOField>& f, chrcatid_t& cc
                 if (i < n) {
                     wchar_t c = V_BSTR(&v)[i];
                     if ((unsigned short)c > 0x7f) {
-                        ATL::CComBSTR fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
-                        _ftprintf(stderr, wxT("%s: error ZCC0111: Syntax error in \"%.*ls\" field (\"%.*ls\"). Character category ID must contain ASCII characters only.\n"), m_filename.c_str(), fieldname.Length(), (BSTR)fieldname, n, V_BSTR(&v));
+                        bstr fieldname; wxVERIFY(SUCCEEDED(f->get_Name(&fieldname)));
+                        _ftprintf(stderr, wxT("%s: error ZCC0111: Syntax error in \"%.*ls\" field (\"%.*ls\"). Character category ID must contain ASCII characters only.\n"), m_filename.c_str(), fieldname.length(), (BSTR)fieldname, n, V_BSTR(&v));
                         return false;
                     }
                     cc.data[i] = (char)c;
@@ -547,18 +539,62 @@ bool ZRCola::DBSource::GetChrCat(const ATL::CComPtr<ADOField>& f, chrcatid_t& cc
 }
 
 
-bool ZRCola::DBSource::SelectTranslations(ATL::CComPtr<ADORecordset> &rs) const
+bool ZRCola::DBSource::GetTagNames(const winstd::com_obj<ADOField>& f, LCID lcid, list<wstring>& names) const
+{
+    wxASSERT_MSG(f, wxT("field is empty"));
+
+    variant v;
+    wxVERIFY(SUCCEEDED(f->get_Value(&v)));
+    wxCHECK(SUCCEEDED(v.change_type(VT_BSTR)), false);
+
+    // Parse the field. Must be "name, name, name..." sequence.
+    names.clear();
+    for (UINT i = 0, n = ::SysStringLen(V_BSTR(&v)); i < n && V_BSTR(&v)[i];) {
+        if (iswspace(V_BSTR(&v)[i])) {
+            // Skip leading white space.
+            i++; continue;
+        }
+
+        // Parse name.
+        UINT j = i, j_end = i;
+        for (; i < n && V_BSTR(&v)[i]; i++) {
+            if (V_BSTR(&v)[i] == L',' || V_BSTR(&v)[i] == L';') {
+                // Delimiter found.
+                i++; break;
+            } else if (!iswspace(V_BSTR(&v)[i])) {
+                // Remember last non-white space character.
+                j_end = i + 1;
+            }
+        }
+        wstring name(V_BSTR(&v) + j, V_BSTR(&v) + j_end);
+        for (auto n = names.cbegin(), n_end = names.cend(); ; ++n) {
+            if (n == n_end) {
+                // Add name to the list.
+                names.push_back(std::move(name));
+                break;
+            } else if (ZRCola::tagname_db::tagname::CompareName(lcid, n->data(), (unsigned __int16)n->length(), name.data(), (unsigned __int16)name.length()) == CSTR_EQUAL) {
+                // Name is already on the list.
+                break;
+            }
+        }
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::SelectTranslations(com_obj<ADORecordset> &rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT [komb], [znak], [rang_znak] "
         L"FROM [VRS_ReplChar] "
         L"WHERE [rang_komb]=1 "
-        L"ORDER BY [znak], [rang_znak], [komb]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [znak], [rang_znak], [komb]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0040: Error loading compositions from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -569,46 +605,46 @@ bool ZRCola::DBSource::SelectTranslations(ATL::CComPtr<ADORecordset> &rs) const
 }
 
 
-bool ZRCola::DBSource::GetTranslation(const ATL::CComPtr<ADORecordset>& rs, ZRCola::DBSource::translation& t) const
+bool ZRCola::DBSource::GetTranslation(const com_obj<ADORecordset>& rs, ZRCola::DBSource::translation& t) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"komb"), &f)));
-        wxCHECK(GetUnicodeString(f, t.str), false);
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"komb"), &f)));
+        wxCHECK(GetUnicodeString(f, t.decomp.str), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"znak"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak"), &f)));
         wxCHECK(GetUnicodeCharacter(f, t.chr), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"rang_znak"), &f)));
-        wxCHECK(GetValue(f, t.rank), false);
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"rang_znak"), &f)));
+        wxCHECK(GetValue(f, t.decomp.rank), false);
     }
 
     return true;
 }
 
 
-bool ZRCola::DBSource::SelectKeySequences(ATL::CComPtr<ADORecordset> &rs) const
+bool ZRCola::DBSource::SelectKeySequences(com_obj<ADORecordset> &rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT DISTINCT [VRS_KeyCodes].[Znak], [VRS_CharGroup].[CharGroup], IIF([VRS_CharGroup].[Arg1] IS NOT NULL, [VRS_CharGroup].[Arg1], 0)+IIF([VRS_CharGroup].[Arg2] IS NOT NULL, [VRS_CharGroup].[Arg2], 0)+IIF([VRS_CharGroup].[Arg3] IS NOT NULL, [VRS_CharGroup].[Arg3], 0) AS [Modifiers], IIF([VRS_CharGroup].[Arg4] IS NOT NULL, [VRS_CharGroup].[Arg4], 0) AS [KeyCodePre], [VRS_KeyCodes].[KeyCode], [VRS_KeyCodes].[Shift] "
         L"FROM [VRS_KeyCodes] LEFT JOIN [VRS_CharGroup] ON [VRS_CharGroup].[CharGroup]=[VRS_KeyCodes].[CharGroup] "
-        L"ORDER BY [VRS_CharGroup].[CharGroup], [VRS_KeyCodes].[KeyCode], [VRS_KeyCodes].[Shift], [VRS_KeyCodes].[Znak]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [VRS_CharGroup].[CharGroup], [VRS_KeyCodes].[KeyCode], [VRS_KeyCodes].[Shift], [VRS_KeyCodes].[Znak]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0050: Error loading key sequences from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -619,44 +655,44 @@ bool ZRCola::DBSource::SelectKeySequences(ATL::CComPtr<ADORecordset> &rs) const
 }
 
 
-bool ZRCola::DBSource::GetKeySequence(const ATL::CComPtr<ADORecordset>& rs, ZRCola::DBSource::keyseq& ks) const
+bool ZRCola::DBSource::GetKeySequence(const com_obj<ADORecordset>& rs, ZRCola::DBSource::keyseq& ks) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Znak"), &f)));
         wxCHECK(GetUnicodeCharacter(f, ks.chr), false);
     }
 
     int modifiers;
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Modifiers"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Modifiers"), &f)));
         wxCHECK(GetValue(f, modifiers), false);
     }
 
     int keycode1;
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"KeyCodePre"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCodePre"), &f)));
         wxCHECK(GetValue(f, keycode1), false);
     }
 
     int keycode;
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"KeyCode"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"KeyCode"), &f)));
         wxCHECK(GetValue(f, keycode), false);
     }
 
     bool shift;
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Shift"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Shift"), &f)));
         wxCHECK(GetValue(f, shift), false);
     }
 
@@ -686,17 +722,17 @@ bool ZRCola::DBSource::GetKeySequence(const ATL::CComPtr<ADORecordset>& rs, ZRCo
 }
 
 
-bool ZRCola::DBSource::SelectLanguages(ATL::CComPtr<ADORecordset> &rs) const
+bool ZRCola::DBSource::SelectLanguages(com_obj<ADORecordset> &rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT DISTINCT [entCode], [Jezik_En] "
         L"FROM [VRS_Jezik] "
-        L"ORDER BY [entCode], [Jezik_En]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [entCode], [Jezik_En]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0060: Error loading languages from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -707,22 +743,22 @@ bool ZRCola::DBSource::SelectLanguages(ATL::CComPtr<ADORecordset> &rs) const
 }
 
 
-bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADORecordset>& rs, ZRCola::DBSource::language& lang) const
+bool ZRCola::DBSource::GetLanguage(const com_obj<ADORecordset>& rs, ZRCola::DBSource::language& lang) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"entCode"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"entCode"), &f)));
         wxCHECK(GetLanguage(f, lang.id), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Jezik_En"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Jezik_En"), &f)));
         wxCHECK(GetValue(f, lang.name), false);
     }
 
@@ -730,17 +766,17 @@ bool ZRCola::DBSource::GetLanguage(const ATL::CComPtr<ADORecordset>& rs, ZRCola:
 }
 
 
-bool ZRCola::DBSource::SelectLanguageCharacters(ATL::CComPtr<ADORecordset> &rs) const
+bool ZRCola::DBSource::SelectLanguageCharacters(com_obj<ADORecordset> &rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT DISTINCT [znak], [lang] "
         L"FROM [VRS_CharLocal] "
-        L"ORDER BY [znak], [lang]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [znak], [lang]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0090: Error loading language characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -751,22 +787,22 @@ bool ZRCola::DBSource::SelectLanguageCharacters(ATL::CComPtr<ADORecordset> &rs)
 }
 
 
-bool ZRCola::DBSource::GetLanguageCharacter(const ATL::CComPtr<ADORecordset>& rs, ZRCola::DBSource::langchar& lc) const
+bool ZRCola::DBSource::GetLanguageCharacter(const com_obj<ADORecordset>& rs, ZRCola::DBSource::langchar& lc) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"znak"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak"), &f)));
         wxCHECK(GetUnicodeCharacter(f, lc.chr), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"lang"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"lang"), &f)));
         wxCHECK(GetLanguage(f, lc.lang), false);
     }
 
@@ -774,17 +810,17 @@ bool ZRCola::DBSource::GetLanguageCharacter(const ATL::CComPtr<ADORecordset>& rs
 }
 
 
-bool ZRCola::DBSource::SelectCharacterGroups(ATL::CComPtr<ADORecordset>& rs) const
+bool ZRCola::DBSource::SelectCharacterGroups(com_obj<ADORecordset>& rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT DISTINCT [id], [Skupina], [opis_en], [Rang] "
         L"FROM [VRS_SkupinaZnakov] "
-        L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [Rang], [opis_en]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0090: Error loading character groups from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -795,46 +831,46 @@ bool ZRCola::DBSource::SelectCharacterGroups(ATL::CComPtr<ADORecordset>& rs) con
 }
 
 
-bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, chrgrp& cg) const
+bool ZRCola::DBSource::GetCharacterGroup(const com_obj<ADORecordset>& rs, chrgrp& cg) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
     wstring id;
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"id"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"id"), &f)));
         wxCHECK(GetValue(f, cg.id), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Skupina"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Skupina"), &f)));
         wxCHECK(GetValue(f, id), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Rang"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Rang"), &f)));
         wxCHECK(GetValue(f, cg.rank), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_en"), &f)));
         wxCHECK(GetValue(f, cg.name), false);
     }
 
     // Read character list from database.
-    wxVERIFY(SUCCEEDED(m_pCharacterGroup1->put_Value(ATL::CComVariant(id.c_str()))));
-    ATL::CComPtr<ADORecordset> rs_chars;
+    wxVERIFY(SUCCEEDED(m_pCharacterGroup1->put_Value(variant(id.c_str()))));
+    com_obj<ADORecordset> rs_chars;
     wxVERIFY(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs_chars)));
     wxVERIFY(SUCCEEDED(rs_chars->put_CursorLocation(adUseClient)));
     wxVERIFY(SUCCEEDED(rs_chars->put_CursorType(adOpenForwardOnly)));
     wxVERIFY(SUCCEEDED(rs_chars->put_LockType(adLockReadOnly)));
-    if (FAILED(rs_chars->Open(ATL::CComVariant(m_comCharacterGroup), ATL::CComVariant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
+    if (FAILED(rs_chars->Open(variant(m_comCharacterGroup), variant(DISP_E_PARAMNOTFOUND, VT_ERROR)))) {
         _ftprintf(stderr, wxT("%s: error ZCC0100: Error loading character group characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
         return false;
@@ -842,11 +878,12 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, c
 
     {
         cg.chars.clear();
-        ATL::CComPtr<ADOFields> flds;
+        cg.show.clear();
+        com_obj<ADOFields> flds;
         wxVERIFY(SUCCEEDED(rs_chars->get_Fields(&flds)));
-        ATL::CComPtr<ADOField> f_char, f_show;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Znak"  ), &f_char)));
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"pogost"), &f_show)));
+        com_obj<ADOField> f_char, f_show;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Znak"  ), &f_char)));
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"pogost"), &f_show)));
         for (VARIANT_BOOL eof = VARIANT_TRUE; SUCCEEDED(rs_chars->get_EOF(&eof)) && !eof; rs_chars->MoveNext()) {
             wchar_t c;
             wxCHECK(GetUnicodeCharacter(f_char, c), false);
@@ -865,20 +902,20 @@ bool ZRCola::DBSource::GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, c
 }
 
 
-bool ZRCola::DBSource::SelectCharacters(ATL::CComPtr<ADORecordset>& rs) const
+bool ZRCola::DBSource::SelectCharacters(com_obj<ADORecordset>& rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
-        L"SELECT DISTINCT [znak], [opis_en], [klj_bes_en], [kat], [znak_v], [znak_m] "
+    if (FAILED(rs->Open(variant(
+        L"SELECT DISTINCT [znak], [opis_en], [kat], [znak_v], [znak_m] "
         L"FROM [VRS_CharList] "
         L"WHERE "
         L"[aktiven]=1 AND " // Active characters only
         L"[kat]<>'g' "      // Ignore "Other, Control" category!
-        L"ORDER BY [znak]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [znak]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0120: Error loading characters from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -889,55 +926,47 @@ bool ZRCola::DBSource::SelectCharacters(ATL::CComPtr<ADORecordset>& rs) const
 }
 
 
-bool ZRCola::DBSource::GetCharacter(const ATL::CComPtr<ADORecordset>& rs, character& chr) const
+bool ZRCola::DBSource::GetCharacter(const com_obj<ADORecordset>& rs, character& chr) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
     wchar_t c;
     chr.rel.clear();
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"znak"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak"), &f)));
         wxCHECK(GetUnicodeCharacter(f, chr.chr), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"znak_v"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak_v"), &f)));
         wxCHECK(GetUnicodeCharacter(f, c), false);
         if (c && c != chr.chr)
             chr.rel += c;
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"znak_m"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak_m"), &f)));
         wxCHECK(GetUnicodeCharacter(f, c), false);
         if (c && c != chr.chr)
             chr.rel += c;
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_en"), &f)));
         wxCHECK(GetValue(f, chr.desc), false);
     }
     ZRCola::DBSource::character_desc_idx::parse_keywords(chr.desc.c_str(), chr.terms);
 
-    wstring keywords;
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"klj_bes_en"), &f)));
-        wxCHECK(GetValue(f, keywords), false);
-    }
-    ZRCola::DBSource::character_desc_idx::parse_keywords(keywords.c_str(), chr.terms);
-
-    {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"kat"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"kat"), &f)));
         wxCHECK(GetChrCat(f, chr.cat), false);
     }
 
@@ -945,18 +974,18 @@ bool ZRCola::DBSource::GetCharacter(const ATL::CComPtr<ADORecordset>& rs, charac
 }
 
 
-bool ZRCola::DBSource::SelectCharacterCategories(ATL::CComPtr<ADORecordset>& rs) const
+bool ZRCola::DBSource::SelectCharacterCategories(com_obj<ADORecordset>& rs) const
 {
     // Create a new recordset.
-    if (rs) rs.Release();
+    rs.free();
     wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
 
     // Open it.
-    if (FAILED(rs->Open(ATL::CComVariant(
+    if (FAILED(rs->Open(variant(
         L"SELECT DISTINCT [kat], [opis_en], [Rang] "
         L"FROM [VRS_CharCategory] "
         L"WHERE [kat]<>'g' "    // Ignore "Other, Control" category!
-        L"ORDER BY [Rang], [opis_en]"), ATL::CComVariant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+        L"ORDER BY [Rang], [opis_en]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
     {
         _ftprintf(stderr, wxT("%s: error ZCC0130: Error loading character categories from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
         LogErrors();
@@ -967,31 +996,143 @@ bool ZRCola::DBSource::SelectCharacterCategories(ATL::CComPtr<ADORecordset>& rs)
 }
 
 
-bool ZRCola::DBSource::GetCharacterCategory(const ATL::CComPtr<ADORecordset>& rs, chrcat& cc) const
+bool ZRCola::DBSource::GetCharacterCategory(const com_obj<ADORecordset>& rs, chrcat& cc) const
 {
     wxASSERT_MSG(rs, wxT("recordset is empty"));
 
-    ATL::CComPtr<ADOFields> flds;
+    com_obj<ADOFields> flds;
     wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
     wstring id;
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"kat"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"kat"), &f)));
         wxCHECK(GetChrCat(f, cc.id), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"Rang"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"Rang"), &f)));
         wxCHECK(GetValue(f, cc.rank), false);
     }
 
     {
-        ATL::CComPtr<ADOField> f;
-        wxVERIFY(SUCCEEDED(flds->get_Item(ATL::CComVariant(L"opis_en"), &f)));
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_en"), &f)));
         wxCHECK(GetValue(f, cc.name), false);
     }
 
     return true;
 }
+
+
+bool ZRCola::DBSource::SelectCharacterTags(winstd::com_obj<ADORecordset>& rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
+
+    // Open it.
+    if (FAILED(rs->Open(variant(
+        L"SELECT DISTINCT [znak], [oznaka] "
+        L"FROM [VRS_CharTags] "
+        L"ORDER BY [znak], [oznaka]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+    {
+        _ftprintf(stderr, wxT("%s: error ZCC0130: Error loading character tags from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetCharacterTag(const winstd::com_obj<ADORecordset>& rs, chrtag& ct) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+    wstring id;
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"znak"), &f)));
+        wxCHECK(GetUnicodeCharacter(f, ct.chr), false);
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"oznaka"), &f)));
+        wxCHECK(GetValue(f, ct.tag), false);
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::SelectTagNames(winstd::com_obj<ADORecordset>& rs) const
+{
+    // Create a new recordset.
+    rs.free();
+    wxCHECK(SUCCEEDED(::CoCreateInstance(CLSID_CADORecordset, NULL, CLSCTX_ALL, IID_IADORecordset, (LPVOID*)&rs)), false);
+
+    // Open it.
+    if (FAILED(rs->Open(variant(
+        L"SELECT DISTINCT [oznaka], [opis_en], [opis_sl], [opis_ru] "
+        L"FROM [VRS_Tags] "
+        L"ORDER BY [oznaka]"), variant(m_db), adOpenStatic, adLockReadOnly, adCmdText)))
+    {
+        _ftprintf(stderr, wxT("%s: error ZCC0130: Error loading tags from database. Please make sure the file is ZRCola.zrc compatible.\n"), m_filename.c_str());
+        LogErrors();
+        return false;
+    }
+
+    return true;
+}
+
+
+bool ZRCola::DBSource::GetTagName(const winstd::com_obj<ADORecordset>& rs, tagname& tn) const
+{
+    wxASSERT_MSG(rs, wxT("recordset is empty"));
+
+    com_obj<ADOFields> flds;
+    wxVERIFY(SUCCEEDED(rs->get_Fields(&flds)));
+    wstring id;
+    tn.names.clear();
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"oznaka"), &f)));
+        wxCHECK(GetValue(f, tn.tag), false);
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_en"), &f)));
+        LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), SORT_DEFAULT);
+        list<wstring> names;
+        wxCHECK(GetTagNames(f, lcid, names), false);
+        tn.names.insert(std::move(pair<LCID, list<wstring> >(lcid, std::move(names))));
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_sl"), &f)));
+        LCID lcid = MAKELCID(MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), SORT_DEFAULT);
+        list<wstring> names;
+        wxCHECK(GetTagNames(f, lcid, names), false);
+        tn.names.insert(std::move(pair<LCID, list<wstring> >(lcid, std::move(names))));
+    }
+
+    {
+        com_obj<ADOField> f;
+        wxVERIFY(SUCCEEDED(flds->get_Item(variant(L"opis_ru"), &f)));
+        LCID lcid = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_DEFAULT), SORT_DEFAULT);
+        list<wstring> names;
+        wxCHECK(GetTagNames(f, lcid, names), false);
+        tn.names.insert(std::move(pair<LCID, list<wstring> >(lcid, std::move(names))));
+    }
+
+    return true;
+}

ZRColaCompile/dbsource.h

@@ -22,8 +22,11 @@
 #include <zrcola/character.h>
 #include <zrcola/common.h>
 
-#include <atlbase.h>
+#include <WinStd/COM.h>
+#include <WinStd/Win.h>
+
 #include <adoint.h>
+#include <list>
 #include <map>
 #include <memory>
 #include <set>
@@ -38,14 +41,46 @@ namespace ZRCola {
     class DBSource
     {
     public:
+        ///
+        /// Character sequence
+        ///
+        class charseq {
+        public:
+            int rank;         ///< Sequence rank
+            std::wstring str; ///< Sequence string
+
+            inline charseq()
+            {
+            }
+
+            inline charseq(_In_ int _rank, _In_z_ const wchar_t *_str) :
+                rank(_rank),
+                str (_str)
+            {
+            }
+
+            ///
+            /// Functor to compare two sequences by `rank`, and `str` members respectively
+            ///
+            struct less_rank_str {
+                inline bool operator()(_In_ const charseq& a, _In_ const charseq& b) const
+                {
+                         if (a.rank < b.rank) return true;
+                    else if (a.rank > b.rank) return false;
+                    else if (a.str  < b.str ) return true;
+                    else                      return false;
+                }
+            };
+        };
+
+
         ///
         /// Translation
         ///
         class translation {
         public:
             wchar_t chr;                ///< Composed character
-            std::wstring str;           ///< Decomposed string
-            int rank;                   ///< Decomposition rank
+            charseq decomp;             ///< Decomposed sequence
         };
 
 
@@ -171,20 +206,15 @@ namespace ZRCola {
             void build_related();
 
         protected:
-            class build_related_worker : public std::unique_ptr<void, stdex::CloseHandle_delete<void> >
+            class build_related_worker : public winstd::win_handle
             {
-            public:
-                typedef std::unique_ptr<void, stdex::CloseHandle_delete<void> > thread_type;
-
             public:
                 build_related_worker(_In_ const character_bank *cb, _In_ size_type from, _In_ size_type to);
-                virtual ~build_related_worker();
 
                 inline void join()
                 {
-                    HANDLE h = get();
-                    if (h)
-                        WaitForSingleObject(h, INFINITE);
+                    if (m_h)
+                        WaitForSingleObject(m_h, INFINITE);
                 }
 
             private:
@@ -201,7 +231,7 @@ namespace ZRCola {
             protected:
                 const character_bank *m_cb;
                 size_type m_from, m_to;
-                HANDLE m_heap;
+                winstd::heap m_heap;
             };
 
         protected:
@@ -256,7 +286,7 @@ namespace ZRCola {
                 } else {
                     // Append to existing keyword.
                     std::vector<wchar_t> &val = idx->second;
-                    for (std::vector<wchar_t>::iterator i = val.begin(), i_end = val.end(); ; ++i) {
+                    for (auto i = val.cbegin(), i_end = val.cend(); ; ++i) {
                         if (i == i_end) {
                             // End-of-values reached. Append character.
                             val.push_back(chr);
@@ -282,11 +312,30 @@ namespace ZRCola {
         };
 
 
+        ///
+        /// Character tag
+        ///
+        class chrtag {
+        public:
+            wchar_t chr;                ///> Character
+            int tag;                    ///< Tag ID
+        };
+
+
+        ///
+        /// Tag name
+        ///
+        class tagname {
+        public:
+            int tag;                    ///< Tag ID
+            std::map<LCID, std::list<std::wstring> > names; ///< Names
+        };
+
+
     public:
         DBSource();
         virtual ~DBSource();
 
-
         ///
         /// Opens the database
         ///
@@ -298,13 +347,11 @@ namespace ZRCola {
         ///
         bool Open(LPCTSTR filename);
 
-
         ///
         /// Logs errors in database connections
         ///
         void LogErrors() const;
 
-
         ///
         /// Is recordset at end
         ///
@@ -314,13 +361,12 @@ namespace ZRCola {
         /// - true when at end
         /// - false otherwise
         ///
-        static inline bool IsEOF(const ATL::CComPtr<ADORecordset>& rs)
+        static inline bool IsEOF(const winstd::com_obj<ADORecordset>& rs)
         {
             VARIANT_BOOL eof = VARIANT_TRUE;
             return FAILED(rs->get_EOF(&eof)) || eof ? true : false;
         }
 
-
         ///
         /// Gets number of records in a recordset
         ///
@@ -328,13 +374,12 @@ namespace ZRCola {
         ///
         /// \returns Number of records
         ///
-        static inline size_t GetRecordsetCount(const ATL::CComPtr<ADORecordset>& rs)
+        static inline size_t GetRecordsetCount(const winstd::com_obj<ADORecordset>& rs)
         {
             ADO_LONGPTR count;
             return SUCCEEDED(rs->get_RecordCount(&count)) ? count : (size_t)-1;
         }
 
-
         ///
         /// Splits string to individual keywords
         ///
@@ -347,7 +392,6 @@ namespace ZRCola {
         ///
         static bool GetKeywords(const wchar_t *str, std::vector< std::wstring > &keywords);
 
-
         ///
         /// Gets boolean from ZRCola.zrc database
         ///
@@ -358,8 +402,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetValue(const ATL::CComPtr<ADOField>& f, bool& val) const;
-
+        bool GetValue(const winstd::com_obj<ADOField>& f, bool& val) const;
 
         ///
         /// Gets integer from ZRCola.zrc database
@@ -371,8 +414,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetValue(const ATL::CComPtr<ADOField>& f, int& val) const;
-
+        bool GetValue(const winstd::com_obj<ADOField>& f, int& val) const;
 
         ///
         /// Gets string from ZRCola.zrc database
@@ -384,8 +426,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetValue(const ATL::CComPtr<ADOField>& f, std::wstring& val) const;
-
+        bool GetValue(const winstd::com_obj<ADOField>& f, std::wstring& val) const;
 
         ///
         /// Gets encoded Unicode character from ZRCola.zrc database
@@ -397,8 +438,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetUnicodeCharacter(const ATL::CComPtr<ADOField>& f, wchar_t& chr) const;
-
+        bool GetUnicodeCharacter(const winstd::com_obj<ADOField>& f, wchar_t& chr) const;
 
         ///
         /// Gets encoded Unicode string from ZRCola.zrc database
@@ -410,8 +450,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetUnicodeString(const ATL::CComPtr<ADOField>& f, std::wstring& str) const;
-
+        bool GetUnicodeString(const winstd::com_obj<ADOField>& f, std::wstring& str) const;
 
         ///
         /// Gets language ID from ZRCola.zrc database
@@ -423,8 +462,7 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetLanguage(const ATL::CComPtr<ADOField>& f, langid_t& lang) const;
-
+        bool GetLanguage(const winstd::com_obj<ADOField>& f, langid_t& lang) const;
 
         ///
         /// Gets character category ID from ZRCola.zrc database
@@ -436,8 +474,19 @@ namespace ZRCola {
         /// - true when successful
         /// - false otherwise
         ///
-        bool GetChrCat(const ATL::CComPtr<ADOField>& f, chrcatid_t& cc) const;
+        bool GetChrCat(const winstd::com_obj<ADOField>& f, chrcatid_t& cc) const;
 
+        ///
+        /// Gets tag names from ZRCola.zrc database
+        ///
+        /// \param[in]  f      Data field
+        /// \param[out] names  Output names
+        ///
+        /// \returns
+        /// - true when successful
+        /// - false otherwise
+        ///
+        bool GetTagNames(const winstd::com_obj<ADOField>& f, LCID lcid, std::list<std::wstring>& names) const;
 
         ///
         /// Returns character translations
@@ -448,8 +497,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectTranslations(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectTranslations(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns translation data
@@ -461,8 +509,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetTranslation(const ATL::CComPtr<ADORecordset>& rs, translation& t) const;
-
+        bool GetTranslation(const winstd::com_obj<ADORecordset>& rs, translation& t) const;
 
         ///
         /// Returns key sequences
@@ -473,8 +520,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectKeySequences(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectKeySequences(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns key sequence data
@@ -486,8 +532,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetKeySequence(const ATL::CComPtr<ADORecordset>& rs, keyseq& ks) const;
-
+        bool GetKeySequence(const winstd::com_obj<ADORecordset>& rs, keyseq& ks) const;
 
         ///
         /// Returns languages
@@ -498,8 +543,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectLanguages(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectLanguages(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns language data
@@ -511,8 +555,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetLanguage(const ATL::CComPtr<ADORecordset>& rs, language& lang) const;
-
+        bool GetLanguage(const winstd::com_obj<ADORecordset>& rs, language& lang) const;
 
         ///
         /// Returns language character
@@ -523,8 +566,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectLanguageCharacters(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectLanguageCharacters(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns language character data
@@ -536,8 +578,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetLanguageCharacter(const ATL::CComPtr<ADORecordset>& rs, langchar& lc) const;
-
+        bool GetLanguageCharacter(const winstd::com_obj<ADORecordset>& rs, langchar& lc) const;
 
         ///
         /// Returns character groups
@@ -548,8 +589,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectCharacterGroups(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectCharacterGroups(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns character group data
@@ -561,7 +601,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetCharacterGroup(const ATL::CComPtr<ADORecordset>& rs, chrgrp& cg) const;
+        bool GetCharacterGroup(const winstd::com_obj<ADORecordset>& rs, chrgrp& cg) const;
 
         ///
         /// Returns characters
@@ -572,8 +612,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectCharacters(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectCharacters(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns character data
@@ -585,7 +624,7 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetCharacter(const ATL::CComPtr<ADORecordset>& rs, character& chr) const;
+        bool GetCharacter(const winstd::com_obj<ADORecordset>& rs, character& chr) const;
 
         ///
         /// Returns character categories
@@ -596,8 +635,7 @@ namespace ZRCola {
         /// - true when query succeeds
         /// - false otherwise
         ///
-        bool SelectCharacterCategories(ATL::CComPtr<ADORecordset>& rs) const;
-
+        bool SelectCharacterCategories(winstd::com_obj<ADORecordset>& rs) const;
 
         ///
         /// Returns character category data
@@ -609,14 +647,60 @@ namespace ZRCola {
         /// - true when succeeded
         /// - false otherwise
         ///
-        bool GetCharacterCategory(const ATL::CComPtr<ADORecordset>& rs, chrcat& cc) const;
+        bool GetCharacterCategory(const winstd::com_obj<ADORecordset>& rs, chrcat& cc) const;
+
+        ///
+        /// Returns character tags
+        ///
+        /// \param[out] rs  Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectCharacterTags(winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns character tag data
+        ///
+        /// \param[in]  rs    Recordset with results
+        /// \param[out] cc    Character tag
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetCharacterTag(const winstd::com_obj<ADORecordset>& rs, chrtag& tc) const;
+
+        ///
+        /// Returns tag names
+        ///
+        /// \param[out] rs  Recordset with results
+        ///
+        /// \returns
+        /// - true when query succeeds
+        /// - false otherwise
+        ///
+        bool SelectTagNames(winstd::com_obj<ADORecordset>& rs) const;
+
+        ///
+        /// Returns tag name data
+        ///
+        /// \param[in]  rs    Recordset with results
+        /// \param[out] tn    Tag name
+        ///
+        /// \returns
+        /// - true when succeeded
+        /// - false otherwise
+        ///
+        bool GetTagName(const winstd::com_obj<ADORecordset>& rs, tagname& tn) const;
 
     protected:
         std::basic_string<TCHAR> m_filename;    ///< Database filename
-        ATL::CComPtr<ADOConnection> m_db;       ///< Database
+        winstd::com_obj<ADOConnection> m_db;       ///< Database
         _locale_t m_locale;                     ///< Database locale
 
-        ATL::CComPtr<ADOCommand> m_comCharacterGroup;   ///< ADO Command for GetCharacterGroup subquery
-        ATL::CComPtr<ADOParameter> m_pCharacterGroup1;  ///< \c m_comCharacterGroup parameter
+        winstd::com_obj<ADOCommand> m_comCharacterGroup;   ///< ADO Command for GetCharacterGroup subquery
+        winstd::com_obj<ADOParameter> m_pCharacterGroup1;  ///< \c m_comCharacterGroup parameter
     };
 };

ZRColaCompile/locale/ZRColaCompile.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRColaCompile\n"
-"POT-Creation-Date: 2016-05-13 20:00+0200\n"
+"POT-Creation-Date: 2016-10-13 11:49+0200\n"
 "PO-Revision-Date: 2016-04-13 18:11+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\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"
@@ -18,22 +18,18 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: main.cpp:53
-#, fuzzy
+#: main.cpp:102
 msgid "Show this help message"
-msgstr "Pokaži to sporočilo pomoči"
+msgstr ""
 
-#: main.cpp:54
-#, fuzzy
+#: main.cpp:103
 msgid "<input file>"
-msgstr "<vhodna datoteka>"
+msgstr ""
 
-#: main.cpp:55
-#, fuzzy
+#: main.cpp:104
 msgid "<output file>"
-msgstr "<izhodna datoteka>"
+msgstr ""
 
-#: main.cpp:56
-#, fuzzy
+#: main.cpp:105
 msgid "<output POT catalog>"
-msgstr "<izhodni katalog POT>"
+msgstr ""

ZRColaCompile/locale/de_DE.po

@@ -1,33 +1,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRColaCompile\n"
-"POT-Creation-Date: 2016-05-13 20:01+0200\n"
-"PO-Revision-Date: 2016-05-13 20:01+0200\n"
+"POT-Creation-Date: 2016-10-05 10:59+0200\n"
+"PO-Revision-Date: 2016-10-05 10:59+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.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 
-#: main.cpp:53
-#, fuzzy
+#: main.cpp:56
 msgid "Show this help message"
 msgstr "Zeige diesen Hilfstext"
 
-#: main.cpp:54
+#: main.cpp:57
 msgid "<input file>"
 msgstr ""
 
-#: main.cpp:55
+#: main.cpp:58
 msgid "<output file>"
 msgstr ""
 
-#: main.cpp:56
+#: main.cpp:59
 msgid "<output POT catalog>"
 msgstr ""

ZRColaCompile/locale/ru_RU.po

@@ -1,33 +1,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRColaCompile\n"
-"POT-Creation-Date: 2016-05-13 20:01+0200\n"
-"PO-Revision-Date: 2016-05-13 20:01+0200\n"
+"POT-Creation-Date: 2016-10-05 11:00+0200\n"
+"PO-Revision-Date: 2016-10-05 11:00+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 
-#: main.cpp:53
+#: main.cpp:56
 msgid "Show this help message"
 msgstr ""
 
-#: main.cpp:54
+#: main.cpp:57
 msgid "<input file>"
 msgstr ""
 
-#: main.cpp:55
+#: main.cpp:58
 msgid "<output file>"
 msgstr ""
 
-#: main.cpp:56
+#: main.cpp:59
 msgid "<output POT catalog>"
 msgstr ""

ZRColaCompile/locale/sl_SI.po

@@ -1,33 +1,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRColaCompile\n"
-"POT-Creation-Date: 2016-05-13 20:00+0200\n"
-"PO-Revision-Date: 2016-05-13 20:00+0200\n"
+"POT-Creation-Date: 2016-10-05 10:59+0200\n"
+"PO-Revision-Date: 2016-10-05 11:00+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.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 
-#: main.cpp:53
+#: main.cpp:56
 msgid "Show this help message"
 msgstr "Pokaži to sporočilo pomoči"
 
-#: main.cpp:54
+#: main.cpp:57
 msgid "<input file>"
 msgstr "<vhodna datoteka>"
 
-#: main.cpp:55
+#: main.cpp:58
 msgid "<output file>"
 msgstr "<izhodna datoteka>"
 
-#: main.cpp:56
+#: main.cpp:59
 msgid "<output POT catalog>"
 msgstr "<izhodni katalog POT>"

ZRColaCompile/main.cpp

@@ -21,6 +21,56 @@
 
 using namespace std;
 using namespace stdex;
+using namespace winstd;
+
+
+typedef map<wchar_t, set<ZRCola::DBSource::charseq, ZRCola::DBSource::charseq::less_rank_str> > translation_db;
+
+
+static set<wstring> decompose(_In_ const translation_db &db, _In_z_ const wchar_t *str, _Inout_ set<wchar_t> &path)
+{
+    set<wstring> res;
+
+    if (*str) {
+        // Decompose remainder first.
+        auto rem = decompose(db, str + 1, path);
+        if (rem.empty())
+            return res;
+
+        auto const t = db.find(*str);
+        if (t != db.end()) {
+            // Current characted decomposed. Iterate all possible decompositions and combine them with the remainder.
+            auto p = path.insert(*str);
+            if (!p.second) {
+                // Path already contains this character: Cycle detected!
+                return res;
+            }
+            for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
+                auto dec = decompose(db, d->str.c_str(), path);
+                if (!dec.empty()) {
+                    for (auto dd = dec.cbegin(), dd_end = dec.cend(); dd != dd_end; ++dd) {
+                        for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
+                            res.insert(*dd + *r);
+                    }
+                } else {
+                    // Cycle detected. Do not continue decomposition.
+                    for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
+                        res.insert(wstring(1, *str) + *r);
+                }
+            }
+            path.erase(p.first);
+        } else {
+            // Current character is non-decomposable. Combine it with the remainder(s).
+            for (auto r = rem.cbegin(), r_end = rem.cend(); r != r_end; ++r)
+                res.insert(wstring(1, *str) + *r);
+        }
+    } else {
+        // Empty string results in empty decomposition.
+        res.insert(L"");
+    }
+
+    return res;
+}
 
 
 ///
@@ -30,25 +80,21 @@ int _tmain(int argc, _TCHAR *argv[])
 {
     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "program");
 
-    // Inizialize wxWidgets.
+    // Initialize wxWidgets.
     wxInitializer initializer;
     if (!initializer) {
         _ftprintf(stderr, wxT("Failed to initialize the wxWidgets library, aborting.\n"));
         return -1;
     }
 
-    wxConfig config(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);
 
-    // Set desired locale.
+    // Initialize locale.
     wxLocale locale;
-    wxLanguage language = (wxLanguage)config.Read(wxT("Language"), wxLANGUAGE_DEFAULT);
-    if (wxLocale::IsAvailable(language)) {
-        wxString sPath;
-        if (config.Read(wxT("LocalizationRepositoryPath"), &sPath))
-            locale.AddCatalogLookupPathPrefix(sPath);
-        wxVERIFY(locale.Init(language));
+    if (wxInitializeLocale(locale))
         wxVERIFY(locale.AddCatalog(wxT("ZRColaCompile")));
-    }
 
     // Parse command line.
     static const wxCmdLineEntryDesc cmdLineDesc[] =
@@ -107,11 +153,52 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get translations.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectTranslations(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
-                ZRCola::DBSource::translation trans;
+                // Parse translations and build temporary database.
+                translation_db db_temp1;
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read translation from the database.
+                    ZRCola::DBSource::translation trans;
+                    if (src.GetTranslation(rs, trans)) {
+                        // Add translation to temporary database.
+                        auto const t = db_temp1.find(trans.chr);
+                        if (t != db_temp1.end())
+                            t->second.insert(std::move(trans.decomp));
+                        else {
+                            translation_db::mapped_type d;
+                            d.insert(std::move(trans.decomp));
+                            db_temp1.insert(std::move(pair<translation_db::key_type, translation_db::mapped_type>(trans.chr, std::move(d))));
+                        }
+                    } else
+                        has_errors = true;
+                }
+
+                // Decompose decompositions down to non-decomposable characters.
+                translation_db db_temp2;
+                for (auto t1 = db_temp1.cbegin(), t1_end = db_temp1.cend(); t1 != t1_end; ++t1) {
+                    for (auto d1 = t1->second.cbegin(), d1_end = t1->second.cend(); d1 != d1_end; ++d1) {
+                        set<wchar_t> path;
+                        path.insert(t1->first);
+                        auto str = decompose(db_temp1, d1->str.c_str(), path);
+                        assert(!str.empty());
+
+                        // Add translation to temporary database.
+                        auto const t2 = db_temp2.find(t1->first);
+                        if (t2 != db_temp2.end()) {
+                            for (auto s = str.cbegin(), s_end = str.cend(); s != s_end; ++s)
+                                t2->second.insert(std::move(ZRCola::DBSource::charseq(d1->rank, s->c_str())));
+                        } else {
+                            translation_db::mapped_type d2;
+                            for (auto s = str.cbegin(), s_end = str.cend(); s != s_end; ++s)
+                                d2.insert(std::move(ZRCola::DBSource::charseq(d1->rank, s->c_str())));
+                            db_temp2.insert(std::move(pair<translation_db::key_type, translation_db::mapped_type>(t1->first, std::move(d2))));
+                        }
+                    }
+                }
+
                 ZRCola::translation_db db;
 
                 // Preallocate memory.
@@ -120,23 +207,21 @@ int _tmain(int argc, _TCHAR *argv[])
                 db.data     .reserve(count*4);
 
                 // Parse translations and build index and data.
-                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
-                    // Read translation from the database.
-                    if (src.GetTranslation(rs, trans)) {
-                        // Add translation to index and data.
+                for (auto t = db_temp2.cbegin(), t_end = db_temp2.cend(); t != t_end; ++t) {
+                    // Add translation to index and data.
+                    for (auto d = t->second.cbegin(), d_end = t->second.cend(); d != d_end; ++d) {
                         unsigned __int32 idx = db.data.size();
-                        db.data.push_back(trans.chr);
-                        wxASSERT_MSG((int)0xffff8000 <= trans.rank && trans.rank <= (int)0x00007fff, wxT("transformation rank out of bounds"));
-                        db.data.push_back((unsigned __int16)trans.rank);
-                        wstring::size_type n = trans.str.length();
+                        db.data.push_back(t->first);
+                        wxASSERT_MSG((int)0xffff8000 <= d->rank && d->rank <= (int)0x00007fff, wxT("transformation rank out of bounds"));
+                        db.data.push_back((unsigned __int16)d->rank);
+                        wstring::size_type n = d->str.length();
                         wxASSERT_MSG(n <= 0xffff, wxT("transformation string too long"));
                         db.data.push_back((unsigned __int16)n);
                         for (wstring::size_type i = 0; i < n; i++)
-                            db.data.push_back(trans.str[i]);
+                            db.data.push_back(d->str[i]);
                         db.idxComp  .push_back(idx);
                         db.idxDecomp.push_back(idx);
-                    } else
-                        has_errors = true;
+                    }
                 }
 
                 // Sort indices.
@@ -157,7 +242,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get key sequences.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectKeySequences(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -224,7 +309,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get languages.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectLanguages(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -273,7 +358,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get language characters.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectLanguageCharacters(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -324,7 +409,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get character groups.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectCharacterGroups(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -389,7 +474,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get characters.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectCharacters(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -402,7 +487,7 @@ int _tmain(int argc, _TCHAR *argv[])
                     // Read character from the database.
                     unique_ptr<ZRCola::DBSource::character> c(new ZRCola::DBSource::character);
                     if (src.GetCharacter(rs, *c)) {
-                        const ZRCola::DBSource::character &chr = *c.get();
+                        const auto &chr = *c.get();
                         chrs[chr.chr].swap(c);
                     } else
                         has_errors = true;
@@ -419,7 +504,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
                 // Phase 3: Parse characters and build index and data.
                 for (size_t i = 0, i_end = chrs.size(); i < i_end; i++) {
-                    const ZRCola::DBSource::character &chr = *(chrs[i].get());
+                    const auto &chr = *(chrs[i].get());
                     if (&chr == NULL) continue;
 
                     // Add character to index and data.
@@ -468,7 +553,7 @@ int _tmain(int argc, _TCHAR *argv[])
 
     {
         // Get character categories.
-        ATL::CComPtr<ADORecordset> rs;
+        com_obj<ADORecordset> rs;
         if (src.SelectCharacterCategories(rs)) {
             size_t count = src.GetRecordsetCount(rs);
             if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
@@ -525,6 +610,106 @@ int _tmain(int argc, _TCHAR *argv[])
         }
     }
 
+    {
+        // Get characters tags.
+        com_obj<ADORecordset> rs;
+        if (src.SelectCharacterTags(rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                ZRCola::DBSource::chrtag ct;
+                ZRCola::chrtag_db db;
+
+                // Preallocate memory.
+                db.idxChr.reserve(count);
+                db.idxTag.reserve(count);
+                db.data  .reserve(count*4);
+
+                // Parse characters tags and build index and data.
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read characters tags from the database.
+                    if (src.GetCharacterTag(rs, ct)) {
+                        // Add characters tags to index and data.
+                        unsigned __int32 idx = db.data.size();
+                        db.data.push_back(ct.chr);
+                        wxASSERT_MSG((int)0xffff8000 <= ct.tag && ct.tag <= (int)0x00007fff, wxT("tag out of bounds"));
+                        db.data.push_back((unsigned __int16)ct.tag);
+                        db.idxChr.push_back(idx);
+                        db.idxTag.push_back(idx);
+                    } else
+                        has_errors = true;
+                }
+
+                // Sort indices.
+                db.idxChr .sort();
+                db.idxTag.sort();
+
+                // Write characters tags to file.
+                dst << ZRCola::chrtag_rec(db);
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0021: Error getting characters tags count from database or too many character tags.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0020: Error getting characters tags from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
+    {
+        // Get tag names.
+        com_obj<ADORecordset> rs;
+        if (src.SelectTagNames(rs)) {
+            size_t count = src.GetRecordsetCount(rs);
+            if (count < 0xffffffff) { // 4G check (-1 is reserved for error condition)
+                ZRCola::DBSource::tagname tn;
+                ZRCola::tagname_db db;
+
+                // Preallocate memory.
+                db.idxName.reserve(count*3);
+                db.idxTag .reserve(count*3);
+                db.data   .reserve(count*3*4);
+
+                // Parse tags and build index and data.
+                for (; !ZRCola::DBSource::IsEOF(rs); rs->MoveNext()) {
+                    // Read tag name from the database.
+                    if (src.GetTagName(rs, tn)) {
+                        // Add tag name to index and data.
+                        for (auto ln = tn.names.cbegin(), ln_end = tn.names.cend(); ln != ln_end; ++ln) {
+                            for (auto nm = ln->second.cbegin(), nm_end = ln->second.cend(); nm != nm_end; ++nm) {
+                                unsigned __int32 idx = db.data.size();
+                                wxASSERT_MSG((int)0xffff8000 <= tn.tag && tn.tag <= (int)0x00007fff, wxT("tag out of bounds"));
+                                db.data.push_back((unsigned __int16)tn.tag);
+                                db.data.push_back(LOWORD(ln->first));
+                                db.data.push_back(HIWORD(ln->first));
+                                wstring::size_type n = nm->length();
+                                wxASSERT_MSG(n <= 0xffff, wxT("tag name too long"));
+                                db.data.push_back((unsigned __int16)n);
+                                for (wstring::size_type i = 0; i < n; i++)
+                                    db.data.push_back(nm->at(i));
+                                db.idxName.push_back(idx);
+                                db.idxTag .push_back(idx);
+                            }
+                        }
+                    } else
+                        has_errors = true;
+                }
+
+                // Sort indices.
+                db.idxName.sort();
+                db.idxTag .sort();
+
+                // Write tags to file.
+                dst << ZRCola::tagname_rec(db);
+            } else {
+                _ftprintf(stderr, wxT("%s: error ZCC0023: Error getting tag name count from database or too many tags.\n"), (LPCTSTR)filenameIn.c_str());
+                has_errors = true;
+            }
+        } else {
+            _ftprintf(stderr, wxT("%s: error ZCC0022: Error getting tags from database. Please make sure the file is ZRCola.zrc compatible.\n"), (LPCTSTR)filenameIn.c_str());
+            has_errors = true;
+        }
+    }
+
     idrec::close<ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>(dst, dst_start);
 
     if (dst.fail()) {
@@ -543,10 +728,10 @@ int _tmain(int argc, _TCHAR *argv[])
                 << "\"MIME-Version: 1.0\\n\"" << endl
                 << "\"Content-Type: text/plain; charset=UTF-8\\n\"" << endl
                 << "\"Content-Transfer-Encoding: 8bit\\n\"" << endl
-                << "\"X-Generator: ZRColaCompile " << ZRCOLA_VERSION_STR << "\\n\"" << endl;
+                << "\"X-Generator: ZRColaCompile\\n\"" << endl;
 
             wstring_convert<codecvt_utf8<wchar_t>> conv;
-            for (set<wstring>::const_iterator i = pot.cbegin(); i != pot.cend(); ++i) {
+            for (auto i = pot.cbegin(); i != pot.cend(); ++i) {
                 // Convert UTF-16 to UTF-8 and escape.
                 string t(conv.to_bytes(*i)), u;
                 for (size_t i = 0, n = t.size(); i < n; i++) {

ZRColaCompile/stdafx.h

@@ -19,13 +19,12 @@
 
 #pragma once
 
-#define _ATL_NO_AUTOMATIC_NAMESPACE
-
-#include "../include/zrcola.h"
+#include "../include/version.h"
 #include "dbsource.h"
 
 #include <zrcola/language.h>
 #include <zrcola/translate.h>
+#include <zrcola/tag.h>
 #include <zrcolaui/chargroup.h>
 #include <zrcolaui/keyboard.h>
 
@@ -39,11 +38,13 @@
 
 #include <stdex/idrec.h>
 
+#include <WinStd/Common.h>
+
 #include <initguid.h> // GUID helper to prevent LNK2001 errors (unresolved external symbol IID_IADO...)
 #include <adoint.h>
 #include <adoid.h>
-#include <atlcomcli.h>
 
+#include <process.h>
 #include <tchar.h>
 
 #include <stdlib.h>

ZRColaUtils.sln

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ECE3F336-FFD2-41EE-AD8F-17BD7472BDCB}"
 	ProjectSection(SolutionItems) = preProject
-		include\zrcola.h = include\zrcola.h
+		include\version.h = include\version.h
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}"
@@ -28,6 +28,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaIn
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallRu", "ZRColaInstall\ZRColaInstallRu.vcxproj", "{2551B561-5E5B-497E-AE01-11519F91EF19}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -98,6 +100,14 @@ Global
 		{2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.ActiveCfg = Release|Win32
 		{2551B561-5E5B-497E-AE01-11519F91EF19}.Release|Win32.Build.0 = Release|Win32
 		{2551B561-5E5B-497E-AE01-11519F91EF19}.Release|x64.ActiveCfg = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -107,6 +117,7 @@ Global
 		{A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{518777CC-0A59-4415-A12A-82751ED75343} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{C0A84BD2-3870-4CD6-B281-0AB322E3C579} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
+		{47399D91-7EB9-41DE-B521-514BA5DB0C43} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}
 		{0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
 		{620D6AC0-C8FF-4185-B820-DB1503ACB95C} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}
 		{5BD95B95-38B0-4C7D-9471-F99CA1203DF4} = {7F5D45A3-B3D2-4B1D-B258-9B83395786E6}

include/UpdaterCfg.h

@@ -1,4 +1,4 @@
-#include "zrcola.h"
+#include "version.h"
 
 //
 // Update server(s)
@@ -15,22 +15,3 @@
 // Update server catalog location
 //
 #define UPDATER_HTTP_PATH           "/prenos/ZRCola/catalog-0000.xml"
-
-
-//
-// The product vendor and application name for configuration keeping.
-//
-#define UPDATER_CFG_VENDOR          "Amebis"
-#define UPDATER_CFG_APPLICATION     "ZRCola"
-
-
-//
-// Product version as a single DWORD
-// Note: Used for version comparison within C/C++ code.
-//
-#define UPDATER_PRODUCT_VERSION     ZRCOLA_VERSION
-
-//
-// Human readable product version and build year for UI
-//
-#define UPDATER_PRODUCT_VERSION_STR ZRCOLA_VERSION_STR

include/common.props

@@ -21,7 +21,9 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="xgettext.props" />
   </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Label="UserMacros">
+    <UpdaterVersion>ZRCola</UpdaterVersion>
+  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName>
     <IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>

include/version.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define ZRCOLA_VERSION          0x01ff1100
+#define PRODUCT_VERSION          0x01ff1700
 
 //
 // Product version by components
@@ -31,31 +31,31 @@
 // thus we need to specify major, minor and other version components
 // separately.
 //
-#define ZRCOLA_VERSION_MAJ      1
-#define ZRCOLA_VERSION_MIN      255
-#define ZRCOLA_VERSION_REV      17
-#define ZRCOLA_VERSION_BUILD    0
+#define PRODUCT_VERSION_MAJ      1
+#define PRODUCT_VERSION_MIN      255
+#define PRODUCT_VERSION_REV      23
+#define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-beta8"
-#define ZRCOLA_BUILD_YEAR_STR   "2016"
+#define PRODUCT_VERSION_STR      "2.0-beta14"
+#define PRODUCT_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define ZRCOLA_VERSION_INST     "1.255.17"
+#define PRODUCT_VERSION_INST     "1.255.23"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define ZRCOLA_VERSION_GUID     "{BCBBC30A-5769-4C7F-88CE-071C210C4233}"
+#define PRODUCT_VERSION_GUID     "{47F119AA-A313-4551-8792-2132DFDAC115}"
 
 //
 // The product vendor and application name for configuration keeping.
 //
-#define ZRCOLA_CFG_VENDOR       "Amebis"
-#define ZRCOLA_CFG_APPLICATION  "ZRCola"
+#define PRODUCT_CFG_VENDOR       "Amebis"
+#define PRODUCT_CFG_APPLICATION  "ZRCola"

include/xgettext.targets

@@ -38,7 +38,7 @@
     <ItemGroup Condition="'@(SelectedFiles)' != ''">
       <POCompile Remove="@(POCompile)" Condition="'%(Identity)' != '@(SelectedFiles)'" />
     </ItemGroup>
-    <Message Text="Compiling localization catalogues..." />
+    <MakeDir Directories="$([System.IO.Path]::GetDirectoryName('%(POCompile.OutputFile)'))"/>
     <POCompile
       Condition="'@(POCompile)' != '' and '%(POCompile.ExcludedFromBuild)' != 'true'"
       Inputs="@(POCompile)"

lib/libZRCola/build/libZRCola.vcxproj

@@ -20,6 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\character.cpp" />
+    <ClCompile Include="..\src\common.cpp" />
     <ClCompile Include="..\src\language.cpp" />
     <ClCompile Include="..\src\mapping.cpp" />
     <ClCompile Include="..\src\normalize.cpp" />
@@ -29,6 +30,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="..\src\tag.cpp" />
     <ClCompile Include="..\src\translate.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -36,6 +38,7 @@
     <ClInclude Include="..\include\zrcola\common.h" />
     <ClInclude Include="..\include\zrcola\language.h" />
     <ClInclude Include="..\include\zrcola\normalize.h" />
+    <ClInclude Include="..\include\zrcola\tag.h" />
     <ClInclude Include="..\include\zrcola\translate.h" />
     <ClInclude Include="..\src\stdafx.h" />
   </ItemGroup>

lib/libZRCola/build/libZRCola.vcxproj.filters

@@ -33,6 +33,12 @@
     <ClCompile Include="..\src\character.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\common.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\stdafx.h">
@@ -53,6 +59,9 @@
     <ClInclude Include="..\include\zrcola\character.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\zrcola\tag.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\res\libZRCola.rc">

lib/libZRCola/include/zrcola/character.h

@@ -45,7 +45,7 @@ namespace ZRCola {
     /// Character category ID type
     /// Two letter abbreviation, non-terminated
     ///
-    struct chrcatid_t {
+    struct ZRCOLA_API chrcatid_t {
         char data[2];
 
         inline chrcatid_t& operator=(const chrcatid_t &src)
@@ -60,15 +60,14 @@ namespace ZRCola {
             data[1] = (data[0] = src[0]) != 0 ? src[1] : 0;
             return *this;
         }
+
+        ///
+        /// Blank character category
+        ///
+        static const chrcatid_t blank;
     };
 
 
-    ///
-    /// Blank character category
-    ///
-    const chrcatid_t chrcatid_t_blank = {};
-
-
     ///
     /// Compares two character category IDs
     ///
@@ -232,6 +231,17 @@ namespace ZRCola {
         ///
         inline character_db() : idxChr(data) {}
 
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr   .clear();
+            idxDsc   .clear();
+            idxDscSub.clear();
+            data     .clear();
+        }
+
         ///
         /// Search for characters by description in given categories
         ///
@@ -239,8 +249,8 @@ namespace ZRCola {
         /// \param[in   ] cats      Set of categories, character must be a part of
         /// \param[inout] hits      (character, count) map to append full-word hits to
         /// \param[inout] hits_sub  (character, count) map to append partial-word hits to
-        /// \param[in]    fn_abort  Pointer to function to periodically test for search cancellation
-        /// \param[in]    cookie    Cookie for \p fn_abort call
+        /// \param[in   ] fn_abort  Pointer to function to periodically test for search cancellation
+        /// \param[in   ] cookie    Cookie for \p fn_abort call
         ///
         bool Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _Inout_ std::map<wchar_t, charrank_t> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie) = NULL, _In_opt_ void *cookie = NULL) const;
 
@@ -251,14 +261,14 @@ namespace ZRCola {
         ///
         /// \returns
         /// - Character category if character found
-        /// - `ZRCola::chrcatid_t_blank` otherwise
+        /// - `ZRCola::chrcatid_t::blank` otherwise
         ///
         inline chrcatid_t GetCharCat(wchar_t c) const
         {
             char _chr[sizeof(character)];
             ((character *)_chr)->chr = c;
             indexChar::size_type start;
-            return idxChr.find(*((character *)_chr), start) ? idxChr[start].cat : chrcatid_t_blank;
+            return idxChr.find(*((character *)_chr), start) ? idxChr[start].cat : chrcatid_t::blank;
         }
     };
 
@@ -380,6 +390,16 @@ namespace ZRCola {
         /// Constructs the database
         ///
         inline chrcat_db() : idxChrCat(data), idxRnk(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChrCat.clear();
+            idxRnk   .clear();
+            data     .clear();
+        }
     };
 
 
@@ -452,7 +472,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::c
     stream << db.idxDscSub;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {
@@ -491,7 +511,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::c
     stream << db.idxRnk;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {

lib/libZRCola/include/zrcola/common.h

@@ -76,7 +76,7 @@ namespace ZRCola {
     /// Language ID type
     /// Three letter abbreviation, zero terminated
     ///
-    struct langid_t {
+    struct ZRCOLA_API langid_t {
         char data[4];
 
         inline langid_t& operator=(const langid_t &src)
@@ -99,15 +99,14 @@ namespace ZRCola {
                       src[3] : 0;
             return *this;
         }
+
+        ///
+        /// Blank language ID
+        ///
+        static const langid_t blank;
     };
 
 
-    ///
-    /// Blank language ID
-    ///
-    const langid_t langid_t_blank = {};
-
-
     ///
     /// Compares two language IDs
     ///
@@ -440,6 +439,17 @@ namespace ZRCola {
         textindex() {}
 
 
+        ///
+        /// Clears the index
+        ///
+        inline void clear()
+        {
+            std::vector< mappair_t<T_idx> >::clear();
+            keys  .clear();
+            values.clear();
+        }
+
+
         ///
         /// Finds data for given key
         ///
@@ -557,7 +567,7 @@ template <class T, class T_idx, class T_data>
 inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::index<T, T_idx, T_data> &idx)
 {
     // Write index count.
-    ZRCola::index<T, T_idx, T_data>::size_type idx_count = idx.size();
+    auto idx_count = idx.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (idx_count > 0xffffffff) {
@@ -619,7 +629,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::t
     unsigned __int32 count;
 
     // Write index count.
-    ZRCola::textindex<T_key, T_val, T_idx>::size_type idx_count = idx.size();
+    auto idx_count = idx.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (idx_count > 0xffffffff) {
@@ -636,7 +646,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::t
     stream.write((const char*)idx.data(), sizeof(ZRCola::textindex<T_key, T_val, T_idx>::value_type)*count);
 
     // Write key count.
-    std::vector<T_key>::size_type key_count = idx.keys.size();
+    auto key_count = idx.keys.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (idx_count > 0xffffffff) {
@@ -653,7 +663,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::t
     stream.write((const char*)idx.keys.data(), sizeof(std::vector<T_key>::value_type)*count);
 
     // Write value count.
-    std::vector<T_val>::size_type value_count = idx.values.size();
+    auto value_count = idx.values.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (idx_count > 0xffffffff) {

lib/libZRCola/include/zrcola/language.h

@@ -175,6 +175,18 @@ namespace ZRCola {
 #endif
         {}
 
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr.clear();
+#ifdef ZRCOLA_LANGCHAR_LANG_IDX
+            idxLng.clear();
+#endif
+            data  .clear();
+        }
+
         ///
         /// Tests presence of character in the given language
         ///
@@ -248,6 +260,15 @@ namespace ZRCola {
         /// Constructs the database
         ///
         inline language_db() : idxLng(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxLng.clear();
+            data  .clear();
+        }
     };
 
 
@@ -280,7 +301,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::l
 #endif
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {
@@ -351,7 +372,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::l
     stream << db.idxLng;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {

lib/libZRCola/include/zrcola/tag.h

@@ -0,0 +1,530 @@
+/*
+    Copyright 2015-2016 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "common.h"
+
+#include <stdex/idrec.h>
+#include <istream>
+#include <ostream>
+#include <vector>
+#include <string>
+
+#pragma warning(push)
+#pragma warning(disable: 4200)
+#pragma warning(disable: 4251)
+#pragma warning(disable: 4512)
+
+
+namespace ZRCola {
+    typedef unsigned __int16 tagid_t;
+
+    ///
+    /// Character Tag Database
+    ///
+    class ZRCOLA_API chrtag_db {
+    public:
+#pragma pack(push)
+#pragma pack(2)
+        ///
+        /// Character tag data
+        ///
+        struct chrtag {
+            wchar_t chr;    ///> Character
+            tagid_t tag;    ///< Tag ID
+        };
+#pragma pack(pop)
+
+        ///
+        /// Character Index
+        ///
+        class indexChar : public index<unsigned __int16, unsigned __int32, chrtag>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h  Reference to vector holding the data
+            ///
+            indexChar(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, chrtag>(h) {}
+
+            ///
+            /// Compares two character tags by character (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const chrtag &a, _In_ const chrtag &b) const
+            {
+                     if (a.chr < b.chr) return -1;
+                else if (a.chr > b.chr) return  1;
+
+                return 0;
+            }
+
+            ///
+            /// Compares two character tags by character (for sorting)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare_sort(_In_ const chrtag &a, _In_ const chrtag &b) const
+            {
+                     if (a.chr < b.chr) return -1;
+                else if (a.chr > b.chr) return  1;
+
+                     if (a.tag < b.tag) return -1;
+                else if (a.tag > b.tag) return  1;
+
+                return 0;
+            }
+        } idxChr;      ///< Character index
+
+
+        ///
+        /// Tag Index
+        ///
+        class indexTag : public index<unsigned __int16, unsigned __int32, chrtag>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h  Reference to vector holding the data
+            ///
+            indexTag(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, chrtag>(h) {}
+
+            ///
+            /// Compares two character tags by tag (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const chrtag &a, _In_ const chrtag &b) const
+            {
+                     if (a.tag < b.tag) return -1;
+                else if (a.tag > b.tag) return  1;
+
+                return 0;
+            }
+
+            ///
+            /// Compares two character tags by tag (for sorting)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare_sort(_In_ const chrtag &a, _In_ const chrtag &b) const
+            {
+                     if (a.tag < b.tag) return -1;
+                else if (a.tag > b.tag) return  1;
+
+                     if (a.chr < b.chr) return -1;
+                else if (a.chr > b.chr) return  1;
+
+                return 0;
+            }
+        } idxTag;      ///< Tag index
+
+        std::vector<unsigned __int16> data;     ///< Character tags data
+
+    public:
+        ///
+        /// Constructs the database
+        ///
+        inline chrtag_db() : idxChr(data), idxTag(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr.clear();
+            idxTag.clear();
+            data  .clear();
+        }
+
+        ///
+        /// Search for characters by tags
+        ///
+        /// \param[in   ] tags      Search tags
+        /// \param[in   ] ch_db     Character database
+        /// \param[in   ] cats      Set of categories from \p ch_db, character must be a part of
+        /// \param[inout] hits      (character, count) map to append hits to
+        /// \param[in   ] fn_abort  Pointer to function to periodically test for search cancellation
+        /// \param[in   ] cookie    Cookie for \p fn_abort call
+        ///
+        bool Search(_In_ const std::map<tagid_t, unsigned __int16> &tags, _In_ const character_db &ch_db, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie) = NULL, _In_opt_ void *cookie = NULL) const;
+    };
+
+
+    typedef ZRCOLA_API stdex::idrec::record<chrtag_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> chrtag_rec;
+
+
+    ///
+    /// Tag name database
+    ///
+    class ZRCOLA_API tagname_db {
+    public:
+#pragma pack(push)
+#pragma pack(2)
+        ///
+        /// Tag name data
+        ///
+        struct tagname {
+            tagid_t tag;                ///< Tag ID
+            LCID locale;                ///< Locale ID
+            unsigned __int16 name_len;  ///< \c name length (in characters)
+            wchar_t name[];             ///< Tag localized name
+
+            ///
+            /// Compares two names
+            ///
+            /// \param[in] locale   Locale ID to use for compare
+            /// \param[in] str_a    First name
+            /// \param[in] count_a  Number of characters in string \p str_a
+            /// \param[in] str_b    Second name
+            /// \param[in] count_b  Number of characters in string \p str_b
+            ///
+            /// \returns
+            /// - <0 when str_a <  str_b
+            /// - =0 when str_a == str_b
+            /// - >0 when str_a >  str_b
+            ///
+            /// \note
+            /// The function does not treat \\0 characters as terminators for performance reasons.
+            /// Therefore \p count_a and \p count_b must represent exact string lengths.
+            ///
+            static inline int CompareName(LCID locale, const wchar_t *str_a, unsigned __int16 count_a, const wchar_t *str_b, unsigned __int16 count_b)
+            {
+                switch (CompareString(locale, SORT_STRINGSORT | NORM_IGNORECASE, str_a, count_a, str_b, count_b)) {
+                    case CSTR_LESS_THAN   : return -1;
+                    case CSTR_EQUAL       : return  0;
+                    case CSTR_GREATER_THAN: return  1;
+                    default               : assert(0); return -1;
+                }
+            }
+        };
+#pragma pack(pop)
+
+        ///
+        /// Name index
+        ///
+        class indexName : public index<unsigned __int16, unsigned __int32, tagname>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h       Reference to vector holding the data
+            /// \param[in] locale  Locale used to perform tag name comparison
+            ///
+            indexName(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, tagname>(h) {}
+
+            ///
+            /// Compares two tag names by name (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const
+            {
+                     if (a.locale < b.locale) return -1;
+                else if (a.locale > b.locale) return  1;
+
+                int r = tagname::CompareName(a.locale, a.name, a.name_len, b.name, b.name_len);
+                if (r != 0) return r;
+
+                return 0;
+            }
+
+            ///
+            /// Compares two tag names by name (for sorting)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare_sort(_In_ const tagname &a, _In_ const tagname &b) const
+            {
+                     if (a.locale < b.locale) return -1;
+                else if (a.locale > b.locale) return  1;
+
+                int r = tagname::CompareName(a.locale, a.name, a.name_len, b.name, b.name_len);
+                if (r != 0) return r;
+
+                     if (a.tag < b.tag) return -1;
+                else if (a.tag > b.tag) return  1;
+
+                return 0;
+            }
+        } idxName;      ///< Name index
+
+        ///
+        /// Tag index
+        ///
+        class indexTag : public index<unsigned __int16, unsigned __int32, tagname>
+        {
+        public:
+            ///
+            /// Constructs the index
+            ///
+            /// \param[in] h       Reference to vector holding the data
+            /// \param[in] locale  Locale used to perform tag name comparison
+            ///
+            indexTag(_In_ std::vector<unsigned __int16> &h) : index<unsigned __int16, unsigned __int32, tagname>(h) {}
+
+            ///
+            /// Compares two tag names by tag (for searching)
+            ///
+            /// \param[in] a  Pointer to first element
+            /// \param[in] b  Pointer to second element
+            ///
+            /// \returns
+            /// - <0 when a <  b
+            /// - =0 when a == b
+            /// - >0 when a >  b
+            ///
+            virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const
+            {
+                     if (a.locale < b.locale) return -1;
+                else if (a.locale > b.locale) return  1;
+
+                     if (a.tag < b.tag) return -1;
+                else if (a.tag > b.tag) return  1;
+
+                return 0;
+            }
+        } idxTag;      ///< Tag index
+
+        std::vector<unsigned __int16> data;     ///< Tag data
+
+    public:
+        ///
+        /// Constructs the database
+        ///
+        inline tagname_db() : idxName(data), idxTag(data) {}
+
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxName.clear();
+            idxTag .clear();
+            data   .clear();
+        }
+
+        ///
+        /// Search for tags by names
+        ///
+        /// \param[in   ] str       Search string
+        /// \param[in   ] locale    Locale to search tags in
+        /// \param[inout] hits      (tag, count) map to append hits to
+        /// \param[in   ] fn_abort  Pointer to function to periodically test for search cancellation
+        /// \param[in   ] cookie    Cookie for \p fn_abort call
+        ///
+        bool Search(_In_z_ const wchar_t *str, _In_ LCID locale, _Inout_ std::map<tagid_t, unsigned __int16> &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie) = NULL, _In_opt_ void *cookie = NULL) const;
+    };
+
+
+    typedef ZRCOLA_API stdex::idrec::record<tagname_db, recordid_t, recordsize_t, ZRCOLA_RECORD_ALIGN> tagname_rec;
+};
+
+
+const ZRCola::recordid_t stdex::idrec::record<ZRCola::chrtag_db, ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>::id = *(ZRCola::recordid_t*)"C-T";
+const ZRCola::recordid_t stdex::idrec::record<ZRCola::tagname_db, ZRCola::recordid_t, ZRCola::recordsize_t, ZRCOLA_RECORD_ALIGN>::id = *(ZRCola::recordid_t*)"TGN";
+
+
+///
+/// Writes character tag database to a stream
+///
+/// \param[in] stream  Output stream
+/// \param[in] db      Character tag database
+///
+/// \returns The stream \p stream
+///
+inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::chrtag_db &db)
+{
+    // Write character index.
+    if (stream.fail()) return stream;
+    stream << db.idxChr;
+
+    // Write tag index.
+    if (stream.fail()) return stream;
+    stream << db.idxTag;
+
+    // Write data count.
+    auto data_count = db.data.size();
+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
+    // 4G check
+    if (data_count > 0xffffffff) {
+        stream.setstate(std::ios_base::failbit);
+        return stream;
+    }
+#endif
+    if (stream.fail()) return stream;
+    unsigned __int32 count = (unsigned __int32)data_count;
+    stream.write((const char*)&count, sizeof(count));
+
+    // Write data.
+    if (stream.fail()) return stream;
+    stream.write((const char*)db.data.data(), sizeof(unsigned __int16)*count);
+
+    return stream;
+}
+
+
+///
+/// Reads character tag database from a stream
+///
+/// \param[in ] stream  Input stream
+/// \param[out] db      Character tag database
+///
+/// \returns The stream \p stream
+///
+inline std::istream& operator >>(_In_ std::istream& stream, _Out_ ZRCola::chrtag_db &db)
+{
+    // Read character index.
+    stream >> db.idxChr;
+    if (!stream.good()) return stream;
+
+    // Read tag index.
+    stream >> db.idxTag;
+    if (!stream.good()) return stream;
+
+    // Read data count.
+    unsigned __int32 count;
+    stream.read((char*)&count, sizeof(count));
+    if (!stream.good()) return stream;
+
+    if (count) {
+        // Read data.
+        db.data.resize(count);
+        stream.read((char*)db.data.data(), sizeof(unsigned __int16)*count);
+    } else
+        db.data.clear();
+
+    return stream;
+}
+
+
+///
+/// Writes tag database to a stream
+///
+/// \param[in] stream  Output stream
+/// \param[in] db      Tag database
+///
+/// \returns The stream \p stream
+///
+inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::tagname_db &db)
+{
+    // Write name index.
+    if (stream.fail()) return stream;
+    stream << db.idxName;
+
+    // Write tag index.
+    if (stream.fail()) return stream;
+    stream << db.idxTag;
+
+    // Write data count.
+    auto data_count = db.data.size();
+#if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
+    // 4G check
+    if (data_count > 0xffffffff) {
+        stream.setstate(std::ios_base::failbit);
+        return stream;
+    }
+#endif
+    if (stream.fail()) return stream;
+    unsigned __int32 count = (unsigned __int32)data_count;
+    stream.write((const char*)&count, sizeof(count));
+
+    // Write data.
+    if (stream.fail()) return stream;
+    stream.write((const char*)db.data.data(), sizeof(unsigned __int16)*count);
+
+    return stream;
+}
+
+
+///
+/// Reads tag database from a stream
+///
+/// \param[in ] stream  Input stream
+/// \param[out] db      Tag database
+///
+/// \returns The stream \p stream
+///
+inline std::istream& operator >>(_In_ std::istream& stream, _Out_ ZRCola::tagname_db &db)
+{
+    // Read name index.
+    stream >> db.idxName;
+    if (!stream.good()) return stream;
+
+    // Read tag index.
+    stream >> db.idxTag;
+    if (!stream.good()) return stream;
+
+    // Read data count.
+    unsigned __int32 count;
+    stream.read((char*)&count, sizeof(count));
+    if (!stream.good()) return stream;
+
+    if (count) {
+        // Read data.
+        db.data.resize(count);
+        stream.read((char*)db.data.data(), sizeof(unsigned __int16)*count);
+    } else
+        db.data.clear();
+
+    return stream;
+}
+
+#pragma warning(pop)

lib/libZRCola/include/zrcola/translate.h

@@ -204,6 +204,16 @@ namespace ZRCola {
         ///
         inline translation_db() : idxComp(data), idxDecomp(data) {}
 
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxComp  .clear();
+            idxDecomp.clear();
+            data     .clear();
+        }
+
         ///
         /// Composes string
         ///
@@ -224,7 +234,7 @@ namespace ZRCola {
         ///
         inline void Decompose(_In_z_count_(inputMax) const wchar_t* input, _In_ size_t inputMax, _Out_ std::wstring &output, _Out_opt_ std::vector<mapping>* map = NULL) const
         {
-            Decompose(input, inputMax, NULL, langid_t_blank, output, map);
+            Decompose(input, inputMax, NULL, langid_t::blank, output, map);
         }
 
         ///
@@ -267,7 +277,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::t
     stream << db.idxDecomp;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {

lib/libZRCola/src/character.cpp

@@ -20,6 +20,9 @@
 #include "stdafx.h"
 
 
+const ZRCola::chrcatid_t ZRCola::chrcatid_t::blank = {};
+
+
 bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _Inout_ std::map<wchar_t, charrank_t> &hits_sub, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
 {
     assert(str);
@@ -77,7 +80,7 @@ bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set
                     if (fn_abort && fn_abort(cookie)) return false;
                     wchar_t c = data[i];
                     if (cats.find(GetCharCat(c)) != cats.end()) {
-                        std::map<wchar_t, charrank_t>::iterator idx = hits.find(c);
+                        auto idx = hits.find(c);
                         if (idx == hits.end()) {
                             // New character.
                             hits.insert(std::make_pair(data[i], 1.0/len));
@@ -95,7 +98,7 @@ bool ZRCola::character_db::Search(_In_z_ const wchar_t *str, _In_ const std::set
                     if (fn_abort && fn_abort(cookie)) return false;
                     wchar_t c = data[i];
                     if (cats.find(GetCharCat(c)) != cats.end()) {
-                        std::map<wchar_t, charrank_t>::iterator idx = hits_sub.find(c);
+                        auto idx = hits_sub.find(c);
                         if (idx == hits_sub.end()) {
                             // New character.
                             hits_sub.insert(std::make_pair(data[i], 1.0/len));

lib/libZRCola/src/common.cpp

@@ -0,0 +1,23 @@
+/*
+    Copyright 2015-2016 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
+
+
+const ZRCola::langid_t ZRCola::langid_t::blank = {};

lib/libZRCola/src/stdafx.h

@@ -19,12 +19,13 @@
 
 #pragma once
 
-#include "../../../include/zrcola.h"
+#include "../../../include/version.h"
 
 #include "../include/zrcola/character.h"
 #include "../include/zrcola/language.h"
 #include "../include/zrcola/normalize.h"
 #include "../include/zrcola/translate.h"
+#include "../include/zrcola/tag.h"
 
 #include <assert.h>
 

lib/libZRCola/src/tag.cpp

@@ -0,0 +1,120 @@
+/*
+    Copyright 2015-2016 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
+
+
+bool ZRCola::chrtag_db::Search(_In_ const std::map<tagid_t, unsigned __int16> &tags, _In_ const character_db &ch_db, _In_ const std::set<chrcatid_t> &cats, _Inout_ std::map<wchar_t, charrank_t> &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
+{
+    for (auto tag = tags.cbegin(), tag_end = tags.cend(); tag != tag_end; ++tag) {
+        if (fn_abort && fn_abort(cookie)) return false;
+
+        // Search for tagged characters.
+        chrtag el = { 0, tag->first };
+        size_t start, end;
+        if (idxTag.find(el, start, end)) {
+            for (size_t i = start; i < end; i++) {
+                if (fn_abort && fn_abort(cookie)) return false;
+                const chrtag &ct = idxTag[i];
+                if (cats.find(ch_db.GetCharCat(ct.chr)) != cats.end()) {
+                    auto idx = hits.find(ct.chr);
+                    if (idx == hits.end()) {
+                        // New character.
+                        hits.insert(std::make_pair(ct.chr, tag->second));
+                    } else {
+                        // Increase count for existing character.
+                        idx->second += tag->second;
+                    }
+                }
+            }
+        }
+    }
+
+    return true;
+}
+
+
+bool ZRCola::tagname_db::Search(_In_z_ const wchar_t *str, _In_ LCID locale, _Inout_ std::map<tagid_t, unsigned __int16> &hits, _In_opt_ bool (__cdecl *fn_abort)(void *cookie), _In_opt_ void *cookie) const
+{
+    assert(str);
+
+    while (*str) {
+        if (fn_abort && fn_abort(cookie)) return false;
+
+        // Skip white space.
+        for (;;) {
+            if (*str == 0)
+                return true;
+            else if (!iswspace(*str))
+                break;
+            else
+                str++;
+        }
+
+        // Get name.
+        std::wstring name;
+        if (*str == L'"') {
+            const wchar_t *str_end = ++str;
+            for (;;) {
+                if (*str_end == 0) {
+                    name.assign(str, str_end);
+                    break;
+                } else if (*str_end == L'"') {
+                    name.assign(str, str_end);
+                    str_end++;
+                    break;
+                } else
+                    str_end++;
+            }
+            str = str_end;
+        } else {
+            const wchar_t *str_end = str + 1;
+            for (; *str_end && !iswspace(*str_end); str_end++);
+            name.assign(str, str_end);
+            str = str_end;
+        }
+
+        if (!name.empty()) {
+            if (fn_abort && fn_abort(cookie)) return false;
+
+            // Find the name.
+            std::unique_ptr<tagname> tn(reinterpret_cast<tagname*>(new char[sizeof(tagname) + sizeof(wchar_t)*name.length()]));
+            tn->locale = locale;
+            memcpy(tn->name, name.data(), sizeof(wchar_t)*(tn->name_len = (unsigned __int16)name.length()));
+            size_t start, end;
+            if (idxName.find(*tn, start, end)) {
+                // The name was found.
+                for (size_t i = start; i < end; i++) {
+                    if (fn_abort && fn_abort(cookie)) return false;
+                    const tagname &name = idxName[i];
+                    auto idx = hits.find(name.tag);
+                    if (idx == hits.end()) {
+                        // New tag.
+                        hits.insert(std::make_pair(name.tag, 1));
+                    } else {
+                        // Increase count for existing tag.
+                        idx->second++;
+                    }
+                }
+            }
+        }
+    }
+
+    return true;
+}

lib/libZRCola/src/translate.cpp

@@ -34,7 +34,7 @@ void ZRCola::translation_db::Compose(_In_z_count_(inputMax) const wchar_t* input
     if (map)
         map->clear();
 
-    indexComp::size_type compositionsCount = idxComp.size();
+    auto compositionsCount = idxComp.size();
 
     for (size_t i = 0; i < inputMax;) {
         // Find the longest matching composition at i-th character.
@@ -116,7 +116,7 @@ void ZRCola::translation_db::Decompose(_In_z_count_(inputMax) const wchar_t* inp
     if (map)
         map->clear();
 
-    indexDecomp::size_type decompositionsCount = idxDecomp.size();
+    auto decompositionsCount = idxDecomp.size();
 
     for (size_t i = 0; i < inputMax;) {
         // Find whether the character can be decomposed.

lib/libZRColaUI/MSIBuild/Makefile

@@ -19,6 +19,10 @@
 
 !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 
+!IFNDEF MSIBUILD_LANGID
+!ERROR Parameter MSIBUILD_LANGID is undefined.
+!ENDIF
+
 
 ######################################################################
 # AppSearch
@@ -72,10 +76,10 @@ complibZRColaUI.dll.Win32	{D9A5BF44-DDFE-4A22-89F4-14D291581829}	ZRCOLABINDIR	0
 !IF "$(PLAT)" == "x64"
 complibZRColaUI.dll.x64	{360E78E5-9560-4C52-B806-45EDC682BB17}	ZRCOLABINDIR	256		filelibZRColaUI.dll.x64
 !ENDIF
-!IF "$(LANG)" == "Ru"
+!IF "$(LANG)" == "ru_RU"
 complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
 !ENDIF
-!IF "$(LANG)" == "Sl"
+!IF "$(LANG)" == "sl_SI"
 complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
 !ENDIF
 <<NOKEEP
@@ -108,11 +112,8 @@ filelibZRColaUI.dll.x64	complibZRColaUI.dll.x64	LIBZRC~6.DLL|libZRColaUI10u_vc10
 filelibZRColaUI.dll.x64	complibZRColaUI.dll.x64	LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll	0		0	1536	1
 !ENDIF
 !ENDIF
-!IF "$(LANG)" == "Ru"
-filelibZRColaUI.mo.ru_RU	complibZRColaUI.mo.ru_RU	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
-!ENDIF
-!IF "$(LANG)" == "Sl"
-filelibZRColaUI.mo.sl_SI	complibZRColaUI.mo.sl_SI	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
+!IF "$(LANG)" != "en_US"
+filelibZRColaUI.mo.$(LANG)	complibZRColaUI.mo.$(LANG)	LIBZRC~1.MO|libZRColaUI.mo	0		$(MSIBUILD_LANGID)	0	1
 !ENDIF
 <<NOKEEP
 

lib/libZRColaUI/include/zrcolaui/chargroup.h

@@ -165,7 +165,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::c
     stream << db.idxRnk;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {

lib/libZRColaUI/include/zrcolaui/keyboard.h

@@ -209,6 +209,16 @@ namespace ZRCola {
         ///
         inline keyseq_db() : idxChr(data), idxKey(data) {}
 
+        ///
+        /// Clears the database
+        ///
+        inline void clear()
+        {
+            idxChr.clear();
+            idxKey.clear();
+            data  .clear();
+        }
+
         ///
         /// Get text representation of a given key sequence
         ///
@@ -264,7 +274,7 @@ inline std::ostream& operator <<(_In_ std::ostream& stream, _In_ const ZRCola::k
     stream << db.idxKey;
 
     // Write data count.
-    std::vector<unsigned __int16>::size_type data_count = db.data.size();
+    auto data_count = db.data.size();
 #if defined(_WIN64) || defined(__x86_64__) || defined(__ppc64__)
     // 4G check
     if (data_count > 0xffffffff) {

lib/libZRColaUI/locale/libZRColaUI.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libZRColaUI\n"
-"POT-Creation-Date: 2016-05-09 10:38+0200\n"
+"POT-Creation-Date: 2016-10-13 11:47+0200\n"
 "PO-Revision-Date: 2016-02-06 09:04+0100\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"

lib/libZRColaUI/locale/ru_RU.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libZRColaUI\n"
-"POT-Creation-Date: 2016-05-13 19:20+0200\n"
-"PO-Revision-Date: 2016-05-13 19:20+0200\n"
+"POT-Creation-Date: 2016-10-05 08:33+0200\n"
+"PO-Revision-Date: 2016-10-05 08:33+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -18,144 +18,144 @@ msgstr ""
 
 #: src/keyboard.cpp:30 src/keyboard.cpp:72
 msgid "Ctrl"
-msgstr ""
+msgstr "Ctrl"
 
 #: src/keyboard.cpp:31 src/keyboard.cpp:71
 msgid "Alt"
-msgstr ""
+msgstr "Alt"
 
 #: src/keyboard.cpp:32 src/keyboard.cpp:70
 msgid "Shift"
-msgstr ""
+msgstr "Shift"
 
 #: src/keyboard.cpp:45
 msgid "Esc"
-msgstr ""
+msgstr "Esc"
 
 #: src/keyboard.cpp:47
 msgid "F1"
-msgstr ""
+msgstr "F1"
 
 #: src/keyboard.cpp:48
 msgid "F2"
-msgstr ""
+msgstr "F2"
 
 #: src/keyboard.cpp:49
 msgid "F3"
-msgstr ""
+msgstr "F3"
 
 #: src/keyboard.cpp:50
 msgid "F4"
-msgstr ""
+msgstr "F4"
 
 #: src/keyboard.cpp:51
 msgid "F5"
-msgstr ""
+msgstr "F5"
 
 #: src/keyboard.cpp:52
 msgid "F6"
-msgstr ""
+msgstr "F6"
 
 #: src/keyboard.cpp:53
 msgid "F7"
-msgstr ""
+msgstr "F7"
 
 #: src/keyboard.cpp:54
 msgid "F8"
-msgstr ""
+msgstr "F8"
 
 #: src/keyboard.cpp:55
 msgid "F9"
-msgstr ""
+msgstr "F9"
 
 #: src/keyboard.cpp:56
 msgid "F10"
-msgstr ""
+msgstr "F10"
 
 #: src/keyboard.cpp:57
 msgid "F11"
-msgstr ""
+msgstr "F11"
 
 #: src/keyboard.cpp:58
 msgid "F12"
-msgstr ""
+msgstr "F12"
 
 #: src/keyboard.cpp:60
 msgid "Print Screen"
-msgstr ""
+msgstr "Print Screen"
 
 #: src/keyboard.cpp:61
 msgid "Scroll Lock"
-msgstr ""
+msgstr "Scroll Lock"
 
 #: src/keyboard.cpp:62
 msgid "Pause"
-msgstr ""
+msgstr "Pause"
 
 #: src/keyboard.cpp:64
 msgid "Backspace"
-msgstr ""
+msgstr "Backspace"
 
 #: src/keyboard.cpp:65
 msgid "Tab"
-msgstr ""
+msgstr "Tab"
 
 #: src/keyboard.cpp:66
 msgid "Caps Lock"
-msgstr ""
+msgstr "Caps Lock"
 
 #: src/keyboard.cpp:67
 msgid "Return"
-msgstr ""
+msgstr "Return"
 
 #: src/keyboard.cpp:68
 msgid "Space"
-msgstr ""
+msgstr "Space"
 
 #: src/keyboard.cpp:73
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: src/keyboard.cpp:75
 msgid "Insert"
-msgstr ""
+msgstr "Insert"
 
 #: src/keyboard.cpp:76
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
 #: src/keyboard.cpp:77
 msgid "Page Up"
-msgstr ""
+msgstr "Page Up"
 
 #: src/keyboard.cpp:78
 msgid "Page Down"
-msgstr ""
+msgstr "Page Down"
 
 #: src/keyboard.cpp:79
 msgid "Home"
-msgstr ""
+msgstr "Home"
 
 #: src/keyboard.cpp:80
 msgid "End"
-msgstr ""
+msgstr "End"
 
 #: src/keyboard.cpp:82
 msgid "Left"
-msgstr ""
+msgstr "Left"
 
 #: src/keyboard.cpp:83
 msgid "Up"
-msgstr ""
+msgstr "Up"
 
 #: src/keyboard.cpp:84
 msgid "Right"
-msgstr ""
+msgstr "Right"
 
 #: src/keyboard.cpp:85
 msgid "Down"
-msgstr ""
+msgstr "Down"
 
 #: src/keyboard.cpp:87
 msgid "Num Lock"
-msgstr ""
+msgstr "Num Lock"

lib/libZRColaUI/src/stdafx.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../../../include/zrcola.h"
+#include "../../../include/version.h"
 #include "../include/zrcolaui/chargroup.h"
 #include "../include/zrcolaui/keyboard.h"
 

output/Setup/.gitignore

@@ -1 +0,0 @@
-/ZRCola*.msi

output/locale/.gitignore

@@ -1,5 +1,7 @@
 */libZRColaUI.mo
-*/wxExtend13.mo
-*/Updater10.mo
+*/wxExtend*.mo
+*/wxstd.mo
+*/UpdaterZRCola.mo
 */ZRCola.mo
 */ZRColaCompile.mo
+*/ZRCola-zrcdb.mo

output/locale/ZRCola-zrcdb.pot

@@ -5,7 +5,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: ZRColaCompile 2.0-beta6\n"
+"X-Generator: ZRColaCompile\n"
 
 msgid "Albanian"
 msgstr ""

output/locale/ru_RU/ZRCola-zrcdb.po

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.9\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -330,13 +330,13 @@ msgid "Maltese"
 msgstr "мальтийский"
 
 msgid "Mark, Enclosing"
-msgstr ""
+msgstr "Метка, закрывающая"
 
 msgid "Mark, Non-Spacing"
-msgstr ""
+msgstr "Метка, несамостоятельная"
 
 msgid "Mark, Spacing Combining"
-msgstr ""
+msgstr "Метка, несамостоятельная ненулевой ширины"
 
 msgid "Mathematical And Physical Symbols"
 msgstr "Математические и физические знаки"
@@ -408,10 +408,10 @@ msgid "Other Modifiers"
 msgstr "Остальные замещающие знаки"
 
 msgid "Other, Format"
-msgstr ""
+msgstr "Другое, формат"
 
 msgid "Other, Surrogate"
-msgstr ""
+msgstr "Другое, суррогат"
 
 msgid "Parentheses"
 msgstr "Скобкы"
@@ -426,25 +426,25 @@ msgid "Punctuation"
 msgstr "Знаки препинания"
 
 msgid "Punctuation, Close"
-msgstr ""
+msgstr "Пунктуация, заключительная"
 
 msgid "Punctuation, Connector"
-msgstr ""
+msgstr "Пунктуация, соединитель"
 
 msgid "Punctuation, Dash"
-msgstr ""
+msgstr "Пунктуация, черта"
 
 msgid "Punctuation, Final quote"
-msgstr ""
+msgstr "Пунктуация, окончательная кавычка"
 
 msgid "Punctuation, Initial quote"
-msgstr ""
+msgstr "Пунктуация, начальная кавычка"
 
 msgid "Punctuation, Open"
-msgstr ""
+msgstr "Пунктуация, открывающая"
 
 msgid "Punctuation, Other"
-msgstr ""
+msgstr "Пунктуация, остальное"
 
 msgid "Quotes"
 msgstr "Кавычки"

output/locale/sl_SI/ZRCola-zrcdb.po

@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -225,7 +225,7 @@ msgid "Letter E"
 msgstr "Črka E"
 
 msgid "Letter F"
-msgstr "Črka f"
+msgstr "Črka F"
 
 msgid "Letter G"
 msgstr "Črka G"
@@ -405,7 +405,7 @@ msgid "Numbers - Circled"
 msgstr "Številka, obkrožena"
 
 msgid "Other Modifiers"
-msgstr "Druga spreminjevala"
+msgstr "Ostali nadomestni znaki"
 
 msgid "Other, Format"
 msgstr "Drugo, oblikovni znaki"