From e55ae1476a08780b6db08618ed2eb857d145a7ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 Jul 2016 23:55:10 +0200
Subject: [PATCH] Fix innosetup install

---
 build/exe/doliwamp/Languages/MyFrench.isl |   8 ++++----
 build/exe/doliwamp/doliwamp.iss           |   2 ++
 build/exe/doliwamp/doliwampsmall.bmp      | Bin 12814 -> 3318 bytes
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/build/exe/doliwamp/Languages/MyFrench.isl
index 0fd71f96bfb..6c1b859a318 100644
--- a/build/exe/doliwamp/Languages/MyFrench.isl
+++ b/build/exe/doliwamp/Languages/MyFrench.isl
@@ -21,10 +21,10 @@ TechnicalParameters=Param
 IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut.
 
 
-; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 60 CHARACTERS
-SMTPServer=Serveur SMTP (le votre ou celui de votre FAI, première installation uniquement) :
-ApachePort=Port Apache (première installation uniquement, le choix standard est 80) :
-MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306) :
+; WARNING !!! STRINGS FOR THIS 4 STRINGS MUST BE LOWER THAN 70 CHARACTERS
+SMTPServer=Serveur SMTP (le votre ou de votre FAI, première installation uniquement):
+ApachePort=Port Apache (première installation uniquement, le choix standard est 80):
+MySqlPort=Port Mysql (première installation uniquement, le choix standard est 3306):
 MySqlPassword=Mot de passe serveur+base MySql de root (première installation uniquement):
 
 FailedToDeleteLock=Echec de la suppression du fichier %1/www/dolibarr/install.lock. Vous pouvez ignorer l'avertissement mais il est possible que vous deviez le supprimer manuellement plus tard. Dans ce cas, cela vous sera signalé. Cliquez sur OK pour continuer...
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index c82b7b40c47..dfe7febf2db 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -268,6 +268,7 @@ begin
   if firstinstall
   then
   begin
+    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
@@ -275,6 +276,7 @@ begin
   end
   else
   begin
+    // False means it's not a password edit
     Page.Add(CustomMessage('SMTPServer'), False);
     Page.Add(CustomMessage('ApachePort'), False);
     Page.Add(CustomMessage('MySqlPort'), False);
diff --git a/build/exe/doliwamp/doliwampsmall.bmp b/build/exe/doliwamp/doliwampsmall.bmp
index f19e98fd19ae2423acaa635fa3fd23f4584fcbdf..f4d51aa02293ebcfa1b80cdda09298e736569d6d 100644
GIT binary patch
literal 3318
zcmcJQ=~Gfs7>Dh9e}Ii8W}0b;kyb=DnSD&t3X4opmbNja)fUTb1SZ1`FsuyF$~3cG
zjcLyfH?SE?jV4EucC%@bvBElXXXM-$Z2EHVJonD|z4txOIhVO}iHshb>ESq*qU!>5
z`k>PnoijW<(bdD_5xOs#O`MJbx*U%3qLic2b0{Sv#+y=($Iz%{z0Ywf$=Wa%kQwWJ
zY@HX0m^qoTw2Uavqia1gqGq96D1uqj#azxjfL<pVc{}vU`ifxW&ET`PhKkJipX0W1
z+xM}rqaTM~_IKR9sXmg&4a|!5&gJ+411ZM&<>GAee{x0jhkRK2x-RA=lWUV{-1g(T
zDm{neOETcLIKRBj{(z>sQlPT*cUMXHporqc#00upo_9*P0YEYpCEWRd=DJfr^}4_7
zl2ibSc(j_I0?AaAaszN=TLN0Hy7&i-)iNP2#K*)_G}ozeH~QczVtit2AfWY{8lR5F
zuLq1ZG7%`cMpeoxph7V}AqdcV9r}j{y47isdQJAdO6jwfTVvlwk(}5zzKYrSP{#EK
zHaU+DXuDB{&q8D5KbaVW=E}H!c^hf@34wRDIj&2fbtN1cuodv=fVLZ_f#3SVRG7qY
zwj~AU$ImyowAt;yb%)l;6Bjx=dGx}hV1VJKtKV3}XOP?I3Q^dvaU1xR8p;mI6NB*1
zVm<@Ve(Ma}zu8nG2mx&;<Nd#V`3O3jstXEvL3pP^xQGnX)&It9Qiv8SgiNfHS&$I$
z_47O6Z>cRVPNrjRi<BZJpwngl$gkYC7_^lLf`8h60RMemb_t(>cb0Ao1$5pn2eaOq
zO{Lqz@HQo%@$kG9v`yIUwGy66$izEO?Fa>Q)kDA4Y*GnBl!9QTfL@ZcK#{yqUzTqF
z{mb$BaV~<st_nUK*wj110NwTHoO2wbFYkvQ=(6u?vmRfR^**ZoKKcQb!JC6B!_Pa=
zHh}H)t|fr(M(792O&4o&HUSliXH!@JW20s|gWEdsAU*mDwI~FrP%Pg~CY5Enqjl?X
zTO{P@1vs0s45}PvO)4AE^WT0#Zf>tXx0?kdQ&F472K4Cvz5mJoEaI^AHa8US)TFY2
z0gpQI3KDz54OfarhF^TL^ttk3u-Dqx{<5RdP%E!F7OkB$FV~5~Nd~g;{Jxcdial&y
r8p}Q6<rQLf<=${G<sb3F{#BGxbs&OT4n|Z_Np<>aO1XS^4W;}A=hP+)

literal 12814
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
CM^dE#