diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 346a627..6dbaf00 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 346a6272925a0ad590ef2e1860c77296be9f052d +Subproject commit 6dbaf00ac9db4585a5c90608263da6394ce214ee diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 81c2aec..960c136 100644 Binary files a/MSI/ZRCola/Main/Makefile and b/MSI/ZRCola/Main/Makefile differ diff --git a/MSI/ZRCola/locale/ZRCola.pot b/MSI/ZRCola/locale/ZRCola.pot index 2ac889e..2a3dab0 100644 --- a/MSI/ZRCola/locale/ZRCola.pot +++ b/MSI/ZRCola/locale/ZRCola.pot @@ -26,7 +26,7 @@ msgstr "" #: en_US.Win32.Release.Control-2.idtx:5 en_US.Win32.Release.Control-2.idtx:12 #: en_US.x64.Debug.Control-2.idtx:5 en_US.x64.Debug.Control-2.idtx:12 #: en_US.x64.Release.Control-2.idtx:5 en_US.x64.Release.Control-2.idtx:12 -msgid "binUIHeader.bmp" +msgid "UIHeader.bmp" msgstr "" #: en_US.Win32.Debug.Control-2.idtx:6 en_US.Win32.Release.Control-2.idtx:6 @@ -68,7 +68,7 @@ msgstr "" #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 #: en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14 -msgid "binfontsubst.bmp" +msgid "fontsubst.bmp" msgstr "" #: en_US.Win32.Debug.Control-2.idtx:15 en_US.Win32.Release.Control-2.idtx:15 diff --git a/MSI/ZRCola/locale/de_DE.po b/MSI/ZRCola/locale/de_DE.po index 98746c6..9639055 100644 --- a/MSI/ZRCola/locale/de_DE.po +++ b/MSI/ZRCola/locale/de_DE.po @@ -3468,8 +3468,8 @@ msgstr "" #: en_US.Win32.Release.Control-2.idtx:5 en_US.Win32.Release.Control-2.idtx:12 #: en_US.x64.Debug.Control-2.idtx:5 en_US.x64.Debug.Control-2.idtx:12 #: en_US.x64.Release.Control-2.idtx:5 en_US.x64.Release.Control-2.idtx:12 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: en_US.Win32.Debug.Control-2.idtx:6 en_US.Win32.Release.Control-2.idtx:6 #: en_US.x64.Debug.Control-2.idtx:6 en_US.x64.Release.Control-2.idtx:6 @@ -3522,8 +3522,8 @@ msgstr "" #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 #: en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14 -msgid "binfontsubst.bmp" -msgstr "binfontsubst.bmp" +msgid "fontsubst.bmp" +msgstr "fontsubst.bmp" #: en_US.Win32.Debug.Control-2.idtx:15 en_US.Win32.Release.Control-2.idtx:15 #: en_US.x64.Debug.Control-2.idtx:15 en_US.x64.Release.Control-2.idtx:15 diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index d47c4e4..f0159e2 100644 --- a/MSI/ZRCola/locale/ru_RU.po +++ b/MSI/ZRCola/locale/ru_RU.po @@ -3468,8 +3468,8 @@ msgstr "" #: en_US.Win32.Release.Control-2.idtx:5 en_US.Win32.Release.Control-2.idtx:12 #: en_US.x64.Debug.Control-2.idtx:5 en_US.x64.Debug.Control-2.idtx:12 #: en_US.x64.Release.Control-2.idtx:5 en_US.x64.Release.Control-2.idtx:12 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: en_US.Win32.Debug.Control-2.idtx:6 en_US.Win32.Release.Control-2.idtx:6 #: en_US.x64.Debug.Control-2.idtx:6 en_US.x64.Release.Control-2.idtx:6 @@ -3542,8 +3542,8 @@ msgstr "[DlgTitleFont]Шрифт «00 ZRCola» в «ZRCola»" #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 #: en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14 -msgid "binfontsubst.bmp" -msgstr "binfontsubst.bmp" +msgid "fontsubst.bmp" +msgstr "fontsubst.bmp" #: en_US.Win32.Debug.Control-2.idtx:15 en_US.Win32.Release.Control-2.idtx:15 #: en_US.x64.Debug.Control-2.idtx:15 en_US.x64.Release.Control-2.idtx:15 diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index e770aa2..5638544 100644 --- a/MSI/ZRCola/locale/sl_SI.po +++ b/MSI/ZRCola/locale/sl_SI.po @@ -3468,8 +3468,8 @@ msgstr "" #: en_US.Win32.Release.Control-2.idtx:5 en_US.Win32.Release.Control-2.idtx:12 #: en_US.x64.Debug.Control-2.idtx:5 en_US.x64.Debug.Control-2.idtx:12 #: en_US.x64.Release.Control-2.idtx:5 en_US.x64.Release.Control-2.idtx:12 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: en_US.Win32.Debug.Control-2.idtx:6 en_US.Win32.Release.Control-2.idtx:6 #: en_US.x64.Debug.Control-2.idtx:6 en_US.x64.Release.Control-2.idtx:6 @@ -3535,8 +3535,8 @@ msgstr "[DlgTitleFont]\"00 ZRCola\" v pisavo \"ZRCola\"" #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 #: en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14 -msgid "binfontsubst.bmp" -msgstr "binfontsubst.bmp" +msgid "fontsubst.bmp" +msgstr "fontsubst.bmp" #: en_US.Win32.Debug.Control-2.idtx:15 en_US.Win32.Release.Control-2.idtx:15 #: en_US.x64.Debug.Control-2.idtx:15 en_US.x64.Release.Control-2.idtx:15 diff --git a/Updater b/Updater index a244123..214dfc2 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit a2441233b43e25e870a18918da04f6962017f4f4 +Subproject commit 214dfc2017661c76587cce2dffb6cf6461ca53f1 diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index b7b2f98..f672071 100644 Binary files a/ZRCola/MSIBuild/Makefile and b/ZRCola/MSIBuild/Makefile differ diff --git a/ZRCola/locale/ZRCola.pot b/ZRCola/locale/ZRCola.pot index c5aa29f..0bdbe46 100644 --- a/ZRCola/locale/ZRCola.pot +++ b/ZRCola/locale/ZRCola.pot @@ -679,7 +679,7 @@ msgstr "" #: MSIBuild/en_US.x64.Release.Control-2.idtx:4 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15 -msgid "binUIHeader.bmp" +msgid "UIHeader.bmp" msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:5 @@ -691,7 +691,7 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:6 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6 -msgid "bintutorial1.bmp" +msgid "tutorial1.bmp" msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:7 @@ -727,7 +727,7 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:12 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12 -msgid "bintutorial2.bmp" +msgid "tutorial2.bmp" msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:13 @@ -745,7 +745,7 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:17 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17 -msgid "bintutorial3.bmp" +msgid "tutorial3.bmp" msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:18 diff --git a/ZRCola/locale/de_DE.po b/ZRCola/locale/de_DE.po index 13b7c9a..dc0af7f 100644 --- a/ZRCola/locale/de_DE.po +++ b/ZRCola/locale/de_DE.po @@ -683,8 +683,8 @@ msgstr "" #: MSIBuild/en_US.x64.Release.Control-2.idtx:4 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:5 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5 @@ -695,8 +695,8 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:6 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6 -msgid "bintutorial1.bmp" -msgstr "bintutorial1.bmp" +msgid "tutorial1.bmp" +msgstr "tutorial1.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:7 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7 @@ -731,8 +731,8 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:12 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12 -msgid "bintutorial2.bmp" -msgstr "bintutorial2.bmp" +msgid "tutorial2.bmp" +msgstr "tutorial2.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:13 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13 @@ -749,8 +749,8 @@ msgstr "" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:17 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17 -msgid "bintutorial3.bmp" -msgstr "bintutorial3.bmp" +msgid "tutorial3.bmp" +msgstr "tutorial3.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:18 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18 diff --git a/ZRCola/locale/ru_RU.po b/ZRCola/locale/ru_RU.po index aa765ca..1e500e3 100644 --- a/ZRCola/locale/ru_RU.po +++ b/ZRCola/locale/ru_RU.po @@ -701,8 +701,8 @@ msgstr "" #: MSIBuild/en_US.x64.Release.Control-2.idtx:4 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:5 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5 @@ -713,8 +713,8 @@ msgstr "[DlgTitleFont][SimpleProductName] Руководство по запус #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:6 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6 -msgid "bintutorial1.bmp" -msgstr "bintutorial1.bmp" +msgid "tutorial1.bmp" +msgstr "tutorial1.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:7 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7 @@ -749,8 +749,8 @@ msgstr "[DlgTitleFont][SimpleProductName] Руководство по соста #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:12 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12 -msgid "bintutorial2.bmp" -msgstr "bintutorial2.bmp" +msgid "tutorial2.bmp" +msgstr "tutorial2.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:13 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13 @@ -767,8 +767,8 @@ msgstr "[DlgTitleFont][SimpleProductName] Руководство по вводу #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:17 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17 -msgid "bintutorial3.bmp" -msgstr "bintutorial3.bmp" +msgid "tutorial3.bmp" +msgstr "tutorial3.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:18 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18 diff --git a/ZRCola/locale/sl_SI.po b/ZRCola/locale/sl_SI.po index 3c23377..74789d5 100644 --- a/ZRCola/locale/sl_SI.po +++ b/ZRCola/locale/sl_SI.po @@ -700,8 +700,8 @@ msgstr "" #: MSIBuild/en_US.x64.Release.Control-2.idtx:4 #: MSIBuild/en_US.x64.Release.Control-2.idtx:10 #: MSIBuild/en_US.x64.Release.Control-2.idtx:15 -msgid "binUIHeader.bmp" -msgstr "binUIHeader.bmp" +msgid "UIHeader.bmp" +msgstr "UIHeader.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:5 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:5 @@ -712,8 +712,8 @@ msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Zagon" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:6 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:6 #: MSIBuild/en_US.x64.Release.Control-2.idtx:6 -msgid "bintutorial1.bmp" -msgstr "bintutorial1.bmp" +msgid "tutorial1.bmp" +msgstr "tutorial1.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:7 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:7 @@ -748,8 +748,8 @@ msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Sestavljanje" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:12 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:12 #: MSIBuild/en_US.x64.Release.Control-2.idtx:12 -msgid "bintutorial2.bmp" -msgstr "bintutorial2.bmp" +msgid "tutorial2.bmp" +msgstr "tutorial2.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:13 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:13 @@ -766,8 +766,8 @@ msgstr "[DlgTitleFont]Vadnica [SimpleProductName] : Vnos znakov" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:17 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:17 #: MSIBuild/en_US.x64.Release.Control-2.idtx:17 -msgid "bintutorial3.bmp" -msgstr "bintutorial3.bmp" +msgid "tutorial3.bmp" +msgstr "tutorial3.bmp" #: MSIBuild/en_US.ARM64.Release.Control-2.idtx:18 #: MSIBuild/en_US.Win32.Release.Control-2.idtx:18 diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 75a02c5..54d3c0a 100644 Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile index 0f20fad..fba2941 100644 --- a/lib/libZRColaUI/MSIBuild/Makefile +++ b/lib/libZRColaUI/MSIBuild/Makefile @@ -23,7 +23,7 @@ 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)" != "en_US" -complibZRColaUI.mo.$(LANG) {1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EFD} ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) filelibZRColaUI.mo.$(LANG) +libZRColaUI.mo.$(LANG) {1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EFD} ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) libZRColaUI.mo.$(LANG) !ENDIF <