From 181778c98124fbab20a9224f1a1da9e8f655edc2 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 19 Sep 2016 10:04:42 +0200 Subject: [PATCH] Adaptation to MSIBuild updates - Source file English "en_US" instead of generic "En" now - MSIBUILD_LANG_PO merged to LANG - Language names in MSIBuild extended from two letter to ll_CC syntax --- MSI/MSIBuild | 2 +- MSI/MSICA | 2 +- MSI/ZRCola/Main/Makefile | 60 ++++++++++++++-------------- Makefile | 64 +++++++++++++++--------------- Updater | 2 +- ZRCola/MSIBuild/Makefile | 36 ++++++++--------- include/MSIBuildCfg.mak | Bin 12294 -> 12466 bytes lib/MSICALib | 2 +- lib/libZRColaUI/MSIBuild/Makefile | 8 ++-- lib/wxExtend | 2 +- 10 files changed, 89 insertions(+), 89 deletions(-) diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 2c2fa6d..2825aea 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 2c2fa6d8c619a64dba5c94b4fdbd4ca73021f27b +Subproject commit 2825aea68217bd4a7df986c829a501fbb087d61b diff --git a/MSI/MSICA b/MSI/MSICA index e740e29..2599029 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit e740e29e3d19787dd3ef9a44571c51c4f3e64a71 +Subproject commit 25990295959e411af31e133cd6b503d535bf6c62 diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 82c3b69..a067643 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -68,11 +68,11 @@ compZRCola_It.otf {FFBD408C-9FC1-4CD1-88BF-A0284AD17F96} FontsFolder 8 fileZRCo compZRCola_Bd.otf {E84BB37C-1079-4299-A4BA-4EE48AFE5BCE} FontsFolder 8 fileZRCola_Bd.otf compZRCola_BI.otf {FDFE77E4-45CC-450A-9543-0A83C01A0A48} FontsFolder 8 fileZRCola_BI.otf comp00_ZRCola {63E512B4-33AC-4DB1-A762-071099CAA0DE} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) reg00_ZRCola -!IF "$(LANG)" == "Ru" +!IF "$(LANG)" == "ru_RU" compwxstd.mo.ru_RU {342BD930-C88B-4759-A4A8-F62054E7EA88} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filewxstd.mo.ru_RU compZRCola.zrcdb.mo.ru_RU {BED0B2D2-CC08-4309-A2DB-A18B904B8D13} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.ru_RU !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" compwxstd.mo.sl_SI {A5FEEA94-08CA-4E12-993F-A115601EF258} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filewxstd.mo.sl_SI compZRCola.zrcdb.mo.sl_SI {6572EAD1-EE48-46A1-A28E-77985B667F67} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.zrcdb.mo.sl_SI !ENDIF @@ -84,7 +84,7 @@ compZRCola.zrcdb.mo.sl_SI {6572EAD1-EE48-46A1-A28E-77985B667F67} ZRCOLALOCSLSIDI All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt" -"En.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"en_US.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help @@ -105,11 +105,11 @@ dlgFontSubstitutes ctlText1 Text 15 221 370 36 196611 The "00 ZRCola" font was dlgFontSubstitutes ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -215,16 +215,16 @@ ZRCOLABINDIR ZRCOLADIR .:X64~1.DEB|x64.Debug ZRCOLABINDIR ZRCOLADIR .:X64~1.REL|x64.Release !ENDIF ZRCOLALOCDIR ZRCOLADIR locale -!IF "$(LANG)" == "Ru" +!IF "$(LANG)" == "ru_RU" ZRCOLALOCRURUDIR ZRCOLALOCDIR ru_RU !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" ZRCOLALOCSLSIDIR ZRCOLALOCDIR sl_SI !ENDIF ZRCOLADATADIR ZRCOLADIR data < NUL Directory Directory_Parent DefaultDir @@ -233,11 +233,11 @@ s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) l255 ZRCOLADIR PROGRAMFILESDIR ZRCola:. < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Directory-2.idt" : "En.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Directory-2.idt" : "en_US.$(PLAT).$(CFG).Directory-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -247,7 +247,7 @@ ZRCOLADIR PROGRAMFILESDIR ZRCola:. All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" -"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature Feature_Parent Title Description Display Level Directory_ Attributes @@ -259,11 +259,11 @@ featZRColaDoc Documentation ZRCola Documentation 201 3 ZRCOLADATADIR 8 featZRCola_keyboard featZRColaDoc Keyboard Shortcuts PDF document with a list of ZRCola keyboard shortcuts 1 3 ZRCOLADATADIR 8 < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -305,11 +305,11 @@ 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)" == "Ru" +!IF "$(LANG)" == "ru_RU" filewxstd.mo.ru_RU compwxstd.mo.ru_RU wxstd.mo 0 1060 0 1 fileZRCola.zrcdb.mo.ru_RU compZRCola.zrcdb.mo.ru_RU ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 1060 0 1 !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" filewxstd.mo.sl_SI compwxstd.mo.sl_SI wxstd.mo 0 1060 0 1 fileZRCola.zrcdb.mo.sl_SI compZRCola.zrcdb.mo.sl_SI ZRCOLA~1.MO|ZRCola-zrcdb.mo 0 1060 0 1 !ENDIF @@ -425,7 +425,7 @@ InstallMode Typical SecureCustomProperties OLDPRODUCTFOUND;NEWPRODUCTFOUND < NUL Property Value @@ -439,11 +439,11 @@ ARPHELPLINK http://zrcola.zrc-sazu.si/en/info/instructions/ ARPURLUPDATEINFO http://zrcola.zrc-sazu.si/en/install/ < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Property-2.idt" : "en_US.$(PLAT).$(CFG).Property-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -466,7 +466,7 @@ regDatabasePath 2 SOFTWARE\Amebis\ZRCola DatabasePath [ZRCOLADATADIR] compDataba reg00_ZRCola 2 SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes 00 ZRCola ZRCola comp00_ZRCola < NUL Registry Root Key Name Value Component_ @@ -475,11 +475,11 @@ s$(MSIBUILD_LENGTH_ID) i2 l255 L255 L0 s$(MSIBUILD_LENGTH_ID) regLanguage 2 SOFTWARE\Amebis\ZRCola Language #60 compLanguage < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Registry-2.idt" : "En.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Registry-2.idt" : "en_US.$(PLAT).$(CFG).Registry-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -504,7 +504,7 @@ rmfiZRCola_keyboard compZRCola_keyboard.pdf ZRColaShortcutDir 2 All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" -"En.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" +"en_US.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir @@ -513,11 +513,11 @@ s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSI shctZRCola_keyboard ZRColaShortcutDir ZRCOLA~1|ZRCola Keyboard Shortcuts compZRCola_keyboard.pdf featZRCola_keyboard ZRCola Keyboard Shortcuts iconPDF.ico ZRCOLADATADIR < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF diff --git a/Makefile b/Makefile index a90e5a6..ab8c5bf 100644 --- a/Makefile +++ b/Makefile @@ -37,22 +37,22 @@ Clean :: $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean cd "$(MAKEDIR)" cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=Win32 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=De PLAT=x64 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=Win32 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=En PLAT=x64 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=Win32 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=Win32 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=x64 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Ru PLAT=x64 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=Win32 CFG=Debug - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64 CFG=Release - $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=Sl PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=de_DE PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=de_DE PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=de_DE PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=de_DE PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=en_US PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=en_US PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=en_US PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=en_US PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=ru_RU PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=ru_RU PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=ru_RU PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=ru_RU PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=sl_SI PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=sl_SI PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=sl_SI PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean LANG=sl_SI PLAT=x64 CFG=Debug cd "$(MAKEDIR)" devenv.com "ZRCola.sln" /clean "Release|Win32" devenv.com "ZRCola.sln" /clean "Debug|Win32" @@ -436,82 +436,82 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\ZRColaDe32.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=de_DE PLAT=Win32 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaDe32D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=de_DE PLAT=Win32 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaDe64.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=de_DE PLAT=x64 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaDe64D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=De PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=de_DE PLAT=x64 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaEn32.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=en_US PLAT=Win32 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=en_US PLAT=Win32 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaEn64.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=en_US PLAT=x64 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=en_US PLAT=x64 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaRu32.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=ru_RU PLAT=Win32 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaRu32D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=ru_RU PLAT=Win32 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaRu64.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=ru_RU PLAT=x64 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaRu64D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Ru PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=ru_RU PLAT=x64 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaSl32.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=sl_SI PLAT=Win32 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=sl_SI PLAT=Win32 CFG=Debug cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaSl64.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Release + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=sl_SI PLAT=x64 CFG=Release cd "$(MAKEDIR)" "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" :: cd "MSI\ZRCola" - $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=x64 CFG=Debug + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=sl_SI PLAT=x64 CFG=Debug cd "$(MAKEDIR)" "$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml" diff --git a/Updater b/Updater index 07c11ef..83298f9 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 07c11ef392f058e9ce3b5d03062a4b94cb3009ff +Subproject commit 83298f96da11a3c76be4018088169a6066d4f61f diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 880d017..9e87324 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -104,10 +104,10 @@ 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" +!IF "$(LANG)" == "ru_RU" compZRCola.mo.ru_RU {DEA5D11C-2B0E-4B85-ACE3-D76334866F50} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.mo.ru_RU !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" compZRCola.mo.sl_SI {7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.mo.sl_SI !ENDIF < NUL Dialog_ Control Type X Y Width Height Attributes Property Text Control_Next Help @@ -142,11 +142,11 @@ dlgTutorial3 ctlText1 Text 15 177 370 24 196611 Characters can be entered using dlgTutorial3 ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Control-2.idt" : "en_US.$(PLAT).$(CFG).Control-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -207,7 +207,7 @@ dlgTutorial3 NOT Installed 1402 All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt" -"En.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" +"en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Feature Feature_Parent Title Description Display Level Directory_ Attributes @@ -216,11 +216,11 @@ s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_ featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Feature-2.idt" : "en_US.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF @@ -246,7 +246,7 @@ featZRCola compLanguage featZRCola compDatabasePath featZRCola compZRCola.zrcdb featZRCola compZRCola_Re.otf -!IF "$(LANG)" == "Ru" +!IF "$(LANG)" == "ru_RU" featZRCola compZRCola.mo.ru_RU featZRCola compZRCola.zrcdb.mo.ru_RU featZRCola complibZRColaUI.mo.ru_RU @@ -254,7 +254,7 @@ featZRCola compwxExtend.mo.ru_RU featZRCola compUpdater.mo.ru_RU featZRCola compwxstd.mo.ru_RU !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" featZRCola compZRCola.mo.sl_SI featZRCola compZRCola.zrcdb.mo.sl_SI featZRCola complibZRColaUI.mo.sl_SI @@ -277,10 +277,10 @@ 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)" == "Ru" +!IF "$(LANG)" == "ru_RU" fileZRCola.mo.ru_RU compZRCola.mo.ru_RU ZRCola.mo 0 1060 0 1 !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" fileZRCola.mo.sl_SI compZRCola.mo.sl_SI ZRCola.mo 0 1060 0 1 !ENDIF < NUL Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir @@ -335,11 +335,11 @@ s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSI shctZRCola ZRColaShortcutDir ZRCola compZRCola.exe.$(PLAT) featZRCola Input system for linguistic use iconZRCola.ico ZRCOLABINDIR < NUL !ELSE -"$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(MSIBUILD_LANG_PO).po" +"$(LANG).$(PLAT).$(CFG).Shortcut-2.idt" : "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\$(LANG).po" rcxgettext.exe idtp $@ $** !ENDIF diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 0f438cb04b6f068475d940976dc7c3ffe8344d71..d64e4f3cfc559e1b630b73986f51aeb0a2b517d9 100644 GIT binary patch delta 196 zcmZom*p#?|iJdcrA(bJX!G*zfa-yK*WC0E#W@84!$rm|HCtu?bnk>Q1Gg*O)kJ*JG zb@F6(L(U?GQlRP}hES+#FBDZl45eUI#SA$>Rly9NFf%77uv<*dV27J08w^yz%fQ8; y$l%K0161h>=J_xQt delta 173 zcmdm#*p{$?iJdi=A%{U}@%sMCNE;w zVGUv^#iG6lC>qZY#1INq?=?A%hmY5X!I8m_!5wIxD?=X44py)oll?h!CojAw diff --git a/lib/MSICALib b/lib/MSICALib index 8f26444..3747917 160000 --- a/lib/MSICALib +++ b/lib/MSICALib @@ -1 +1 @@ -Subproject commit 8f264447dd1d8a752209ab1331fda4360ebfaed2 +Subproject commit 37479173a2c811d463934a9c8cec4ac2fa7fd142 diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile index 9de804c..cc0aff8 100644 --- a/lib/libZRColaUI/MSIBuild/Makefile +++ b/lib/libZRColaUI/MSIBuild/Makefile @@ -72,10 +72,10 @@ complibZRColaUI.dll.Win32 {D9A5BF44-DDFE-4A22-89F4-14D291581829} ZRCOLABINDIR 0 !IF "$(PLAT)" == "x64" complibZRColaUI.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} ZRCOLABINDIR 256 filelibZRColaUI.dll.x64 !ENDIF -!IF "$(LANG)" == "Ru" +!IF "$(LANG)" == "ru_RU" complibZRColaUI.mo.ru_RU {2099A205-5D5E-4AD9-BD31-EECC87FEAB47} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filelibZRColaUI.mo.ru_RU !ENDIF -!IF "$(LANG)" == "Sl" +!IF "$(LANG)" == "sl_SI" complibZRColaUI.mo.sl_SI {EAE1C699-8415-4FC6-9EC7-FE74AFC432A9} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filelibZRColaUI.mo.sl_SI !ENDIF <