From f8f20f3667d0c5d2844f2a926146ab1714d2d1ed Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Feb 2020 12:08:17 +0100
Subject: [PATCH] Unify component GUIDs across languages

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/ZRCola/Main/Makefile          | Bin 294948 -> 294348 bytes
 Updater                           |   2 +-
 ZRCola/MSIBuild/Makefile          |   7 ++-----
 lib/libZRColaUI/MSIBuild/Makefile |   7 ++-----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index 0e17da6d9f1372d96c182a728c01b26a8fad65be..660d09385b1544a446f0b05ac8c7252f8c3597d3 100644
GIT binary patch
delta 224
zcmZ3|Aav%p;D#@f(`(#VBqr~Wk($2FjYUAcn!$*{fWei)5=fdeSTHy;=rR~Hm@pVJ
zI0IQGKv6da7Y5zQ6Q#5zb%E+EfY=QvZUK}rVlV}=fI26ym!3X(pR5qbNWRI3#3UyF
zlM|Uf!5wTq$W&*rDNaBe41lH@0QsgsHpqMnh)q!Q9f9^607Z;}Dx83{3s9dKgEP?l
g?I7d$rq^h*h%_6>w;RYa0x=U1GjBJLXZex<0Kfh)FaQ7m

delta 525
zcmZWlJxjzu5Pj+j27;iR%AKSTENlYFT|UcvY`|8z){ovo6e}A+&{kNutp%Iww6fL0
z&fj8XXXD$AhC>+!X5P%sdvD*rRvxZaA3yv0&Jjz_87^>$J&e`jU~AlUaBztcA`DTY
zM$S5bj|v&1WECMrOx#Dox*+PKLBjojcm&D0w0NfO2h$mz*Y&<S-R%A0D!E<rZOIEY
z({NSn&E3edw_Ijw_zQ$qNzR>!NJc!wh+JA7Y`E&9=juSt8r0#ASkpJhV%s^#2~F=~
z*P8A+Yr3HPhGLBPoTq&&qGD%+NRk+Fx&4ynM@Yyw3HL(I8_r|2rn}4P*K~(iu7sN@
z_YIek@3WF*X-y~Aq_H|AA~{VNIqR5)6Gm#kJpFIFqtQ=Nyy+KLEMHH&+le>FoM$dP
JPdt$veFMeVU=siU

diff --git a/Updater b/Updater
index e7954e7..caff629 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit e7954e7c7362acea606fa46f349b143ce4b1080f
+Subproject commit caff6295344c8e151c80a115012ec83f66b860d6
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index e9e08ad..292eeb7 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -112,11 +112,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}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
-compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
+!IF "$(LANG)" != "en_US"
+compZRCola.mo.$(LANG)	{4F59C403-D6DE-4B3F-$(MSIBUILD_LANG_GUID)-1190DB941EB3}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.$(LANG)
 !ENDIF
 <<NOKEEP
 
diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile
index 66b5da1..00ae56d 100644
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -39,11 +39,8 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-!IF "$(LANG)" == "ru_RU"
-complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
-complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
+!IF "$(LANG)" != "en_US"
+complibZRColaUI.mo.$(LANG)	{1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EFD}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.$(LANG)
 !ENDIF
 <<NOKEEP