From f056a4b0ecbc509b75300596b6900b0d2d8a526b Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 19 Sep 2016 10:46:17 +0200
Subject: [PATCH] rcxgettext.exe dependency eliminated

---
 MSI/MSICA                |  2 +-
 MSI/ZRCola/Main/Makefile | 12 ++++++------
 Updater                  |  2 +-
 ZRCola/MSIBuild/Makefile |  6 +++---
 lib/MSICALib             |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/MSI/MSICA b/MSI/MSICA
index 2599029..5003623 160000
--- a/MSI/MSICA
+++ b/MSI/MSICA
@@ -1 +1 @@
-Subproject commit 25990295959e411af31e133cd6b503d535bf6c62
+Subproject commit 5003623de75b694b158d802caf4f775f11404cf3
diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index a067643..e008e02 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -110,7 +110,7 @@ dlgFontSubstitutes	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBi
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -238,7 +238,7 @@ ZRCOLADIR	PROGRAMFILESDIR	ZRCola:.
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Directory-2.idt" : "en_US.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -264,7 +264,7 @@ featZRCola_keyboard	featZRColaDoc	Keyboard Shortcuts	PDF document with a list of
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -444,7 +444,7 @@ ARPURLUPDATEINFO	http://zrcola.zrc-sazu.si/en/install/
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Property-2.idt" : "en_US.$(PLAT).$(CFG).Property-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -480,7 +480,7 @@ regLanguage	2	SOFTWARE\Amebis\ZRCola	Language	#60	compLanguage
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Registry-2.idt" : "en_US.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -518,7 +518,7 @@ shctZRCola_keyboard	ZRColaShortcutDir	ZRCOLA~1|ZRCola Keyboard Shortcuts	compZRC
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
diff --git a/Updater b/Updater
index 83298f9..365c675 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 83298f96da11a3c76be4018088169a6066d4f61f
+Subproject commit 365c6757805154bdea8363e7d54e90cba93c3e26
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 9e87324..7d0bda4 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -147,7 +147,7 @@ dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -221,7 +221,7 @@ featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
@@ -340,7 +340,7 @@ shctZRCola	ZRColaShortcutDir	ZRCola	compZRCola.exe.$(PLAT)	featZRCola		Input sys
 	copy /y $** $@ > NUL
 !ELSE
 "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(LANG).po"
-	rcxgettext.exe idtp $@ $**
+	cscript.exe "..\..\MSI\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
 !ENDIF
 
 
diff --git a/lib/MSICALib b/lib/MSICALib
index 3747917..367f05e 160000
--- a/lib/MSICALib
+++ b/lib/MSICALib
@@ -1 +1 @@
-Subproject commit 37479173a2c811d463934a9c8cec4ac2fa7fd142
+Subproject commit 367f05ef1df5a3c0eed58747bb81204508825bcc