| [qet] [4122] Nsis Installers : add French and English translation for MessageBox , Translators you could translate |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 4122
Author: scorpio810
Date: 2015-08-16 08:48:55 +0200 (Sun, 16 Aug 2015)
Log Message:
-----------
Nsis Installers : add French and English translation for MessageBox, Translators you could translate
LangString.txt files now.
Modified Paths:
--------------
trunk/packaging/windows/QET.nsi
trunk/packaging/windows/QET64.nsi
Added Paths:
-----------
trunk/packaging/windows/LangString.txt
Added: trunk/packaging/windows/LangString.txt
===================================================================
--- trunk/packaging/windows/LangString.txt (rev 0)
+++ trunk/packaging/windows/LangString.txt 2015-08-16 06:48:55 UTC (rev 4122)
@@ -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."
\ No newline at end of file
Modified: trunk/packaging/windows/QET.nsi
===================================================================
--- trunk/packaging/windows/QET.nsi 2015-08-15 15:36:03 UTC (rev 4121)
+++ trunk/packaging/windows/QET.nsi 2015-08-16 06:48:55 UTC (rev 4122)
@@ -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\xE9. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
;--------------------------------
@@ -170,7 +172,7 @@
File /r "./files/conf"
SectionEnd
-
+
SetOverwrite on
Section "Elements" SEC01
SetOutPath "$INSTDIR"
@@ -280,18 +282,18 @@
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
"UninstallString"
StrCmp $R0 "" done
-
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the \
- previous version or `Cancel` to cancel this upgrade." \
+
+MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+ "$(installed)" \
IDOK uninst
Abort
-
+
+
;Run the uninstaller
uninst:
ClearErrors
ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
-
+
IfErrors no_remove_uninstaller done
;You can either use Delete /REBOOTOK in the uninstaller or add some code
;here to remove the uninstaller. Use a registry key to check
@@ -312,7 +314,7 @@
;!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
;!insertmacro MUI_DESCRIPTION_TEXT ${CopyFiles} "CopyFiles"
;!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
+
;--------------------------------
;Uninstaller Section
@@ -351,5 +353,5 @@
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
-
+
FunctionEnd
Modified: trunk/packaging/windows/QET64.nsi
===================================================================
--- trunk/packaging/windows/QET64.nsi 2015-08-15 15:36:03 UTC (rev 4121)
+++ trunk/packaging/windows/QET64.nsi 2015-08-16 06:48:55 UTC (rev 4122)
@@ -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."
- !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\xE9. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade."
+
;--------------------------------
;Components
@@ -166,9 +178,8 @@
SetOutPath "$INSTDIR"
File /r "./files/conf"
+SectionEnd
-SectionEnd
-
SetOverwrite on
Section "Elements" SEC01
SetOutPath "$INSTDIR"
@@ -279,41 +290,40 @@
;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."
- Abort
+
+ MessageBox MB_OK|MB_ICONSTOP $(wrongArch)
+ Abort $(wrongArch)
${EndIf}
- !insertmacro MUI_LANGDLL_DISPLAY
;Auto-uninstall old before installing new
ReadRegStr $R0 HKLM \
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${SOFT_NAME}" \
"UninstallString"
StrCmp $R0 "" done
-
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "${SOFT_NAME} is already installed. $\n$\nClick `OK` to remove the \
- previous version or `Cancel` to cancel this upgrade." \
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+ "$(installed)" \
IDOK uninst
Abort
-
+
;Run the uninstaller
uninst:
ClearErrors
ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
-
+
IfErrors no_remove_uninstaller done
;You can either use Delete /REBOOTOK in the uninstaller or add some code
;here to remove the uninstaller. Use a registry key to check
;whether the user has chosen to uninstall. If you are using an uninstaller
;components page, make sure all sections are uninstalled.
no_remove_uninstaller:
-
+
done:
-
+
FunctionEnd
;--------------------------------
@@ -364,7 +374,7 @@
Function un.onInit
!insertmacro MUI_UNGETLANGUAGE
-
+
FunctionEnd