From 7e3cf0bce787f6c07237f1699fb54cacfcbd5e13 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Wed, 5 Oct 2016 11:02:23 +0200
Subject: [PATCH] HKLM\SOFTWARE\Amebis\ZRCola\Language is set using LANGUAGE
 property now to prevent accidental localization of registry key and/or value
 name

---
 MSI/ZRCola/Main/Makefile | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index f921e03..cf2a994 100644
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
@@ -436,6 +436,7 @@ ARPHELPTELEPHONE	+386 1 470 6170
 ARPURLINFOABOUT	http://zrcola.zrc-sazu.si/en/contact/
 ARPHELPLINK	http://zrcola.zrc-sazu.si/en/info/instructions/
 ARPURLUPDATEINFO	http://zrcola.zrc-sazu.si/en/install/
+LANGUAGE	#60
 <<NOKEEP
 
 !IF "$(LANG)" == "en_US"
@@ -450,9 +451,7 @@ ARPURLUPDATEINFO	http://zrcola.zrc-sazu.si/en/install/
 ######################################################################
 # Registry
 
-All :: \
-	"$(LANG).$(PLAT).$(CFG).Registry-1.idt" \
-	"$(LANG).$(PLAT).$(CFG).Registry-2.idt"
+All :: "$(LANG).$(PLAT).$(CFG).Registry-1.idt"
 
 "$(LANG).$(PLAT).$(CFG).Registry-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
@@ -461,27 +460,11 @@ Registry	Root	Key	Name	Value	Component_
 s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
 Registry	Registry
 regLocalizationRepositoryPath	2	SOFTWARE\Amebis\ZRCola	LocalizationRepositoryPath	[ZRCOLALOCDIR]	compLocalizationRepositoryPath
+regLanguage	2	SOFTWARE\Amebis\ZRCola	Language	[LANGUAGE]	compLanguage
 regDatabasePath	2	SOFTWARE\Amebis\ZRCola	DatabasePath	[ZRCOLADATADIR]	compDatabasePath
 reg00_ZRCola	2	SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes	00 ZRCola	ZRCola	comp00_ZRCola
 <<NOKEEP
 
-"en_US.$(PLAT).$(CFG).Registry-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
-	move /y << $@ > NUL
-Registry	Root	Key	Name	Value	Component_
-s$(MSIBUILD_LENGTH_ID)	i2	l255	L255	L0	s$(MSIBUILD_LENGTH_ID)
-1252	Registry	Registry
-regLanguage	2	SOFTWARE\Amebis\ZRCola	Language	#60	compLanguage
-<<NOKEEP
-
-!IF "$(LANG)" == "en_US"
-"en_US.$(PLAT).$(CFG).Registry-2.idt" : "en_US.$(PLAT).$(CFG).Registry-2.idtx"
-	copy /y $** $@ > NUL
-!ELSE
-"$(LANG).$(PLAT).$(CFG).Registry-2.idt" : "en_US.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\$(LANG).po"
-	cscript.exe "..\..\MSIBuild\MSI.wsf" //Job:IDTTranslate //Nologo $@ $** /CP:$(MSIBUILD_CODEPAGE)
-!ENDIF
-
 
 ######################################################################
 # RemoveFile