From 082773fdc9fc5ff16eb544aebc8b4afd74835127 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 15 Feb 2022 13:08:34 +0100
Subject: [PATCH] MSI: Discontinue prefixed row IDs in tables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

humanSimon, is this really you? 😉

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/MSIBuild                      |   2 +-
 MSI/ZRCola/Main/Makefile          | Bin 290806 -> 290204 bytes
 MSI/ZRCola/locale/ZRCola.pot      |   4 ++--
 MSI/ZRCola/locale/de_DE.po        |   8 ++++----
 MSI/ZRCola/locale/ru_RU.po        |   8 ++++----
 MSI/ZRCola/locale/sl_SI.po        |   8 ++++----
 Updater                           |   2 +-
 ZRCola/MSIBuild/Makefile          | Bin 24086 -> 23606 bytes
 ZRCola/locale/ZRCola.pot          |   8 ++++----
 ZRCola/locale/de_DE.po            |  16 ++++++++--------
 ZRCola/locale/ru_RU.po            |  16 ++++++++--------
 ZRCola/locale/sl_SI.po            |  16 ++++++++--------
 include/MSIBuildCfg.mak           | Bin 7860 -> 7852 bytes
 lib/libZRColaUI/MSIBuild/Makefile |   4 ++--
 lib/wxExtend                      |   2 +-
 15 files changed, 47 insertions(+), 47 deletions(-)

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 81c2aecda569a05f13729902f8e0e18dcd8c3aa6..960c136cb59f81db5cab4a5aca2cbb5b0ef6fb2f 100644
GIT binary patch
delta 1545
zcmah}T}%{L6uz_b(Pb#R%K{6#%Vxo8BaJl*J4j)71B;MWkPz54K9FSv6j#l<wMrW`
z>5EO;rcae=Jxz;*C)+1uB+WFo585<Mlaj{Q{)AE=j1P@5jS<qc(sO4(3f7v*WWIaO
zoO{l>=lkx1U;WcR`>*VFo8#`FIqHs@v+nTRj2k6%D~lF$q5KO8+RR@(-%-m;s8Btk
z%)ICenG4=)bbkav+i=78z4^7z#?)+}(OjswN-+c5Xto^@^R~Z0?;D8HEdycm<I180
zQMw*yU%ILwLD*cZ0u3hEQd(V*AWX9@z_a~gLgdAmI4I6g{dNT01H3pcCd|3&FCTN3
z*iL%$IV9*_0=ju8@TUX~t5t@~(O`|)Q~Q^!c5XEInQD3?`dh7$cUmI~zb>maqW1sj
z?-gB~^dzUA5SrkY$-ktADCR}@!!WkV!}4olpExQeMPcJV*$3*hXCK>6vu{1tYFbi<
z6{=iPYv}H>T1HovRmf$~wpnaT!80IU<*2os=l7z{I`X&bQl3=MrH5*P(kp7E?9Zu@
zS2?>-y1Bv`#uYR?t?n@eTZrq<l1o9Hb}M}Lb{wM`no-asSz$NqwAH-Ym<+UHF5Fbs
zi?BD_ScEkXTw85c7E51gXmWbDmnk1$Z7stas&CLf^b<T{dH5PNdtuN$50k|{Djq=W
zU(2;<off^&otmZ1;vHXbJ0Wk^;4GaCpqhqP_}F;|ho(cd_+;H~MS}3wQ8tfq>M+np
z4|9yB4Rko@?jtlGhu7xnWdqwCXEp(^Bx}=Sd|V?dbrtcsHM0vJxtMuj`O?`oyeu`c
zm7?t^r8a{H#c02jj82!@k+bEZX!M(bI_isaRV);pzKyes1)|gb1g31BQ!<H)3rSQ;
zut$<x5?#^E8?01D)*ngScF|%d=a3pKafrDy#e?UaBGzOI%PwoO8^KbV+KZHZmYz<r
zS$&PG>Jv%PAq>&LIvEf>{C%FE%|EYoZ*}!!=QDIVjo+0F9nYXv&4>hTDI&n2na+2k
z-ufYfzEb<rp>!7S+P4lhjNtHwYlp6nplIJaK4$zAGty8NAv%}Cdruk3PY3XUOHLt5
z!+D+}&p!O=H{(!yHE!#uI3-T7z{kWHk!C)gVtKyK%sj}rhm-fS4*vhIUU7)VCJ+kz
zXSnUE+U$}sLopm6{V?uKmE*!IDEDb1BVu9~Kbq(jG1BsQ@lo9che!AG7^mD3?BMb8
nL$9S!PnWw{Ykh|hp&cb?kw~`&8*xst=8xf+s${IrA}r+}DH)-C

delta 2294
zcmb7GU2GIp6h6E6Y<Ek$i_><tuERo?su*k1T}uB@8n%G^2$Yg4&?@axww1UPf&@(;
zOpJ+tiP3h{Qw@-m#PDVcSjK2VeDKK-4GAyC1To>o2NU~XH3qHc&d!~gZMy-p*`IU1
z^PPL{ch8)=XMfV>f7WKY!=WQ^493iCxZU}+5HYSyhA|W#h7)icPMWVrTg~sPzYLv%
zJdCo{sSpaZVy$^SdR0L&-Gx#Em@q$&eN}{r&7_O<wxMC3UpW&V;iU_ZCw3&NqObzg
zl38t?`N0F1Re+h*np}3O9h2tUT0w!t4x@yv)x6_^mom7<qjoU$W{r>9QA(w088Ke#
zMX<w|tiyy;8Kn6&2>q}hwy-<}$eB%bU)S5xEXC+Xf(2^OA5|5Yxp>MP(eJAA*nUJ|
z^h+mZ%&YOg6(}9eS8ml$iqKJBY1BMnG=_%ZG!)*LFy5Ll0{jkI6NcFHW72lRPRPP2
z$YSzP2~tp-NZPze6q&S8g$CXJS3K^XyI~Z`eS8?4yFB&1Kg2oKLB{lP)T{h!`9-Xr
zc`*=h7UZ?->6<@Athfn(Eecv;Rs1Em1&X=%vaYAgR$=AticsMG_xt`o;<!`EoQ}1X
z%Zefq`aX!eeIofH=XPMqhx{M;d{mb21)5n98=X|YE(pWX#Ebf<5x0BKVX~5+2*2K$
z62(2*>@40;f-l;p7evc#)7l{L8ZJE>J9bqB)5}BFnFx*x!)`CwXSdu*$l2dc&9c*4
z9CD@_*DTF*&j7oIgHc>d$RAFEMf<TBe=O`vPE&O_Uaw^HTH5y55;*!d>zMTAq=J55
zJWIrJrQtrbS_TiehMYtcUyo_m!{g@}*GTa!DTU>9p&=%epD#4M31_WB3r+>y!5{~y
zn^hXLx(zF+s|`1+7#^AHD&<iWXE<AQy$zpJupFA+KxU(nhT5@P!KPN@q0<t*?L&z-
z;=yb%xx*vdL)0ygx5(@cJmco(8R)BwEt=}YT?)3xpkiCvM%0B1$)fE^?_3<ROuuax
zR^s5*lf*5)iiWn~r`EwP><)&H*|LmTpKQiN#A$&`J22~YL*w?c^B$gpE@*)U9<_U6
zD}O)Cud>nBD?72dLaj)j_26$!PeTtpYm=Yk&uwskAE5p0+sfW8JX(D?{qPd%Rh}aw
zyCG>llz4(>_F#?G(2KE%x_zUq^hG~zppOq>pAt}B*Xj!H$5GE6)0LYqYRMZ@n0;55
zz0q=qIQ+E%eD_`*d*^xlFc?0?{~-9VXfBN@wSa8Ri`NEG(9H*NJr!CpP2UdV9r`_o
zak_OB>q0NXi!e;RP24(DgIG<g^LW@#rwe&J;;Je}u$eAw;zQmiFm1g#f`>zkMVq~N
Iwt#{E0EuxpJ^%m!

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 b7b2f983cd879fff620d8d1af864a4eae4a35ad8..f672071cdf0afa3d1e5d01a4f2ab32f7276f1128 100644
GIT binary patch
delta 896
zcma)5&ubGw7@cHeWRoVwxLaegiJ@7-8pNil3I?nN^TXKCv>~=lC}Lv@7K*L4hU&?q
zNGXyBJxEW|g9j<01JXnO0=<Zb;Hd}kAmX9qAb1gHW*ZAqstn71GvE8(_uj|Mddu>5
z$I^Ul$C_%O?)1^`_IDDjJ$|$uVQfV-_?#iEx%_m(89xShDN383j}i~iRNAa;ns(HX
z1s%1ICQq+QC~68CQGX*4Lp<O=Q6h6>naq<}A`=&JU|du2H1Gxq%`c$Uh>jOpn72GB
zlM=(NF#Ny)x}j@S58kjaCNq~f$kA7!2`heudj-{n=xx?HghcX41p`SHi+$Td0f$y2
z8E*6sf44WoZR;J2py#+QebG3Qe%#;&U&3Y>rbz}DCJmj>@i3Ey%1s*QJZ3ZAV80pt
z5!<y1bFFwv7~_8ipso0ZIqRj1Pf#6Hf^+0Pc_hYsoh-0;nGN1N;bZ5fZ(jNzB-g*s
zDR&uU`u_4ytI)A~Wt8ct3JqIHuR~m%y;LvU=~2|uF|4N(_`p6#<{rNk*vR<V-iLN3
z4tF+#>Fh8zvqSV-wr*ad)`-$5d(j%HF}#kIyceq(53T3Nn87iHelECet_mp<?rWaR
z5ShA4XQiA>Qq1B*vM3H8Gr%m{EwCXhk-IETkvv=fLgh#e{a4SZhgS2<slPM4V#YCu
zu>CxqPkzPTWRH|12^9KO)Tg4@oEjF-!&|Q4OF_Z2a_G3sbg+d7&LHg9?qKJZMu#e&
Fq~8U%`4a#D

delta 1631
zcmdnCgK^p(#tkdjn3EZDCg%&NZa%~IjF~lwA(J6*@<uLe7>h@GG8?x7l;_ATz1e}=
zfEA=?bH2b&X7*%;e1=?x0-ynNC$oqqu%`j_=P;y#44m8{Y5|kqykAtF5iYr3RC$wl
z53_s<P-!|t2tz4D3DB4#pw>j7h#><fLo!e#XYzb0SE$ABRi#bAVnEfIAUTFqpekMl
zE(StoC`zwog_!nUO`4#M@72U7Pf+5UtRMsP@<uLMxXq~y6+pW|?jyqH&Gj;=jA&Yo
zh}6n17tREA^+y$Pg0B9kB0O17)d#9$zLfMNMHU>IKrWy(a1mxGO3$8bq9j2ufDt+%
z0c?OsUFJ~t03()|;DwvC`M=U<MuK4kS3VhA7_ovA&*X{fqVS+YN^sJ65*(5qP#Bz0
z(?Em)hN-Yb<)p5H$Vakx{f%UPy^Q?kBkFuee#Ni=o8LB9Xx_t>2oO2!pq?wigaTB9
zVIxp%bDVwzGgM-$QNK85XhG5$&~ebPNi-IPsxLJrO+7G%CVQDw5w>IVLzACOP)lx_
zCqr4*7BCjjpv{{sgt%bk61bdt;Uop;Gdlaj+5XPjaCW7$F`V7#B02epGeXZ@=S;X9
zuxOjS!381L=;8^NJL%#MXY;!{!rA_=_AvJ5Ue|JFcsZFbpbnD&I#hjffM*I^ZojB1
zTn@<I{KwOenLQJjxATGJcf7CY<~UzI7TF?T;S4I0qZoo1oPkm~z!Dae@L+|u`sM|J
zKbR&bnHx=3VAGjAEA++WMPXX3#S9q?$&(9RWGAl+l$iW4j1O)V$QefAQOGt;UJx!f
W`ICvvWG>r;$tuAzo8uyGFarRBQJUNU

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 75a02c5c1a7c2dbc6c148978cccfe569acaeab29..54d3c0a60c4e466aa77c1ed8580821ce434428f6 100644
GIT binary patch
delta 18
acmdmDyT*2d95-X|<c9)_H=p8uB?JIRFbA^$

delta 22
dcmZ2uyTx{c95<&MgFizkgCB#-W_j*jVE{@t1-1YH

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
 <<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
 
diff --git a/lib/wxExtend b/lib/wxExtend
index 30f2891..3f951d9 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit 30f289123f7e02fb11c1cb4e38bc17c7c41b68e7
+Subproject commit 3f951d9d241a8ccf52394079b63ac35d69f81fd8