Amebis/ZRCola
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

MSI: Discontinue prefixed row IDs in tables

Browse Source 
humanSimon, is this really you? 😉

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2022-02-15 13:08:34 +01:00
parent 3c9ace0bbe
commit 082773fdc9
15 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MSI/MSIBuild

Submodule MSI/MSIBuild updated: 346a627292...6dbaf00ac9

BIN
MSI/ZRCola/Main/Makefile
View File

Binary file not shown.

4
MSI/ZRCola/locale/ZRCola.pot
View File

@@ -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

8
MSI/ZRCola/locale/de_DE.po
View File

@@ -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

8
MSI/ZRCola/locale/ru_RU.po
View File

@@ -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

8
MSI/ZRCola/locale/sl_SI.po
View File

@@ -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

2
Updater

Submodule Updater updated: a2441233b4...214dfc2017

BIN
ZRCola/MSIBuild/Makefile
View File

Binary file not shown.

8
ZRCola/locale/ZRCola.pot
View File

@@ -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

16
ZRCola/locale/de_DE.po
View File

@@ -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

16
ZRCola/locale/ru_RU.po
View File

@@ -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

16
ZRCola/locale/sl_SI.po
View File

@@ -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

BIN
include/MSIBuildCfg.mak
View File

Binary file not shown.

4
lib/libZRColaUI/MSIBuild/Makefile
View File

@@ -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
<<NOKEEP
@@ -39,7 +39,7 @@ 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
!IF "$(LANG)" != "en_US"
filelibZRColaUI.mo.$(LANG) complibZRColaUI.mo.$(LANG) LIBZRC~1.MO|libZRColaUI.mo 0 $(MSIBUILD_LANGID) 0 1
libZRColaUI.mo.$(LANG) libZRColaUI.mo.$(LANG) LIBZRC~1.MO|libZRColaUI.mo 0 $(MSIBUILD_LANGID) 0 1
!ENDIF
<<NOKEEP

2
lib/wxExtend

Submodule lib/wxExtend updated: 30f289123f...3f951d9d24