From a112a467551272bdad88062cff7811baf9edb402 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Oct 2016 10:03:18 +0200
Subject: [PATCH] MSI files contain all localization files now

---
 MSI/ZRCola/Main/Makefile          | 12 ------------
 Updater                           |  2 +-
 ZRCola/MSIBuild/Makefile          | 12 ------------
 lib/libZRColaUI/MSIBuild/Makefile |  8 --------
 4 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index 787c45e..01f6314 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -68,14 +68,10 @@ compZRCola_It.otf	{FFBD408C-9FC1-4CD1-88BF-A0284AD17F96}	FontsFolder	8		fileZRCo
 compZRCola_Bd.otf	{E84BB37C-1079-4299-A4BA-4EE48AFE5BCE}	FontsFolder	8		fileZRCola_Bd.otf
 compZRCola_BI.otf	{FDFE77E4-45CC-450A-9543-0A83C01A0A48}	FontsFolder	8		fileZRCola_BI.otf
 comp00_ZRCola	{63E512B4-33AC-4DB1-A762-071099CAA0DE}	ZRCOLADATADIR	$(MSIBUILD_COMPONENT_ATTRIB_REGISTRY)		reg00_ZRCola
-!IF "$(LANG)" == "ru_RU"
 compwxstd.mo.ru_RU	{342BD930-C88B-4759-A4A8-F62054E7EA88}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.ru_RU
 compZRCola.zrcdb.mo.ru_RU	{BED0B2D2-CC08-4309-A2DB-A18B904B8D13}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 compwxstd.mo.sl_SI	{A5FEEA94-08CA-4E12-993F-A115601EF258}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filewxstd.mo.sl_SI
 compZRCola.zrcdb.mo.sl_SI	{6572EAD1-EE48-46A1-A28E-77985B667F67}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.zrcdb.mo.sl_SI
-!ENDIF
 <<NOKEEP
 
 
@@ -215,12 +211,8 @@ ZRCOLABINDIR	ZRCOLADIR	.:X64~1.DEB|x64.Debug
 ZRCOLABINDIR	ZRCOLADIR	.:X64~1.REL|x64.Release
 !ENDIF
 ZRCOLALOCDIR	ZRCOLADIR	locale
-!IF "$(LANG)" == "ru_RU"
 ZRCOLALOCRURUDIR	ZRCOLALOCDIR	ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 ZRCOLALOCSLSIDIR	ZRCOLALOCDIR	sl_SI
-!ENDIF
 ZRCOLADATADIR	ZRCOLADIR	data
 <<NOKEEP
 
@@ -305,14 +297,10 @@ fileZRCola_Re.otf	compZRCola_Re.otf	ZRCOLA~1.OTF|ZRCola_Re.otf	0			0	1
 fileZRCola_It.otf	compZRCola_It.otf	ZRCOLA~2.OTF|ZRCola_It.otf	0			0	1
 fileZRCola_Bd.otf	compZRCola_Bd.otf	ZRCOLA~3.OTF|ZRCola_Bd.otf	0			0	1
 fileZRCola_BI.otf	compZRCola_BI.otf	ZRCOLA~4.OTF|ZRCola_BI.otf	0			0	1
-!IF "$(LANG)" == "ru_RU"
 filewxstd.mo.ru_RU	compwxstd.mo.ru_RU	wxstd.mo	0		1060	0	1
 fileZRCola.zrcdb.mo.ru_RU	compZRCola.zrcdb.mo.ru_RU	ZRCOLA~1.MO|ZRCola-zrcdb.mo	0		1060	0	1
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 filewxstd.mo.sl_SI	compwxstd.mo.sl_SI	wxstd.mo	0		1060	0	1
 fileZRCola.zrcdb.mo.sl_SI	compZRCola.zrcdb.mo.sl_SI	ZRCOLA~1.MO|ZRCola-zrcdb.mo	0		1060	0	1
-!ENDIF
 <<NOKEEP
 
 
diff --git a/Updater b/Updater
index 4baae59..3cab0a4 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 4baae59fd56dda261add9408039b16c75e3136d6
+Subproject commit 3cab0a45a928b5951a1bfabbf399a83ab87633a2
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 7d0bda4..aee7cfa 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -104,12 +104,8 @@ 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_RU"
 compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
-!ENDIF
 <<NOKEEP
 
 
@@ -246,22 +242,18 @@ featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
 featZRCola	compZRCola_Re.otf
-!IF "$(LANG)" == "ru_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_SI"
 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
-!ENDIF
 <<NOKEEP
 
 
@@ -277,12 +269,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_RU"
 fileZRCola.mo.ru_RU	compZRCola.mo.ru_RU	ZRCola.mo	0		1060	0	1
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 fileZRCola.mo.sl_SI	compZRCola.mo.sl_SI	ZRCola.mo	0		1060	0	1
-!ENDIF
 <<NOKEEP
 
 
diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile
index cc0aff8..cf8cb09 100644
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -72,12 +72,8 @@ 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_RU"
 complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
-!ENDIF
-!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,12 +104,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_RU"
 filelibZRColaUI.mo.ru_RU	complibZRColaUI.mo.ru_RU	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
 filelibZRColaUI.mo.sl_SI	complibZRColaUI.mo.sl_SI	LIBZRC~1.MO|libZRColaUI.mo	0		1060	0	1
-!ENDIF
 <<NOKEEP