[qet] [4145] Nsis Installers : delete check box license page,

[subversion@xxxxxxxxxxxxx]

Revision: 4145
Author:   scorpio810
Date:     2015-08-21 15:09:06 +0200 (Fri, 21 Aug 2015)
Log Message:
-----------
Nsis Installers : delete check box license page,
move french language variables to lang_extra_fr.nsh
in code page iso 8859-15 (accented characters)

Modified Paths:
--------------
    trunk/packaging/windows/QET.nsi
    trunk/packaging/windows/QET64.nsi
    trunk/packaging/windows/lang_extra.nsh

Added Paths:
-----------
    trunk/packaging/windows/lang_extra_fr.nsh

Modified: trunk/packaging/windows/QET.nsi
===================================================================
--- trunk/packaging/windows/QET.nsi	2015-08-21 05:34:43 UTC (rev 4144)
+++ trunk/packaging/windows/QET.nsi	2015-08-21 13:09:06 UTC (rev 4145)
@@ -63,7 +63,6 @@
 	!define MUI_ABORTWARNING
 	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
 	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
-	!define MUI_LICENSEPAGE_CHECKBOX
 	
 
 	!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
@@ -123,6 +122,7 @@
 
 	!insertmacro MUI_RESERVEFILE_LANGDLL
 	!include lang_extra.nsh
+	!include lang_extra_fr.nsh
 	
 
 	

Modified: trunk/packaging/windows/QET64.nsi
===================================================================
--- trunk/packaging/windows/QET64.nsi	2015-08-21 05:34:43 UTC (rev 4144)
+++ trunk/packaging/windows/QET64.nsi	2015-08-21 13:09:06 UTC (rev 4145)
@@ -69,7 +69,6 @@
 	!define MUI_ABORTWARNING
 	!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico"
 	!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico"
-	!define MUI_LICENSEPAGE_CHECKBOX
 	
 	!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp"
 	!define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH
@@ -127,6 +126,7 @@
 	!insertmacro MUI_RESERVEFILE_LANGDLL
 	
 	!include lang_extra.nsh
+	!include lang_extra_fr.nsh
 	
 
 	

Modified: trunk/packaging/windows/lang_extra.nsh
===================================================================
--- trunk/packaging/windows/lang_extra.nsh	2015-08-21 05:34:43 UTC (rev 4144)
+++ trunk/packaging/windows/lang_extra.nsh	2015-08-21 13:09:06 UTC (rev 4145)
@@ -19,27 +19,6 @@
         LangString var4              ${LANG_ENGLISH}  "Examples of diagrams"
         
         
-        LangString wrongArch         ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
-        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est deja installe. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
-        LangString Elements          ${LANG_FRENCH}  "Elements"
-        LangString Electric          ${LANG_FRENCH}  "Electrique"
-        LangString Logic             ${LANG_FRENCH}  "Logique"
-        LangString Hydraulic         ${LANG_FRENCH}  "Hydraulique"
-        LangString Pneumatic         ${LANG_FRENCH}  "Pneumatique"
-        LangString Energy            ${LANG_FRENCH}  "Energie"
-        LangString water             ${LANG_FRENCH}  "Eaux"
-        LangString Refrigeration     ${LANG_FRENCH}  "Climatisation"
-        LangString Solar_thermal     ${LANG_FRENCH}  "Thermique & solaire"
-        LangString Lang              ${LANG_FRENCH}  "Langues"
-        LangString Titleblocks       ${LANG_FRENCH}  "Cartouches"
-        LangString Examples          ${LANG_FRENCH}  "Exemples"
-        LangString Check             ${LANG_FRENCH}  "Cocher pour lancer ${SOFT_NAME}"
-        LangString var1              ${LANG_FRENCH}  "Elements de la collection officielle"
-        LangString var2              ${LANG_FRENCH}  "Fichiers de langues"
-        LangString var3              ${LANG_FRENCH}  "Exemples de cartouches"
-        LangString var4              ${LANG_FRENCH}  "Exemples de schemas"
-        
-        
         LangString installed         ${LANG_POLISH}  "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzednią wersję lub `Cancel` aby przerwać aktualizację."
         LangString wrongArch         ${LANG_POLISH}  "To oprogramowanie jest przeznaczone wyłącznie dla komputerów 64 bitowych."
         LangString Elements          ${LANG_POLISH}  "Elementy"

Added: trunk/packaging/windows/lang_extra_fr.nsh
===================================================================
--- trunk/packaging/windows/lang_extra_fr.nsh	                        (rev 0)
+++ trunk/packaging/windows/lang_extra_fr.nsh	2015-08-21 13:09:06 UTC (rev 4145)
@@ -0,0 +1,19 @@
+        LangString wrongArch         ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
+        LangString installed         ${LANG_FRENCH}  "${SOFT_NAME} est d\xE9ja install\xE9. $\n$\nCliquer sur `OK` pour d\xE9sinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
+        LangString Elements          ${LANG_FRENCH}  "El\xE9ments"
+        LangString Electric          ${LANG_FRENCH}  "Electrique"
+        LangString Logic             ${LANG_FRENCH}  "Logique"
+        LangString Hydraulic         ${LANG_FRENCH}  "Hydraulique"
+        LangString Pneumatic         ${LANG_FRENCH}  "Pneumatique"
+        LangString Energy            ${LANG_FRENCH}  "Energie"
+        LangString water             ${LANG_FRENCH}  "Eaux"
+        LangString Refrigeration     ${LANG_FRENCH}  "Climatisation"
+        LangString Solar_thermal     ${LANG_FRENCH}  "Thermique & solaire"
+        LangString Lang              ${LANG_FRENCH}  "Langues"
+        LangString Titleblocks       ${LANG_FRENCH}  "Cartouches"
+        LangString Examples          ${LANG_FRENCH}  "Exemples"
+        LangString Check             ${LANG_FRENCH}  "Cocher pour lancer ${SOFT_NAME}"
+        LangString var1              ${LANG_FRENCH}  "El\xE9ments de la collection officielle"
+        LangString var2              ${LANG_FRENCH}  "Fichiers de langues"
+        LangString var3              ${LANG_FRENCH}  "Exemples de cartouches"
+        LangString var4              ${LANG_FRENCH}  "Exemples de sch\xE9mas"
\ No newline at end of file