Nsis Installers : add French and English translation for MessageBox, Translators you could translate

LangString.txt files now.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4122 bfdf4180-ca20-0410-9c96-a3a8aa849046

packaging/windows/LangString.txt

@@ -0,0 +1,14 @@
+	LangString wrongArch ${LANG_ENGLISH} "This distribution is for 64 bits computers only."
+	LangString wrongArch ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
+
+
+
+
+
+
+
+
+
+
+	LangString installed ${LANG_ENGLISH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+	LangString installed ${LANG_FRENCH}  "${SOFT_NAME} est deja installé. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade." 

packaging/windows/QET.nsi

@@ -6,7 +6,6 @@
 ;--------------------------------
 ;Include Modern UI
 	
-	;!include "UMUI.nsh"
 	!include "MUI2.nsh"
 	!include "FileFunc.nsh"
 	!insertmacro Locate
@@ -143,6 +142,9 @@
 	!insertmacro MUI_LANGUAGE "Estonian"
 
 	!insertmacro MUI_RESERVEFILE_LANGDLL
+	
+	LangString installed ${LANG_ENGLISH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+	LangString installed ${LANG_FRENCH}  "${SOFT_NAME} est deja installé. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade." 
 ;--------------------------------
 
 	
@@ -281,12 +283,12 @@ Function .onInit
   "UninstallString"
   StrCmp $R0 "" done
 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  "$(installed)" \
-  previous version or `Cancel` to cancel this upgrade." \
   IDOK uninst
   Abort
 
+
 ;Run the uninstaller
 uninst:
   ClearErrors

packaging/windows/QET64.nsi

@@ -9,11 +9,17 @@
 	!include "MUI2.nsh"
 	!include "FileFunc.nsh"
 	!insertmacro Locate
+	!include FileFunc.nsh
+	!insertmacro GetParameters
+	!insertmacro GetOptions
+	
+	
 !ifndef PROC
 	!define PROC 32 ; 
 !endif
 
 
+	
 ; MUI Settings
 ;--------------------------------
 ;General
@@ -139,8 +145,14 @@
 	!insertmacro MUI_LANGUAGE "Bosnian"
 	!insertmacro MUI_LANGUAGE "Mongolian"
 	!insertmacro MUI_LANGUAGE "Estonian"
-
 	!insertmacro MUI_RESERVEFILE_LANGDLL
+	
+	LangString wrongArch ${LANG_ENGLISH} "This distribution is for 64 bits computers only."
+	LangString wrongArch ${LANG_FRENCH}  "Ce programme est pour Windows 64 bits seulement."
+
+	LangString installed ${LANG_ENGLISH} "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade." 
+	LangString installed ${LANG_FRENCH}  "${SOFT_NAME} est deja installé. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade." 
+
 ;--------------------------------
 ;Components
 
@@ -166,7 +178,6 @@ File /r "./files/ico"
 
 SetOutPath "$INSTDIR"
 File /r "./files/conf"
-
 SectionEnd
 
 SetOverwrite on
@@ -279,14 +290,14 @@ FunctionEnd
 ;Installer Functions
 
 Function .onInit
+ !insertmacro MUI_LANGDLL_DISPLAY
 
 ${If} ${RunningX64}
 ${Else}
-    MessageBox MB_OK|MB_ICONSTOP \
+
-    "This version is only for Windows 64 bits computers."
+    MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
-	Abort 
+	Abort $(wrongArch)
 ${EndIf}
-	!insertmacro MUI_LANGDLL_DISPLAY
 
 ;Auto-uninstall old before installing new
   ReadRegStr $R0 HKLM \
@@ -294,9 +305,8 @@ ${EndIf}
   "UninstallString"
   StrCmp $R0 "" done
 
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
-  "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  "$(installed)" \
-  previous version or `Cancel` to cancel this upgrade." \
   IDOK uninst
   Abort