From 060ed729b35dcad847779e638ce4ff634c3ed163 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Oct 2016 11:22:40 +0200
Subject: [PATCH] en_US localization fixed

---
 MSI/ZRCola/Main/Makefile          | 2 ++
 Updater                           | 2 +-
 ZRCola/MSIBuild/Makefile          | 4 ++++
 lib/libZRColaUI/MSIBuild/Makefile | 2 ++
 lib/wxExtend                      | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index d48c4c9..c71bd03 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -309,8 +309,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)" != "en_US"
 filewxstd.mo.$(LANG)	compwxstd.mo.$(LANG)	wxstd.mo	0		$(MSIBUILD_LANGID)	0	1
 fileZRCola.zrcdb.mo.$(LANG)	compZRCola.zrcdb.mo.$(LANG)	ZRCOLA~1.MO|ZRCola-zrcdb.mo	0		$(MSIBUILD_LANGID)	0	1
+!ENDIF
 <<NOKEEP
 
 
diff --git a/Updater b/Updater
index 940719d..a9a04f8 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 940719d2d39ed5251292d8ccba759f562027bf2d
+Subproject commit a9a04f8df31335e28aedb5f38eb2bd44ba9ceb0a
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index cfeb66d..8ead385 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -250,12 +250,14 @@ featZRCola	compLanguage
 featZRCola	compDatabasePath
 featZRCola	compZRCola.zrcdb
 featZRCola	compZRCola_Re.otf
+!IF "$(LANG)" != "en_US"
 featZRCola	compZRCola.mo.$(LANG)
 featZRCola	compZRCola.zrcdb.mo.$(LANG)
 featZRCola	complibZRColaUI.mo.$(LANG)
 featZRCola	compwxExtend.mo.$(LANG)
 featZRCola	compUpdater.mo.$(LANG)
 featZRCola	compwxstd.mo.$(LANG)
+!ENDIF
 <<NOKEEP
 
 
@@ -271,7 +273,9 @@ 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)" != "en_US"
 fileZRCola.mo.$(LANG)	compZRCola.mo.$(LANG)	ZRCola.mo	0		$(MSIBUILD_LANGID)	0	1
+!ENDIF
 <<NOKEEP
 
 
diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile
index 7744c3f..89322d8 100644
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -112,7 +112,9 @@ 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)" != "en_US"
 filelibZRColaUI.mo.$(LANG)	complibZRColaUI.mo.$(LANG)	LIBZRC~1.MO|libZRColaUI.mo	0		$(MSIBUILD_LANGID)	0	1
+!ENDIF
 <<NOKEEP
 
 
diff --git a/lib/wxExtend b/lib/wxExtend
index edbf54f..71b37cf 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit edbf54f510a8d0a45e1e65bf12fb4a5c04cea50f
+Subproject commit 71b37cfdaf0baaaae4e803c21da53675cbb01b65