From ea76dc27b48685b1dd7addfa6725b3fdeb3864be Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 25 Feb 2020 09:22:31 +0100
Subject: [PATCH] Reapply "Unify component GUIDs across languages"

This reverts commit 41c8cc01ed237ed906208d5dca5d28d6ad548942.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/ZRCola/Main/Makefile          | Bin 295332 -> 294732 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 70d69852acbb28086f6efd6b2bf2e5e651d8c60c..e597cd3ccabc6c53dada3098fb93d332ac685a2b 100644
GIT binary patch
delta 225
zcmZ3|EOh3d;D#@f(?4jjNKD=#BQ^bk8;gK?HG>g@0fQ@pC6F{{uwZax&}A@YFkvuc
za0aqWfTC^;E)2SpCrW8c>H^hS0I?fT+yW?L#9#_!0d-DZFFk$oK3O4<k$jU6iAhWs
zaAx6|-r&w60ki;QtTWgcCm`DZXsiK{Zwh3CEU<uB1+~Bt=l}zth%r!w6OeWR>N8_-
k23oLvdVo6%-}Dk~7LjHH`E~<&Mj&PaV&?4z@+>7u0PjC9I{*Lx

delta 544
zcmZXQy-UMT6vdDFhE}3MsY)$b#5K^^G#_I=!By#~(%nH6C&v!1LLhGzT--X<O?3Bf
z5eH}S+(Z&l!h`$HJNN$X$=lb)!)$Z@+1Gbn)iEz|jWZl!f<3HZRiC74FloguZZLw2
z1H?!XvL3=lf`DJl%7u?HbsG`uh^mbo9{oe=E;7Dnl^zuLyN}&wa`C#|FD?eXKdhMU
zl)W)0q&&h(c$c|uMXy=%D*OmewMj^iOC_N0U__QKPIrvry=Ul;RCQXgHVw6<7gM!w
zUg4bCk8$`rdn-!zh$(XJBpE^y>}r>UH`ym6OLh#aKa>CL<FLo0&*6K{_c7}1&EzI~
zqd-_5oj(1-k`y+pjFdXNM^&_lj)1yNuTO5ku9&?ZZ}R8;|JfT%o&7mebNynd^;v1%
Qmevx_GSA9WX{p8Z8*y=DQvd(}

diff --git a/Updater b/Updater
index 877c2cc..5c06968 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 877c2cc357e19c2e531d935b4fe04e856c6d1576
+Subproject commit 5c06968d76b5b04302fc1aee01c700c5ff79d82a
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 67f95d6..59345d2 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 ee75267..26aa6b4 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