From 3cb5f748b32bfb8ac590442e82ad9d3e5bb0b6ca Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 6 Nov 2018 00:07:41 +0100 Subject: [PATCH] Windows installer: Bring back license page --- .../installers/windows/installer_template.nsi | 4 +--- indra/newview/installers/windows/lang_da.nsi | Bin 11558 -> 12540 bytes indra/newview/installers/windows/lang_de.nsi | Bin 12758 -> 13814 bytes .../newview/installers/windows/lang_en-us.nsi | Bin 11862 -> 12852 bytes indra/newview/installers/windows/lang_es.nsi | Bin 12284 -> 13274 bytes indra/newview/installers/windows/lang_fr.nsi | Bin 12460 -> 13442 bytes indra/newview/installers/windows/lang_it.nsi | Bin 11924 -> 12914 bytes indra/newview/installers/windows/lang_ja.nsi | Bin 10600 -> 11598 bytes indra/newview/installers/windows/lang_pl.nsi | Bin 12166 -> 13148 bytes .../newview/installers/windows/lang_pt-br.nsi | Bin 12530 -> 13560 bytes indra/newview/installers/windows/lang_ru.nsi | Bin 11746 -> 12736 bytes indra/newview/installers/windows/lang_tr.nsi | Bin 11828 -> 12818 bytes indra/newview/installers/windows/lang_zh.nsi | Bin 10662 -> 11684 bytes 13 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index cfbb14b787..d668e011c2 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -78,9 +78,6 @@ LangString LanguageCode ${LANG_TRADCHINESE} "zh" Name ${INSTNAME} -LicenseText "Vivox Voice System License Agreement" -LicenseData "VivoxAUP.txt" - ;SubCaption 0 $(LicenseSubTitleSetup) # Override "license agreement" text !define MUI_ICON "%%SOURCE%%\installers\windows\firestorm_icon.ico" @@ -128,6 +125,7 @@ SetOverwrite on # Overwrite files by default UninstallText $(UninstallTextMsg) DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup) +!insertmacro MUI_PAGE_LICENSE "VivoxAUP.txt" !insertmacro MULTIUSER_PAGE_INSTALLMODE !define MUI_PAGE_CUSTOMFUNCTION_PRE dirPre !define MUI_PAGE_CUSTOMFUNCTION_LEAVE dirLeave # Optional start menu entry diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi index be3f03c084e6fae0952249e736bde9320a2f9284..788ef93e44e1e9760f59c6f1dd97af2de5e0c65a 100644 GIT binary patch delta 558 zcma)&&q@MO6o-G6MJoNFDI`>wkXi&GuB25=ArV+E6rozwG>thh&cuvbu6l?AJwoez zkf2_pXK2yyUXnyNa$)A&bMO7mch1|@kNv)PAg}5Dl`76~f(kBBM@6nv#nUD{^bz72 zCYt?8|kqMVkOFD3-??eNgn9| zZ1{ZdPw?z1-Y{Vt&gSNj+rguzYZt^)GV-)pmd4ViF=oWhZ_q$Z<}$nTy|wzHda&td z(yz_fM2j4sE5s8W1A5J1%R3G^iq=9;zaKDnr}v@Gn>36_Rnv9#M95y}B~?Zh*9!8r zlb73MZX}OGUc@)B z@da$CjFm57V@2V)0|eHJ5N7YpoqO(g?u_fdo!9ZHdN&Tu5{k&9fNNAxPzm#-ScQit z^zn=;R}XbGk!AJ;AqI?n?n*q5827l^yw^m)zsG$I4&x!CmP+i{|MiWt(LJ*vzNr5(+<6S$?T8(ddMc4*mUdl^%Q<{dr622TTyw~b?J)tHsBi?zzk zn$Pcmdv;qxpnlR;S|9=*x)f&(?)WR?O5JYd{Dts@7@@A# r@>Gf25gd7MkEs6iJ!iKg{eJU|^cVc0wzLF1L_Ea?_(Q(u$zQ& delta 7 OcmeyCeJy#zHA4Ur>I6~% diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi index 83771603a53db59640d198aa8c24c1a51de5784d..fb03e8b3dbb816abbe4d0a9d419d820658552a2d 100644 GIT binary patch delta 607 zcma)3-AV#s5IvH(Q6#Je2_h{)bRk60Roz)c2$qQ<1VL=;nhUyXx>{cO5c34RK|#;b zW$(}%bml{;mM-MGn4fRv%$YMEx9{!O*1lxQ1-aVDt=CY+Db8?-ro62jp0^NSf(XxW z(4r0C!KdHE6eGm+`;2Pye8`;sR`7r!J^l3&B9^brwuEchKlqLG(X4_tUqGaQ=pkJ6 z*xyUwxk)_MbXY&6jnOqTmt*R&tB--1MP_NXkL0mX;_|EFSeyA@0#JrKT%#_H@}7LA zvNK)DCEcH)N}|UX;fa(((p-+bM;t}#U~KxQ?7KIyE~OFnCd3yi= delta 7 OcmdmzaxG>vKR(*u71 diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi index 56cc0cf581292b46fb0f90beba67f85098a06f61..038c7b8d4cd415a66348cc44343b8095d2a1abfb 100644 GIT binary patch delta 600 zcma)3!Ae3=5IvS;SP3r!36VsIphXd_41z2oB+G>%v=XzYKG63}pOz~>V*a6Zf6zC$ zjW&HjeSnM3T$Jk3LhfSj%)RH#nKP5hTjOQ2FVAbcD+T0nhI3q_B;&=yi!vMx;Nb~r zlo=h=VDnzW5Iy+3x0w~Db(b}L&7pxVZ~AJ(g)dfQOWvcgKl~5j>?ntO9*0a0*uQ`P{9p~@)6&W zbRss=k*bvY(^N&Ycsx8(vP+rsiLa4I+3M&U{E)ailj~4wVTaK(X4}Rfa<8+jZFJ(P z1bMZRp(AxSl$Ya3A{mr_iXung5V(@@!uI7YN&7@MDPUk4`K+Xw%{HdYTABG8+=cGE TOAmYUncB4eRkXB+45Ii3J-2!D delta 7 OcmcbW{wIFJAAJB51_XEj diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi index 2bef2ced83456fabb11d8e79d01c30ad94461a9b..5e181167d825b5e9cf5111ad983d7d0e6e25e17c 100644 GIT binary patch delta 588 zcma)3%}N4c6g|cyf?zEKi--(&ft0JDokc`oNf=VAn5HoY#u=F(%azc+MSTy@3%H2h zz&GesdV|ir^ry6tyZG*RzVDuU?zv<8!FwI=n3biid;`Zgz#&f2G8wCO)P{!vLfoT_ zHct-@T;?qd5hG#VC%hDR2U%mHlpto3KO z>{%}U>F|HVGeKAT&8N~~RS$jbMO7BdV>8)Uf6nL3Tedi*?`g4WE=q-wOkq>yZ!hWX zGeX=^X+U-JX?DmXY#pRpKV;pt-eneXtu#YCr8BLs+kLAktB}r3OcPU_?jS?bd-oBS4%z~($=5e7^i)d7=h~Q!zm#E{W M%J8oy^S+t=1jh__LjV8( delta 7 OcmZq5T$8wAjR61-g9C*C diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi index a324cee57c4753a5c704961c216366d3d9718123..f91f40329ea9c706be356e598b328550902fd869 100644 GIT binary patch delta 580 zcma)3!Ab&A6g`%TjHE5fh!94hO@h)YXg7rm!E|8=Eh0?E92jSGX0%-S5!ZcR5Y#WU z=o?z~5q&}DJ&ME##n#6}<7dR(>Rc_OtQ+z4waKbCy92ra diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi index 7e995f25ee1583b28be83e7cf8a8f24f82fa29f7..1c5b56ac9e2874a34580ad9a2190399b85b8b064 100644 GIT binary patch delta 638 zcma)4OG*Pl5Pi`w(Fj41;KD_MS%@yObEB&$B7yk9gn({j91~|CnZ)@-vj~GX5c(eC z4ZMLT@BnVTfv*Zf%&bB$y1TmS)qAh{`|9)N-Q6`Sg}t=~>Nv&;&e1fJ<^9t(Jd7~F zGsV{8IKXso|c>Ba%mS zA2xcd@1^kUG#+!h%n!InaJA=ROdVGBG1OjUX0bd(Rp@2v=EvGB{xg6!+@ggGT$-1q z9rIc&BqGWt;aOXu(c>E6iKKlJU5vg%96{?M*7`B)?({CQ#Ka-@f!f_si-^6>u(T1) zO2Ir7<0P0vH-9?-{7 fb0kxI<($=mSTW~#YDDbepD~k4PB>dtY$K0f8@zyb delta 7 OcmX>X^&)6Ph9&?Io&%%+ diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi index d948a333ab318ea1a295a73b417cc56238f0920c..4984a66e12adc5542235c647dc7fed23e5f514fe 100644 GIT binary patch delta 617 zcma))K}*9x5QSgS2Cak=tOuz=)SD1J7V*+5B86&&O2Jd9F|mO(k+iAy)LZYef5gAy z-5=wdZKJhb%ED%LcIWLkZ!_(D`5)6$Wthjs2I{!P6>ibu+)1-|NtNMDSQo|ERK$U>X5xNLj8!l;e z|7qon?X%UmTTd)azL1Z89c^<)D}*rp(0U8o7Lqpo&&mC7XL$1LXxv z<;ie?Chj?!xKRgdN0SGlrmXG}U_@oni8=q8nq{&Um+hA)PH5ubr&dhmlWN9PYc5gp Rr110iP`j38oZt`zd;_PecaZ=9 delta 7 OcmcbU))v2^O&mgNU4zo77|JOzLvI|B0{oU7(%OL-S;>QW_uY5zIp>`_6L;!=O-|(Pa7Vt=xy=g7xWFZDQRDYPtaRzB4j%(_ z@QNbp++w#_V&htMEP7T$uyrG z>0?~V{3BEHfUAQSN)0J*Inf?*6s?KA=^wK1(VX=$YF?Ln$JpF3#t=Klw9@EHXA;Co z6|6J$)hf%_&KDMB>-2DrD(<+dxRF!qcyv$DKD%2KFfc?hGew@}vr=Tu%>7KxK&Kti hyPm1hO7)V{H3swzW*Ns_7HgO-(obnO<1^$8l zfxqC%v-uLM2bbvLAtJt>6sDIKc&K@-n%9T8EDwI(SA2 zb?!b~cs$q8M}(N?HgA=mc)*yx+IT?7lfHTg5X)D7Ln;O955Ao{7}&Vy@`>aVJ%EE2 z>suK-CyU3N2J=JiF`B05cuZYZwb3=b$SlY5NSxhuxt*Jqg{kGGUk1>I8(g9)kL7JS zELsDV^yYtA$^QY cj%KQ_oU<_@F_`}_Wd{F@d|He7J#3G9P*Cvtl6~|MDkl~Q%%0wq|Y|p-r$zw9mgKMtP>#CBi51EqAHI! zi*x14rd~n4L)HQV^7{NjyijvMohj6Fk3$~CHbAV;&xk$hd8lzg#bdInv|XJLxl7!n z+NkDB2{L0=GDpjJ^LuFwouWfiw1rE#$n4JV*(N66kdmfsrkF#HzoD;?mFeX5sAn){ f$kF<&3Z2)kBZ)OtA_X8OK diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi index ae8244038a8626da6b1683810350451f1be4a2dc..72fb8e2d67cc3d36157b564243a38da49eaf481e 100644 GIT binary patch delta 644 zcma)3T}uK%6g`E7t!z+%Jwzq-RA9ap_O^wDuvw%?(Sz8w=7R3p?rQmDe?jIigwOq> z=$~}%Xdg(B49uN-XYRS@oEep0Z{J3H>Tr4Av{A$<3MiqBf*PjsXH|IUA;2>-s4{wR z;PPBX9}!}n+sy1q-Dgd1Ej%FPNp4;Eh}B1WL%o=*sb3S+O2QggxaabSn;eHYg4RG+_xIU%r*n}hrgj*EE$zRnJsX3| z81X<;P{Z9dWgEua@x<|D?jKPUTEhu0D7M1=Ts+Jde|_><@20d`>E6E-M*+yDRo delta 7 OcmZ1yy)1acGED#uv;%km