diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 9e0fca4..69cee66 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 9e0fca463023a110ee78b24d6052ec6859a25cad +Subproject commit 69cee66ae70005f02e5e4c4c686ba4383d3a4bd1 diff --git a/MSI/MSICA b/MSI/MSICA index f112ec1..9cdce06 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit f112ec1f00c57ffeccb76997b6887e0868880d7b +Subproject commit 9cdce06194e15e0a5222043c9bcd7a5aacc79d0b diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 19dcf30..d2d151c 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -53,9 +53,6 @@ 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)" == "Sl" -compwxstd.mo.sl_SI {A5FEEA94-08CA-4E12-993F-A115601EF258} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filewxstd.mo.sl_SI -!ENDIF compLocalizationRepositoryPath {0E96110A-C38D-4600-9AE2-B8B59AF53A00} ZRCOLALOCDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regLocalizationRepositoryPath compLanguage {B78359AC-9484-402C-8384-3A4595B39389} ZRCOLALOCDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regLanguage compDatabasePath {DF3C720D-50BB-4377-9EE0-9AC21C02B9DD} ZRCOLADATADIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regDatabasePath @@ -65,7 +62,12 @@ comp00_ZRCola_Re.otf {A98CF048-44D1-405D-9217-C34900A1ADD5} FontsFolder 0 file0 comp00_ZRCola_It.otf {B3CAE4B5-95D3-4522-9C23-66D015A69C48} FontsFolder 0 file00_ZRCola_It.otf comp00_ZRCola_Bd.otf {FC3D8EE1-7472-487F-97D5-7F65977CBEF7} FontsFolder 0 file00_ZRCola_Bd.otf comp00_ZRCola_BI.otf {F72CB82B-70BF-406E-A310-0294425C12A4} FontsFolder 0 file00_ZRCola_BI.otf +!IF "$(LANG)" == "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" +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 < NUL +"$(OUTPUT_DIR)\Setup\ZRColaRu32.msi" \ +$(REDIST_RU_WIN32) : "$(OUTPUT_DIR)\ZRColaRu32.3.msi" + copy /y $** $@ > NUL + +"$(OUTPUT_DIR)\Setup\ZRColaRu32D.msi" : "$(OUTPUT_DIR)\ZRColaRu32D.3.msi" + copy /y $** $@ > NUL + +"$(OUTPUT_DIR)\Setup\ZRColaRu64.msi" \ +$(REDIST_RU_X64) : "$(OUTPUT_DIR)\ZRColaRu64.3.msi" + copy /y $** $@ > NUL + +"$(OUTPUT_DIR)\Setup\ZRColaRu64D.msi" : "$(OUTPUT_DIR)\ZRColaRu64D.3.msi" + copy /y $** $@ > NUL + "$(OUTPUT_DIR)\Setup\ZRColaSl32.msi" \ $(REDIST_SL_WIN32) : "$(OUTPUT_DIR)\ZRColaSl32.3.msi" copy /y $** $@ > NUL @@ -294,6 +324,7 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\Win32.Release\wxExtend10u_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\ZRCola.exe" \ "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.3.msi" :: devenv.com "ZRCola.sln" /build "Release|Win32" @@ -303,6 +334,7 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\Win32.Debug\wxExtend10ud_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\ZRCola.exe" \ "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" :: devenv.com "ZRCola.sln" /build "Debug|Win32" @@ -312,6 +344,7 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\x64.Release\wxExtend10u_vc100.dll" \ "$(OUTPUT_DIR)\x64.Release\ZRCola.exe" \ "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu64.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl64.3.msi" :: devenv.com "ZRCola.sln" /build "Release|x64" @@ -321,6 +354,7 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\x64.Debug\wxExtend10ud_vc100.dll" \ "$(OUTPUT_DIR)\x64.Debug\ZRCola.exe" \ "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" :: devenv.com "ZRCola.sln" /build "Debug|x64" @@ -337,21 +371,25 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" devenv.com "ZRColaUtils.sln" /build "Debug|Win32" "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu32.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.3.msi" :: devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32" devenv.com "Updater\Updater.sln" /build "Release|Win32" "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu32D.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" :: devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32" devenv.com "Updater\Updater.sln" /build "Debug|Win32" "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu64.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl64.3.msi" :: devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64" devenv.com "Updater\Updater.sln" /build "Release|x64" "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \ +"$(OUTPUT_DIR)\ZRColaRu64D.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" :: devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64" devenv.com "Updater\Updater.sln" /build "Debug|x64" @@ -376,6 +414,26 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=En PLAT=x64 CFG=Debug cd "$(MAKEDIR)" +"$(OUTPUT_DIR)\ZRColaRu32.3.msi" :: + cd "MSI\ZRCola" + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=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 + cd "$(MAKEDIR)" + +"$(OUTPUT_DIR)\ZRColaRu64.3.msi" :: + cd "MSI\ZRCola" + $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=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 + cd "$(MAKEDIR)" + "$(OUTPUT_DIR)\ZRColaSl32.3.msi" :: cd "MSI\ZRCola" $(MAKE) /f "Makefile" /$(MAKEFLAGS) LANG=Sl PLAT=Win32 CFG=Release @@ -403,6 +461,8 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" "$(OUTPUT_DIR)\catalog.xml" : \ "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \ "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \ + "$(OUTPUT_DIR)\ZRColaRu32.3.msi" \ + "$(OUTPUT_DIR)\ZRColaRu64.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl32.3.msi" \ "$(OUTPUT_DIR)\ZRColaSl64.3.msi" -if exist $@ del /f /q $@ @@ -410,6 +470,8 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64.3.msi" copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.3.msi" output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.3.msi" + output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.3.msi" + output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.3.msi" output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-x86 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.3.msi" output\$(PLAT).Release\UpdPublish.exe "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.3.msi" move /y "$(@:"=).tmp" $@ > NUL diff --git a/Updater b/Updater index 55548e1..bec0e13 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 55548e1059e035d58dbaf0e66be2aa56ebdc5cc2 +Subproject commit bec0e13581f06cf5f9d4a359a11f6a160888e752 diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index a345d69..9bd4d40 100644 --- a/ZRCola/MSIBuild/Makefile +++ b/ZRCola/MSIBuild/Makefile @@ -104,6 +104,9 @@ 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" +compZRCola.mo.ru_RU {DEA5D11C-2B0E-4B85-ACE3-D76334866F50} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.mo.ru_RU +!ENDIF !IF "$(LANG)" == "Sl" compZRCola.mo.sl_SI {7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileZRCola.mo.sl_SI !ENDIF @@ -148,6 +151,9 @@ dlgTutorial3 ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap "It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po" rcxgettext.exe idtp $@ $** +"Ru.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\ru_RU.po" + rcxgettext.exe idtp $@ $** + "Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po" rcxgettext.exe idtp $@ $** @@ -226,6 +232,9 @@ featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 "It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po" rcxgettext.exe idtp $@ $** +"Ru.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\ru_RU.po" + rcxgettext.exe idtp $@ $** + "Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po" rcxgettext.exe idtp $@ $** @@ -251,6 +260,14 @@ featZRCola compLanguage featZRCola compDatabasePath featZRCola compZRCola.zrcdb featZRCola comp00_ZRCola_Re.otf +!IF "$(LANG)" == "Ru" +featZRCola compZRCola.mo.ru_RU +featZRCola compZRCola.zrcdb.mo.ru_RU +featZRCola complibZRColaUI.mo.ru_RU +featZRCola compwxExtend.mo.ru_RU +featZRCola compUpdater.mo.ru_RU +featZRCola compwxstd.mo.ru_RU +!ENDIF !IF "$(LANG)" == "Sl" featZRCola compZRCola.mo.sl_SI featZRCola compZRCola.zrcdb.mo.sl_SI @@ -274,6 +291,9 @@ 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" +fileZRCola.mo.ru_RU compZRCola.mo.ru_RU ZRCola.mo 0 1060 0 1 +!ENDIF !IF "$(LANG)" == "Sl" fileZRCola.mo.sl_SI compZRCola.mo.sl_SI ZRCola.mo 0 1060 0 1 !ENDIF @@ -338,6 +358,9 @@ shctZRCola ZRColaShortcutDir ZRCola compZRCola.exe.$(PLAT) featZRCola Input sys "It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po" rcxgettext.exe idtp $@ $** +"Ru.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\ru_RU.po" + rcxgettext.exe idtp $@ $** + "Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po" rcxgettext.exe idtp $@ $** diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index 360a6d7..cf9ae71 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" "POT-Creation-Date: 2016-06-14 11:33+0200\n" -"PO-Revision-Date: 2016-06-14 11:33+0200\n" +"PO-Revision-Date: 2016-07-14 17:50+0200\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: ru_RU\n" @@ -361,7 +361,7 @@ msgstr "" #: zrcolagui.cpp:568 msgid "U+" -msgstr "" +msgstr "U+" #: zrcolagui.cpp:573 msgid "Unicode hexadecimal code" @@ -451,7 +451,7 @@ msgstr "" #: zrcolagui.cpp:887 msgid "zrcola.zrc-sazu.si" -msgstr "" +msgstr "zrcola.zrc-sazu.si" #: zrcolagui.cpp:893 msgid "" @@ -584,24 +584,23 @@ msgstr "" #: MSIBuild/En.x64.Release.Control-2.idtx:3 #: MSIBuild/En.x64.Release.Feature-2.idtx:3 #: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 -#, fuzzy msgid "1252" msgstr "1251" #: MSIBuild/En.Win32.Release.Control-2.idtx:6 #: MSIBuild/En.x64.Release.Control-2.idtx:6 msgid "bintutorial1.bmp" -msgstr "" +msgstr "bintutorial1.bmp" #: MSIBuild/En.Win32.Release.Control-2.idtx:12 #: MSIBuild/En.x64.Release.Control-2.idtx:12 msgid "bintutorial2.bmp" -msgstr "" +msgstr "bintutorial2.bmp" #: MSIBuild/En.Win32.Release.Control-2.idtx:17 #: MSIBuild/En.x64.Release.Control-2.idtx:17 msgid "bintutorial3.bmp" -msgstr "" +msgstr "bintutorial3.bmp" #: MSIBuild/En.Win32.Release.Control-2.idtx:10 #: MSIBuild/En.Win32.Release.Control-2.idtx:15 @@ -609,7 +608,6 @@ msgstr "" #: MSIBuild/En.x64.Release.Control-2.idtx:10 #: MSIBuild/En.x64.Release.Control-2.idtx:15 #: MSIBuild/En.x64.Release.Control-2.idtx:4 -#, fuzzy msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index fe653a8..d7ed8a6 100644 Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ diff --git a/lib/MSICALib b/lib/MSICALib index e321a40..18ac224 160000 --- a/lib/MSICALib +++ b/lib/MSICALib @@ -1 +1 @@ -Subproject commit e321a4082e99613412d630ad83eee2ed32f3b3b6 +Subproject commit 18ac2241b3e0e964391f0c28ebf3ed94ac1c2730 diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile index f73f020..9de804c 100644 --- a/lib/libZRColaUI/MSIBuild/Makefile +++ b/lib/libZRColaUI/MSIBuild/Makefile @@ -72,6 +72,9 @@ 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" +complibZRColaUI.mo.ru_RU {2099A205-5D5E-4AD9-BD31-EECC87FEAB47} ZRCOLALOCRURUDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filelibZRColaUI.mo.ru_RU +!ENDIF !IF "$(LANG)" == "Sl" complibZRColaUI.mo.sl_SI {EAE1C699-8415-4FC6-9EC7-FE74AFC432A9} ZRCOLALOCSLSIDIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filelibZRColaUI.mo.sl_SI !ENDIF @@ -105,6 +108,9 @@ filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~6.DLL|libZRColaUI10u_vc10 filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll 0 0 1536 1 !ENDIF !ENDIF +!IF "$(LANG)" == "Ru" +filelibZRColaUI.mo.ru_RU complibZRColaUI.mo.ru_RU LIBZRC~1.MO|libZRColaUI.mo 0 1060 0 1 +!ENDIF !IF "$(LANG)" == "Sl" filelibZRColaUI.mo.sl_SI complibZRColaUI.mo.sl_SI LIBZRC~1.MO|libZRColaUI.mo 0 1060 0 1 !ENDIF diff --git a/lib/wxExtend b/lib/wxExtend index c21aa27..c6cd4bc 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit c21aa27e623ba9b8e5b3cabbae1f3593154e433f +Subproject commit c6cd4bc7a505bc8376067b93e6a51c8d49f6a5aa