From c0f1e2ad00fb9445f929a31c140c0de0f6884470 Mon Sep 17 00:00:00 2001
From: joostverburg
Date: Fri, 8 Nov 2002 21:08:27 +0000
Subject: [PATCH] Modern UI 1.5
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1631 212acab6-be3b-0410-9dea-997c60f758d6
---
Contrib/Modern UI/Changelog.txt | 10 +-
Contrib/Modern UI/Language files/Arabic.nsh | 102 ++++------
Contrib/Modern UI/Language files/Dutch.nsh | 90 ++++-----
Contrib/Modern UI/Language files/English.nsh | 102 ++++------
Contrib/Modern UI/Language files/French.nsh | 106 ++++------
Contrib/Modern UI/Language files/German.nsh | 92 ++++-----
Contrib/Modern UI/Language files/Greek.nsh | 98 ++++-----
Contrib/Modern UI/Language files/Italian.nsh | 94 ++++-----
Contrib/Modern UI/Language files/Japanese.nsh | 94 ++++-----
Contrib/Modern UI/Language files/Polish.nsh | 94 ++++-----
.../Modern UI/Language files/PortugueseBR.nsh | 96 ++++-----
Contrib/Modern UI/Language files/Russian.nsh | 94 ++++-----
.../Modern UI/Language files/SimpChinese.nsh | 90 ++++-----
Contrib/Modern UI/Language files/Spanish.nsh | 106 ++++------
.../Modern UI/Language files/TradChinese.nsh | 94 ++++-----
.../Modern UI/Language files/Ukrainian.nsh | 94 ++++-----
Contrib/Modern UI/Readme.html | 64 ++++--
Contrib/Modern UI/System.nsh | 186 ++++++++++++++++--
Examples/Modern UI/Basic.nsi | 8 +-
Examples/Modern UI/InstallOptions.nsi | 28 +--
Examples/Modern UI/MultiLanguage.nsi | 8 +-
21 files changed, 789 insertions(+), 961 deletions(-)
diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt
index c5e32b0e..4cde9361 100644
--- a/Contrib/Modern UI/Changelog.txt
+++ b/Contrib/Modern UI/Changelog.txt
@@ -1,8 +1,16 @@
NSIS Modern User Interface - VERSION HISTORY
+1.5 - Novermber 8, 2002
+* New language file format
+* Language strings can be changed in the script without editing language files
+* Install Options macro's updated. MUI_INSTALLOPTIONS_DISPLAY is the standard macro now.
+ Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
+* Renamed macro's and defines
+* Some small fixes
+
1.4 - November 4, 2002
* Uses new NSIS Page command
-* Macro system updates (smaller)
+* Macro System updates (smaller)
* Macro System a lot easier
* Modern UI Language Files load NLF language files
* Renamed macro's and defines
diff --git a/Contrib/Modern UI/Language files/Arabic.nsh b/Contrib/Modern UI/Language files/Arabic.nsh
index cb8d361b..853e6c74 100644
--- a/Contrib/Modern UI/Language files/Arabic.nsh
+++ b/Contrib/Modern UI/Language files/Arabic.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Arabic (1025)
;By asdfuae@msn.com
;--------------------------------
-!verbose 3
-!ifndef MUI_ARABIC_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ARABIC"
-!define MUI_ARABIC_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Arabic" ;
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Arabic.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM " ա ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE " ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS " ɡ "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO " "
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE " ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP " ${MUI_PRODUCT} $\r$\n$\r$\n . ѡ ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION " "
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE " ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE " "
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING " ${MUI_PRODUCT}"
- !define MUI_ARABIC_LANGNAME "Arabic" ; (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_ARABIC} "${MUI_NAME}"
-
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_ARABIC} " "
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_ARABIC} " "
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_ARABIC} " ա ${MUI_PRODUCT}."
- !endif
-
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_ARABIC} " ɡ "
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ARABIC} " "
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ARABIC} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ARABIC} " "
- !endif
-
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_ARABIC} " ${MUI_PRODUCT} $\r$\n$\r$\n . ѡ ."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ARABIC} " "
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ARABIC} " "
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ARABIC} ""
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT}."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_ARABIC} " "
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ARABIC} " "
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_ARABIC} " ${MUI_PRODUCT}"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_ARABIC} " ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE " ${MUI_NAME}"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE " ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE " ${MUI_PRODUCT} "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO " ${MUI_PRODUCT}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE " ${MUI_PRODUCT}."
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_ARABIC} " ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ARABIC} " ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT} "
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ARABIC} ""
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ARABIC} " ${MUI_PRODUCT}."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ARABIC} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ARABIC} " "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE " "
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ARABIC} " ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE " ${MUI_NAME}"
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh
index 252f71f2..2d35713d 100644
--- a/Contrib/Modern UI/Language files/Dutch.nsh
+++ b/Contrib/Modern UI/Language files/Dutch.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Dutch (1043)
;By Joost Verburg
;--------------------------------
-!verbose 3
-!ifndef MUI_DUTCH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "DUTCH"
-!define MUI_DUTCH_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Nederlands" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
-
- !define MUI_DUTCH_LANGNAME "Nederlands" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_DUTCH} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_DUTCH} "Druk op Page Down om de rest van de overeenkomt te zien."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_DUTCH} "Licentie Overeenkomst"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_DUTCH} "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} installeerd."
- LangString MUI_INNERTEXT_LICENSE ${LANG_DUTCH} "Als u de overeenkomt accepteert, kies Akkoord om verder te gaan. U moet met de overeenkomst acceptren om ${MUI_PRODUCT} te installeren."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licentie Overeenkomst"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} installeerd."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Druk op Page Down om de rest van de overeenkomt te zien."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Als u de overeenkomt accepteert, kies Akkoord om verder te gaan. U moet met de overeenkomst acceptren om ${MUI_PRODUCT} te installeren."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_DUTCH} "Selecteer de onderdelen die u wilt installleren en deselecteer de onderdelen die u niet wilt installeren. Klik Volgende om verder te gaan."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_DUTCH} "Kies Onderdelen"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_DUTCH} "Kies de onderdelen die u wilt installeren."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_DUTCH} "Beschrijving"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_DUTCH} "Beweeg uw muis over een onderdeel om een beschrijving te zien."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Kies Onderdelen"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Kies de onderdelen die u wilt installeren."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Selecteer de onderdelen die u wilt installleren en deselecteer de onderdelen die u niet wilt installeren. Klik Volgende om verder te gaan."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschrijving"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg uw muis over een onderdeel om een beschrijving te zien."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_DUTCH} "Setup zal ${MUI_PRODUCT} in de volgende map installeren.$\r$\n$\r$\nOm in een deze map te intalleren, klik Installeren. Om in een andere map te installeren, klik Bladeren en selecteer een andere map."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_DUTCH} "Kies Installatie Locatie"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_DUTCH} "Kies de map waarin u ${MUI_PRODUCT} in wilt installeren."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_DUTCH} "Installatie Map"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Kies Installatie Locatie"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Kies de map waarin u ${MUI_PRODUCT} in wilt installeren."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Setup zal ${MUI_PRODUCT} in de volgende map installeren.$\r$\n$\r$\nOm in een deze map te intalleren, klik Installeren. Om in een andere map te installeren, klik Bladeren en selecteer een andere map."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Installatie Map"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_DUTCH} "Bezig met installeren"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik geduld terwijl ${MUI_PRODUCT} wordt geinstalleerd."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Bezig met installeren"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Een ogenblik geduld terwijl ${MUI_PRODUCT} wordt geinstalleerd."
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_DUTCH} "Gereed"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "De installatie is succesvol verlopen."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Gereed"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "De installatie is succesvol verlopen."
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Installatie"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Denstalleer ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Verwijder ${MUI_PRODUCT} van uw system."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Dit programma zal ${MUI_PRODUCT} verwijderen van uw systeem."
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_DUTCH} "Dit programma zal ${MUI_PRODUCT} verwijderen van uw systeem."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_DUTCH} "Denstalleer ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_DUTCH} "Verwijder ${MUI_PRODUCT} van uw system."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Bezig met denstalleren"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Een ogenblik gedult terwijl ${MUI_PRODUCT} van uw system wordt verwijderd."
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_DUTCH} "Bezig met denstalleren"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik gedult terwijl ${MUI_PRODUCT} van uw system wordt verwijderd."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Gereed"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${MUI_PRODUCT} is verwijderd van uw systeem."
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_DUTCH} "Gereed"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "${MUI_PRODUCT} is verwijderd van uw systeem."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup"
- !endif
-
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Denstallatie"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh
index 3af4aff2..61cc24e7 100644
--- a/Contrib/Modern UI/Language files/English.nsh
+++ b/Contrib/Modern UI/Language files/English.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;version 2 - Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: English (1033)
;By Joost Verburg
;--------------------------------
-!verbose 3
-!ifndef MUI_ENGLISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ENGLISH"
-!define MUI_ENGLISH_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "English" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "License Agreement"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Press Page Down to see the rest of the agreement."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Choose Components"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Choose which features of ${MUI_PRODUCT} you want to install."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Description"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hover your mouse over a component to see it's description."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Choose Install Location"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Choose the folder in which to install ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Setup will install ${MUI_PRODUCT} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Destination Folder"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installing"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being installed."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Finished"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Setup was completed successfully."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Are you sure you want to quit ${MUI_PRODUCT} Setup?"
- !define MUI_ENGLISH_LANGNAME "English" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_ENGLISH} "${MUI_NAME}"
-
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_ENGLISH} "Press Page Down to see the rest of the agreement."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_ENGLISH} "License Agreement"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ENGLISH} "Please review the license terms before installing ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_ENGLISH} "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
- !endif
-
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_ENGLISH} "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ENGLISH} "Choose Components"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ENGLISH} "Choose which features of ${MUI_PRODUCT} you want to install."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ENGLISH} "Description"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ENGLISH} "Hover your mouse over a component to see it's description."
- !endif
-
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_ENGLISH} "Setup will install ${MUI_PRODUCT} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ENGLISH} "Choose Install Location"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ENGLISH} "Choose the folder in which to install ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ENGLISH} "Destination Folder"
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ENGLISH} "Installing"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${MUI_PRODUCT} is being installed."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_ENGLISH} "Finished"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Setup was completed successfully."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_ENGLISH} "Are you sure you want to quit ${MUI_PRODUCT} Setup?"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_NAME} Setup"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Setup"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Uninstall ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remove ${MUI_PRODUCT} from your system."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "This will uninstall ${MUI_PRODUCT} from your system."
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_ENGLISH} "This will uninstall ${MUI_PRODUCT} from your system."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${MUI_PRODUCT} from your system."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Uninstalling"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being uninstalled."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Finished"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Uninstall was completed successfully."
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ENGLISH} "Uninstalling"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${MUI_PRODUCT} is being uninstalled."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Uninstall"
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ENGLISH} "Finished"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Uninstall was completed successfully."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_NAME} Uninstall"
- !endif
-
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/French.nsh b/Contrib/Modern UI/Language files/French.nsh
index 3da93f7b..63dc607c 100644
--- a/Contrib/Modern UI/Language files/French.nsh
+++ b/Contrib/Modern UI/Language files/French.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: French (1036)
;By Sbastien Delahaye
;--------------------------------
-!verbose 3
-!ifndef MUI_FRENCH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "FRENCH"
-!define MUI_FRENCH_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Franais" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licence utilisateur"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Veuillez examiner les termes de la licence avant d'installer ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Appuyez sur Page Down pour lire le reste de la licence utilisateur."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Si vous acceptez tous les termes de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur pour installer ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Choisissez les composants"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Choisissez les composants que vous souhaitez installer."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Cochez les composants que vous souhaitez installer, et dcochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Description"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Passer le curseur de votre souris sur un composant pour voir sa description."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Choisissez le dossier d'installation"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Choisissez le dossier dans lequel installer ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Le programme d'installation va maintenant installer ${MUI_PRODUCT} dans le dossier suivant.$\r$\n$\r$\nPour l'installer dans ce dossier, cliquez sur Installer. Pour l'installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Dossier d'installation"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installation en cours"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'tre install sur votre ordinateur."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Installation termine"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "L'installation s'est termine avec succs."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "tes-vous sr de vouloir quitter l'installation de ${MUI_PRODUCT} ?"
- !define MUI_FRENCH_LANGNAME "Franais" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_FRENCH} "${MUI_NAME}"
-
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_FRENCH} "Appuyez sur Page Down pour lire le reste de la licence utilisateur."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_FRENCH} "Licence utilisateur"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_FRENCH} "Veuillez examiner les termes de la licence avant d'installer ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_FRENCH} "Si vous acceptez tous les termes de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur pour installer ${MUI_PRODUCT}."
- !endif
-
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_FRENCH} "Cochez les composants que vous souhaitez installer, et dcochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_FRENCH} "Choisissez les composants"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_FRENCH} "Choisissez les composants que vous souhaitez installer."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_FRENCH} "Description"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_FRENCH} "Passer le curseur de votre souris sur un composant pour voir sa description."
- !endif
-
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_FRENCH} "Le programme d'installation va maintenant installer ${MUI_PRODUCT} dans le dossier suivant.$\r$\n$\r$\nPour l'installer dans ce dossier, cliquez sur Installer. Pour l'installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_FRENCH} "Choisissez le dossier d'installation"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_FRENCH} "Choisissez le dossier dans lequel installer ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_FRENCH} "Dossier d'installation"
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_FRENCH} "Installation en cours"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_FRENCH} "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'tre install sur votre ordinateur."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_FRENCH} "Installation termine"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "L'installation s'est termine avec succs."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_FRENCH} "tes-vous sr de vouloir quitter l'installation de ${MUI_PRODUCT} ?"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Installation de ${MUI_NAME}"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_FRENCH} "Ce programme va supprimer ${MUI_PRODUCT} de votre ordinateur."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_FRENCH} "Dsinstaller ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_FRENCH} "Supprimer ${MUI_PRODUCT} de votre ordinateur."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_FRENCH} "Dsinstallation en cours"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_FRENCH} "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'tre supprim de votre ordinateur."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_FRENCH} "Dsinstallation termine"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "La dsinstallation s'est termine avec succs."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Dsinstaller ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Supprimer ${MUI_PRODUCT} de votre ordinateur."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Ce programme va supprimer ${MUI_PRODUCT} de votre ordinateur."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Dsinstallation en cours"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'tre supprim de votre ordinateur."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Dsinstallation termine"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La dsinstallation s'est termine avec succs."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Dsinstallation de ${MUI_NAME}"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/German.nsh b/Contrib/Modern UI/Language files/German.nsh
index e261f258..8c20771a 100644
--- a/Contrib/Modern UI/Language files/German.nsh
+++ b/Contrib/Modern UI/Language files/German.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: German (1031)
;By L.King
;--------------------------------
-!verbose 3
-!ifndef MUI_GERMAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "GERMAN"
-!define MUI_GERMAN_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Deutsch" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !define MUI_GERMAN_LANGNAME "Deutsch" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Lizenzabkommen"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Drcken Sie die Bild-nach-unten Taste um den Rest des Abkommens zu sehen."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie mssen die Lizenzvereinbarungen anerkennen um ${MUI_PRODUCT} zu installieren."
- ;INSTALLER
- Name /LANG=${LANG_GERMAN} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Whlen Sie die Komponenten aus"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Whlen Sie die Komponenten aus, die Sie installieren mchten."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Whlen Sie die Komponenten aus, die Sie installieren mchten und whlen Sie diejenigen ab, die Sie nicht installieren wollen. Klicken Sie auf Weiter um fortzufahren."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschreibung"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger ber eine Komponente um ihre Beschreibung zu sehen."
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_GERMAN} "Drcken Sie die Bild-nach-unten Taste um den Rest des Abkommens zu sehen."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_GERMAN} "Lizenzabkommen"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GERMAN} "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
- LangString MUI_INNERTEXT_LICENSE ${LANG_GERMAN} "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie mssen die Lizenzvereinbarungen anerkennen um ${MUI_PRODUCT} zu installieren."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Whlen Sie das Zielverzeichnis aus"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Whlen Sie das Verzeichnis aus, in dem ${MUI_PRODUCT} installiert werden soll."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "${MUI_PRODUCT} wird in das unten angegebene Verzeichnis installiert.$\r$\n$\r$\nKlicken Sie auf Installieren um fortzufahren. Falls Sie in ein anderes Verzeichnis installieren mchten, klicken Sie auf Durchsuchen und whlen Sie ein anderes Verzeichnis aus."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Zielverzeichnis"
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_GERMAN} "Whlen Sie die Komponenten aus, die Sie installieren mchten und whlen Sie diejenigen ab, die Sie nicht installieren wollen. Klicken Sie auf Weiter um fortzufahren."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GERMAN} "Whlen Sie die Komponenten aus"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GERMAN} "Whlen Sie die Komponenten aus, die Sie installieren mchten."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_GERMAN} "Beschreibung"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GERMAN} "Bewegen Sie den Mauszeiger ber eine Komponente um ihre Beschreibung zu sehen."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installiere..."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, whrend ${MUI_PRODUCT} installiert wird."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_GERMAN} "${MUI_PRODUCT} wird in das unten angegebene Verzeichnis installiert.$\r$\n$\r$\nKlicken Sie auf Installieren um fortzufahren. Falls Sie in ein anderes Verzeichnis installieren mchten, klicken Sie auf Durchsuchen und whlen Sie ein anderes Verzeichnis aus."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GERMAN} "Whlen Sie das Zielverzeichnis aus"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GERMAN} "Whlen Sie das Verzeichnis aus, in dem ${MUI_PRODUCT} installiert werden soll."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GERMAN} "Zielverzeichnis"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Fertig"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Die Installation wurde erfolgreich abgeschlossen."
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GERMAN} "Installiere..."
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, whrend ${MUI_PRODUCT} installiert wird."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_GERMAN} "Fertig"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_GERMAN} "Die Installation wurde erfolgreich abgeschlossen."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_GERMAN} "Sind Sie sicher, dass Sie die Installation von ${MUI_PRODUCT} abbrechen wollen?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Installation von ${MUI_PRODUCT} abbrechen wollen?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Installation"
+
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Deinstallation von ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Entferne ${MUI_PRODUCT} von ihrem System."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Deinstalliert ${MUI_PRODUCT} von ihrem System."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Deinstalliere..."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Bitte warten Sie, whrend ${MUI_PRODUCT} entfernt wird."
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_GERMAN} "Deinstalliert ${MUI_PRODUCT} von ihrem System."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GERMAN} "Deinstallation von ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GERMAN} "Entferne ${MUI_PRODUCT} von ihrem System."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_GERMAN} "Deinstalliere..."
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, whrend ${MUI_PRODUCT} entfernt wird."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_GERMAN} "Fertig"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GERMAN} "Die Deinstallation von ${MUI_PRODUCT} wurde erfolgreich abgeschlossen."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Fertig"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Die Deinstallation von ${MUI_PRODUCT} wurde erfolgreich abgeschlossen."
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Deinstallation"
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Greek.nsh b/Contrib/Modern UI/Language files/Greek.nsh
index bc9ad32b..215e664b 100644
--- a/Contrib/Modern UI/Language files/Greek.nsh
+++ b/Contrib/Modern UI/Language files/Greek.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Greek (1032)
;By Makidis N. Mike
;--------------------------------
-!verbose 3
-!ifndef MUI_GREEK_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "GREEK"
-!define MUI_GREEK_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Greek" ;
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Greek.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " '${MUI_PRODUCT}'."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP " Page Down ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM " . , , '${MUI_PRODUCT}'."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE " ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS " . ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO " ."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE " '${MUI_PRODUCT}'."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP " '${MUI_PRODUCT}' .$\r$\n$\r$\n , . , ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION " "
- !define MUI_GREEK_LANGNAME "Greek" ; (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_GREEK} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE " '${MUI_PRODUCT}' ."
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_GREEK} " Page Down ."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_GREEK} " "
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}'."
- LangString MUI_INNERTEXT_LICENSE ${LANG_GREEK} " . , , '${MUI_PRODUCT}'."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE " ."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_GREEK} " . ."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GREEK} " "
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GREEK} " ."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_GREEK} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GREEK} " ."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING " '${MUI_PRODUCT}';"
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_GREEK} " '${MUI_PRODUCT}' .$\r$\n$\r$\n , . , ."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GREEK} " "
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}'."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GREEK} " "
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GREEK} " "
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}' ."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_GREEK} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_GREEK} " ."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_GREEK} " '${MUI_PRODUCT}';"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_GREEK} " '${MUI_PRODUCT} ${MUI_VERSION}'"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE " '${MUI_NAME}'"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE " '${MUI_PRODUCT}'"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE " '${MUI_PRODUCT}' ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO " '${MUI_PRODUCT}' ."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE " '${MUI_PRODUCT}' ."
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_GREEK} " '${MUI_PRODUCT}' ."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GREEK} " '${MUI_PRODUCT}'"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}' ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE " ."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE " '${MUI_NAME}'"
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_GREEK} " "
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}' ."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_GREEK} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GREEK} " ."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GREEK} " '${MUI_PRODUCT} ${MUI_VERSION}'"
- !endif
-
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Italian.nsh b/Contrib/Modern UI/Language files/Italian.nsh
index ae6b8ae7..4eaa0729 100644
--- a/Contrib/Modern UI/Language files/Italian.nsh
+++ b/Contrib/Modern UI/Language files/Italian.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Italian (1040)
;By SANFACE Software
;--------------------------------
-!verbose 3
-!ifndef MUI_ITALIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ITALIAN"
-!define MUI_ITALIAN_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Italiano" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Italian.nlf"
-
- !define MUI_ITALIAN_LANGNAME "Italiano" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_ITALIAN} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_ITALIAN} "Seleziona Page Down per vedere il resto della licenza d'uso."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_ITALIAN} "Licenza d'uso"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ITALIAN} "Per favore esamina i termini della licenza d'uso prima di installare ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_ITALIAN} "Se accetti i termini della licenza d'uso seleziona Accetto per continuare. Devi accettare i termini della licenza d'uso per installare ${MUI_PRODUCT}."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licenza d'uso"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Per favore esamina i termini della licenza d'uso prima di installare ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Seleziona Page Down per vedere il resto della licenza d'uso."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Se accetti i termini della licenza d'uso seleziona Accetto per continuare. Devi accettare i termini della licenza d'uso per installare ${MUI_PRODUCT}."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_ITALIAN} "Seleziona i componenti che vuoi installare e deseleziona i componenti che non vuoi installare. Per continuare clicca su Sucessivo."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ITALIAN} "Seleziona i componenti"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ITALIAN} "Seleziona i componenti che vuoi installare."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ITALIAN} "Descrizione"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ITALIAN} "Per leggere una descrizione pi approfondita dei componenti posiziona il puntatore del mouse sul componente di tuo interesse."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Seleziona i componenti"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Seleziona i componenti che vuoi installare."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Seleziona i componenti che vuoi installare e deseleziona i componenti che non vuoi installare. Per continuare clicca su Sucessivo."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrizione"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Per leggere una descrizione pi approfondita dei componenti posiziona il puntatore del mouse sul componente di tuo interesse."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_ITALIAN} "Il programma d'installazione installer ${MUI_PRODUCT} nella cartella selezionata.$\r$\n$\r$\nPer installare nella cartella selezionata clicca su Installa. Per installare in una cartella differente, clicca su Sfoglia e seleziona un'altra cartella."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ITALIAN} "Scegli la cartella di installazione"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ITALIAN} "Scegli la cartella dove installare ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ITALIAN} "Cartella d'installazione"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Scegli la cartella di installazione"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Scegli la cartella dove installare ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Il programma d'installazione installer ${MUI_PRODUCT} nella cartella selezionata.$\r$\n$\r$\nPer installare nella cartella selezionata clicca su Installa. Per installare in una cartella differente, clicca su Sfoglia e seleziona un'altra cartella."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Cartella d'installazione"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ITALIAN} "Installazione in corso"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ITALIAN} "Per favore attendi che ${MUI_PRODUCT} sia completamente installato."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installazione in corso"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Per favore attendi che ${MUI_PRODUCT} sia completamente installato."
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_ITALIAN} "Installazione completata"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "L'installazione stata completata con successo."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Installazione completata"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "L'installazione stata completata con successo."
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${MUI_PRODUCT} ?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Sei sicuro di voler terminare l'installazione di ${MUI_PRODUCT} ?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Installazione di ${MUI_NAME}"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_ITALIAN} "Questo programma rimuover ${MUI_PRODUCT} dal vosto computer."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ITALIAN} "Disinstalla ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ITALIAN} "Rimuovi ${MUI_PRODUCT} dal vostro computer."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ITALIAN} "Disinstallazione in corso"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ITALIAN} "Per favore attendi che ${MUI_PRODUCT} sia completamente disinstallato."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ITALIAN} "Disinstallazione completata"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "La disinstallazione stata completata con successo."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Disinstalla ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Rimuovi ${MUI_PRODUCT} dal vostro computer."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Questo programma rimuover ${MUI_PRODUCT} dal vosto computer."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Disinstallazione in corso"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Per favore attendi che ${MUI_PRODUCT} sia completamente disinstallato."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Disinstallazione completata"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La disinstallazione stata completata con successo."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Rimozione di ${MUI_NAME}"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh
index 1d361047..8ed6c8fa 100644
--- a/Contrib/Modern UI/Language files/Japanese.nsh
+++ b/Contrib/Modern UI/Language files/Japanese.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;version 2 - Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Japanese (1041)
;By Dnanako
;--------------------------------
-!verbose 3
-!ifndef MUI_JAPANESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "JAPANESE"
-!define MUI_JAPANESE_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Japanese" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-
- !define MUI_JAPANESE_LANGNAME "Japanese" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_JAPANESE} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_JAPANESE} "[Page Down]Č_ׂĂǂ݂B"
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_JAPANESE} "CZX_"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_JAPANESE} " ${MUI_PRODUCT} CXg[OɁACZXmFĂB"
- LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${MUI_PRODUCT} CXg[ɂ́A_ɓӂKv܂B$\r$\n_ׂ̂Ă̏ɓӂȂA[ӂ] IŃCXg[𑱂ĂB"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "CZX_"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " ${MUI_PRODUCT} CXg[OɁACZXmFĂB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "[Page Down]Č_ׂĂǂ݂B"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "${MUI_PRODUCT} CXg[ɂ́A_ɓӂKv܂B$\r$\n_ׂ̂Ă̏ɓӂȂA[ӂ] IŃCXg[𑱂ĂB"
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_JAPANESE} "R|[lgCXg[ɂ̓`FbNAsvȂA`FbNOĂB $\r$\nɂ[]ĂB"
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_JAPANESE} "R|[lgIłB"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} ̃CXg[ IvVIłB"
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_JAPANESE} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_JAPANESE} "R|[lgɃ}EX J[\ړƁA̐\܂B"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "R|[lgIłB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "${MUI_PRODUCT} ̃CXg[ IvVIłB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "R|[lgCXg[ɂ̓`FbNAsvȂA`FbNOĂB $\r$\nɂ[]ĂB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "R|[lgɃ}EX J[\ړƁA̐\܂B"
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_JAPANESE} "${MUI_PRODUCT} ȉ̃tH_ɃCXg[܂B$\r$\n$\r$\ñtH_ɃCXg[ɂ́A[CXg[]ĂB$\r$\nقȂtH_ɃCXg[ɂ́A[Q]āAʂ̃tH_IĂB"
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_JAPANESE} "CXg[IłB"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} CXg[tH_IłB"
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_JAPANESE} "CXg[ tH_"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "CXg[IłB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "${MUI_PRODUCT} CXg[tH_IłB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "${MUI_PRODUCT} ȉ̃tH_ɃCXg[܂B$\r$\n$\r$\ñtH_ɃCXg[ɂ́A[CXg[]ĂB$\r$\nقȂtH_ɃCXg[ɂ́A[Q]āAʂ̃tH_IĂB"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "CXg[ tH_"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_JAPANESE} "CXg["
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} CXg[Ă܂B炭҂B"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "CXg["
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} CXg[Ă܂B炭҂B"
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_JAPANESE} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "CXg[ɐ܂B"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "CXg[ɐ܂B"
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${MUI_PRODUCT} ̃CXg[𒆎~܂H"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "${MUI_PRODUCT} ̃CXg[𒆎~܂H"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} ZbgAbv"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} ZbgAbv"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_JAPANESE} "${MUI_PRODUCT} ̃VXeACXg[܂B"
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_JAPANESE} "${MUI_PRODUCT} ̃ACXg[B"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} ̃VXeACXg[܂B"
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_JAPANESE} "ACXg["
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} ACXg[Ă܂B炭҂B"
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_JAPANESE} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "ACXg[ɐ܂B"
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} ZbgAbv"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "${MUI_PRODUCT} ̃ACXg[B"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "${MUI_PRODUCT} ̃VXeACXg[܂B"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "${MUI_PRODUCT} ̃VXeACXg[܂B"
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "ACXg["
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} ACXg[Ă܂B炭҂B"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "ACXg[ɐ܂B"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} ACXg["
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Polish.nsh b/Contrib/Modern UI/Language files/Polish.nsh
index b8ad1363..caf4b5e2 100644
--- a/Contrib/Modern UI/Language files/Polish.nsh
+++ b/Contrib/Modern UI/Language files/Polish.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Polish (1045)
;By Piotr Murawski & Rafa Lampe; www.lomsel.prv.pl mailto:ppiter@skrzynka.pl
;--------------------------------
-!verbose 3
-!ifndef MUI_POLISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "POLISH"
-!define MUI_POLISH_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Polski" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Polish.nlf"
-
- !define MUI_POLISH_LANGNAME "Polski" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_POLISH} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_POLISH} "Prosz nadu klawisz Page Down, aby zobaczy reszt umowy."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_POLISH} "Umowa licencyjna"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_POLISH} "Prosz przejrzy warunki licencji przed instalacj ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_POLISH} "Jeeli akceptujesz wszystkie warunki umnowy wybierz Zgadzam si, aby kontynuowa. Musisz zaakceptowa warunki umowy, aby zainstalowa ${MUI_PRODUCT}."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Umowa licencyjna"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Prosz przejrzy warunki licencji przed instalacj ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Prosz nadu klawisz Page Down, aby zobaczy reszt umowy."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Jeeli akceptujesz wszystkie warunki umnowy wybierz Zgadzam si, aby kontynuowa. Musisz zaakceptowa warunki umowy, aby zainstalowa ${MUI_PRODUCT}."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_POLISH} "Zaznacz komponenty, ktre chcesz zainstalowa oraz odznacz komponenty, ktre nie maj by zainstalowane. Kliknij przycisk Dalej, aby kontynuowa."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_POLISH} "Wybr komponentw"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_POLISH} "Wybierz komponenty ${MUI_PRODUCT}, ktre chcesz zainstalowa."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_POLISH} "Opis"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_POLISH} "Przesu kursor myszy nad komponent, aby zobaczy jego opis."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Wybr komponentw"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Wybierz komponenty ${MUI_PRODUCT}, ktre chcesz zainstalowa."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Zaznacz komponenty, ktre chcesz zainstalowa oraz odznacz komponenty, ktre nie maj by zainstalowane. Kliknij przycisk Dalej, aby kontynuowa."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesu kursor myszy nad komponent, aby zobaczy jego opis."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_POLISH} "Instalator zainstaluje ${MUI_PRODUCT} do nastpujcego folderu.$\r$\n$\r$\nAby zainstalowa w tym folderze kliknij Instaluj. Aby zainstalowa w innym folderze kliknij Przegldaj i wybierz inny folder."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_POLISH} "Wybr miejsca instalacji"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_POLISH} "Wybierz folder, w ktrym ma by zainstalowany ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_POLISH} "Folder docelowy"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Wybr miejsca instalacji"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Wybierz folder, w ktrym ma by zainstalowany ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Instalator zainstaluje ${MUI_PRODUCT} do nastpujcego folderu.$\r$\n$\r$\nAby zainstalowa w tym folderze kliknij Instaluj. Aby zainstalowa w innym folderze kliknij Przegldaj i wybierz inny folder."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Folder docelowy"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_POLISH} "Instaluje"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_POLISH} "Prosz czeka, kiedy ${MUI_PRODUCT} jest instalowany."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instaluje"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Prosz czeka, kiedy ${MUI_PRODUCT} jest instalowany."
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_POLISH} "Zakoczono"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Instalacja zakoczona powodzeniem."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Zakoczono"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Instalacja zakoczona powodzeniem."
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyj z instalatora ${MUI_PRODUCT}?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Czy na pewno chcesz wyj z instalatora ${MUI_PRODUCT}?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_POLISH} "${MUI_PRODUCT} ${MUI_VERSION} Instalator"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Instalator"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_POLISH} "Deinstalator odinstaluje ${MUI_PRODUCT} z twojego systemu."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_POLISH} "Odinstaluj ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_POLISH} "Usu ${MUI_PRODUCT} z twojego systemu."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_POLISH} "Odinstalowuje"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_POLISH} "Prosz czeka, kiedy ${MUI_PRODUCT} jest odinstalowywany."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_POLISH} "Zakoczono"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Odinstalowanie zakoczone powodzeniem."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_POLISH} "${MUI_PRODUCT} ${MUI_VERSION} Instalator"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Odinstaluj ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Usu ${MUI_PRODUCT} z twojego systemu."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Deinstalator odinstaluje ${MUI_PRODUCT} z twojego systemu."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Odinstalowuje"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Prosz czeka, kiedy ${MUI_PRODUCT} jest odinstalowywany."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Zakoczono"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Odinstalowanie zakoczone powodzeniem."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Odinstaluj"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/PortugueseBR.nsh b/Contrib/Modern UI/Language files/PortugueseBR.nsh
index 3363849d..951406ce 100644
--- a/Contrib/Modern UI/Language files/PortugueseBR.nsh
+++ b/Contrib/Modern UI/Language files/PortugueseBR.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: 'Portuguese (Brasil)' (1046)
;By Layout do Brasil www.layoutdobrasil.com
;--------------------------------
-!verbose 3
-!ifndef MUI_PORTUGUESEBR_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "PORTUGUESEBR"
-!define MUI_PORTUGUESEBR_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Portuguese (Brasil)" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\PortugueseBR.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Contrato de Licena"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Favor verificar os termos da licena antes de instalar ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para ver o restante da licena."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Se voc aceitar todos os termos da licena, escolha Concordo para continuar. Voc deve aceitar o contrato para instalar ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Escolhendo Componentes"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Escolha as caractersticas do ${MUI_PRODUCT} que voc deseja instalar."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Marque os componentes que voc deseja instalar e desmarque os componentes que voc no deseja instalar. Clique em Avanar para continuar."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrio"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Repouse o ponteiro do mouse em cima de um componente para ver sua descrio."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Escolhendo o Local da Instalao"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Escolha a pasta na qual deseja instalar ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "O instalador instalar o ${MUI_PRODUCT} na pasta abaixo.$\r$\n$\r$\nPara prosseguir e instalar nesta pasta, clique em Instalar. Para instalar em uma pasta diferente, clique Procurar... e selecione outra pasta."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Pasta de destino"
- !define MUI_PORTUGUESEBR_LANGNAME "Portuguese (Brasil)" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_PORTUGUESEBR} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instalando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Por favor, aguarde enquanto ${MUI_PRODUCT} est sendo instalado."
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_PORTUGUESEBR} "Pressione Page Down para ver o restante da licena."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_PORTUGUESEBR} "Contrato de Licena"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_PORTUGUESEBR} "Favor verificar os termos da licena antes de instalar ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_PORTUGUESEBR} "Se voc aceitar todos os termos da licena, escolha Concordo para continuar. Voc deve aceitar o contrato para instalar ${MUI_PRODUCT}."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Finalizando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "A instalao foi finalizada com sucesso."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_PORTUGUESEBR} "Marque os componentes que voc deseja instalar e desmarque os componentes que voc no deseja instalar. Clique em Avanar para continuar."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_PORTUGUESEBR} "Escolhendo Componentes"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha as caractersticas do ${MUI_PRODUCT} que voc deseja instalar."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_PORTUGUESEBR} "Descrio"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_PORTUGUESEBR} "Repouse o ponteiro do mouse em cima de um componente para ver sua descrio."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Voc deseja realmente finalizar a instalao ${MUI_PRODUCT}?"
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_PORTUGUESEBR} "O instalador instalar o ${MUI_PRODUCT} na pasta abaixo.$\r$\n$\r$\nPara prosseguir e instalar nesta pasta, clique em Instalar. Para instalar em uma pasta diferente, clique Procurar... e selecione outra pasta."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_PORTUGUESEBR} "Escolhendo o Local da Instalao"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha a pasta na qual deseja instalar ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_PORTUGUESEBR} "Pasta de destino"
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_PORTUGUESEBR} "Instalando"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_PORTUGUESEBR} "Por favor, aguarde enquanto ${MUI_PRODUCT} est sendo instalado."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_PORTUGUESEBR} "Finalizando"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_PORTUGUESEBR} "A instalao foi finalizada com sucesso."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_PORTUGUESEBR} "Voc deseja realmente finalizar a instalao ${MUI_PRODUCT}?"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Instalao de ${MUI_NAME}"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remover ${MUI_PRODUCT} de seu sistema."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Isto desinstalar ${MUI_PRODUCT} de seu sistema."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor, aguarde enquanto ${MUI_PRODUCT} est sendo desinstalado."
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_PORTUGUESEBR} "Isto desinstalar ${MUI_PRODUCT} de seu sistema."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_PORTUGUESEBR} "Desinstalar ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_PORTUGUESEBR} "Remover ${MUI_PRODUCT} de seu sistema."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Finalizando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "A desinstalao foi finalizada com sucesso."
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_PORTUGUESEBR} "Desinstalando"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_PORTUGUESEBR} "Por favor, aguarde enquanto ${MUI_PRODUCT} est sendo desinstalado."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_PORTUGUESEBR} "Finalizando"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_PORTUGUESEBR} "A desinstalao foi finalizada com sucesso."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Desinstalao de ${MUI_NAME}"
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Russian.nsh b/Contrib/Modern UI/Language files/Russian.nsh
index 0f929b2d..70555a91 100644
--- a/Contrib/Modern UI/Language files/Russian.nsh
+++ b/Contrib/Modern UI/Language files/Russian.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Russian (1049)
;By Nik Medved (brainsucker). Fixed by Scam.
;--------------------------------
-!verbose 3
-!ifndef MUI_RUSSIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "RUSSIAN"
-!define MUI_RUSSIAN_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Russian" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Russian.nlf"
-
- !define MUI_RUSSIAN_LANGNAME "Russian" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_RUSSIAN} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_RUSSIAN} " PageDown, ."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_RUSSIAN} " "
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_RUSSIAN} " , . ${MUI_PRODUCT}."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP " PageDown, ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM " , . ${MUI_PRODUCT}."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_RUSSIAN} " , , , . ."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_RUSSIAN} " "
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT} ."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_RUSSIAN} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_RUSSIAN} " , ."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE " ${MUI_PRODUCT} ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS " , , , . ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO " , ."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_RUSSIAN} " ${MUI_PRODUCT} .$\r$\n$\r$\n , . , ."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_RUSSIAN} " "
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_RUSSIAN} " "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE " ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP " ${MUI_PRODUCT} .$\r$\n$\r$\n , . , ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION " "
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_RUSSIAN} " "
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_RUSSIAN} " , ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE " , ${MUI_PRODUCT}."
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_RUSSIAN} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} " ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE " ."
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_RUSSIAN} " , ${MUI_PRODUCT}?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING " , ${MUI_PRODUCT}?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} "
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_RUSSIAN} " ${MUI_PRODUCT} ."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT} ."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_RUSSIAN} ""
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_RUSSIAN} " , ${MUI_PRODUCT}."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_RUSSIAN} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} " ."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE " ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE " ${MUI_PRODUCT} ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO " ${MUI_PRODUCT} ."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE " , ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE " ."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} "
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh
index 018429b9..56698a18 100644
--- a/Contrib/Modern UI/Language files/SimpChinese.nsh
+++ b/Contrib/Modern UI/Language files/SimpChinese.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: 'Chinese (Simplified)' (2052)
;By Kii Ali
;--------------------------------
-!verbose 3
-!ifndef MUI_SIMPCHINESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "SIMPCHINESE"
-!define MUI_SIMPCHINESE_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Chinese (Simplified)" ;Աķʽд
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf"
-
- !define MUI_SIMPCHINESE_LANGNAME "Chinese (Simplified)" ;Աķʽд (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_SIMPCHINESE} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_SIMPCHINESE} "ҪȨԼಿ֣밴 [PgDn] ¾ҳ档"
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_SIMPCHINESE} "ȨԼ"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SIMPCHINESE} "ڰװ ${MUI_PRODUCT} ֮ǰȨ"
- LangString MUI_INNERTEXT_LICENSE ${LANG_SIMPCHINESE} "ͬкԼеѡ [ͬ(A)] װѡ [ȡ(C)] װرաҪȨԼܰװ ${MUI_PRODUCT}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ȨԼ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "ڰװ ${MUI_PRODUCT} ֮ǰȨ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "ҪȨԼಿ֣밴 [PgDn] ¾ҳ档"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "ͬкԼеѡ [ͬ(A)] װѡ [ȡ(C)] װرաҪȨԼܰװ ${MUI_PRODUCT}"
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_SIMPCHINESE} "ȡҪװѲ밲װȡ [һ(N)] "
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SIMPCHINESE} "ѡ"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${MUI_PRODUCT} Ҫװ"
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_SIMPCHINESE} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SIMPCHINESE} "ƶָ굽֮ϣɼ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "ѡ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "ѡ ${MUI_PRODUCT} Ҫװ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "ȡҪװѲ밲װȡ [һ(N)] "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ƶָ굽֮ϣɼ"
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_SIMPCHINESE} "װļУװ ${MUI_PRODUCT} $\r$\n$\r$\nҪװļУ [װ(I)] ҪװڲͬļУ [(B)...] ѡļС"
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_SIMPCHINESE} "ѡװλ"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${MUI_PRODUCT} Ҫװļλá"
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SIMPCHINESE} "Ŀļ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "ѡװλ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "ѡ ${MUI_PRODUCT} Ҫװļλá"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "װļУװ ${MUI_PRODUCT} $\r$\n$\r$\nҪװļУ [װ(I)] ҪװڲͬļУ [(B)...] ѡļС"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Ŀļ"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SIMPCHINESE} "ڰװ"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ڰװȺ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "ڰװ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} ڰװȺ"
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "װѳɹɡ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "װѳɹɡ"
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_SIMPCHINESE} "ȷʵҪ˳ ${MUI_PRODUCT} װ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "ȷʵҪ˳ ${MUI_PRODUCT} װ"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} װ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} װ"
- ;UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "װ ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "ϵͳװ ${MUI_PRODUCT} "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "⽫ϵͳнװ ${MUI_PRODUCT}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "ڽװ"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} ڽװȺ"
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_SIMPCHINESE} "⽫ϵͳнװ ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_SIMPCHINESE} "װ ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_SIMPCHINESE} "ϵͳװ ${MUI_PRODUCT} "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${MUI_PRODUCT} Ѵϵͳװ"
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_SIMPCHINESE} "ڽװ"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ڽװȺ"
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} Ѵϵͳװ"
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} װ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} װ"
-!endif
-
-!verbose 4
\ No newline at end of file
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Spanish.nsh b/Contrib/Modern UI/Language files/Spanish.nsh
index 93789cc3..492a1e90 100644
--- a/Contrib/Modern UI/Language files/Spanish.nsh
+++ b/Contrib/Modern UI/Language files/Spanish.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Spanish (1034)
;By MoNKi
;--------------------------------
-!verbose 3
-!ifndef MUI_SPANISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "SPANISH"
-!define MUI_SPANISH_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Espaol" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Spanish.nlf"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Acuerdo de licencia"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Por favor revise los trminos de la licencia antes de instalar ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar Pgina para ver el resto del acuerdo."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Si acepta todos los trminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Seleccin de componentes"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione que caractersticas de ${MUI_PRODUCT} desea instalar."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Marque los componentes que desea instalar y desmarque los componentes que no desea instalar. Presione Siguiente para continuar."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descripcin"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situe el ratn encima de un componente para ver su descripcin."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalacin"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Elija el directorio en el que instalar ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Se instalar ${MUI_PRODUCT} en el siguiente directorio.$\r$\n$\r$\nPara instalar en este directorio, presione Instalar. Para instalar en un directorio distinto, presione Examinar y seleccione otro directorio."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Directorio de destino"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instalando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere mientas ${MUI_PRODUCT} se instala."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Completado"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "La instalacin se ha completado correctamente."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Est seguro de que desea salir de la instalacin de ${MUI_PRODUCT}?"
- !define MUI_SPANISH_LANGNAME "Espaol" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_SPANISH} "${MUI_NAME}"
-
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_SPANISH} "Presione Avanzar Pgina para ver el resto del acuerdo."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_SPANISH} "Acuerdo de licencia"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SPANISH} "Por favor revise los trminos de la licencia antes de instalar ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_SPANISH} "Si acepta todos los trminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${MUI_PRODUCT}."
- !endif
-
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_SPANISH} "Marque los componentes que desea instalar y desmarque los componentes que no desea instalar. Presione Siguiente para continuar."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SPANISH} "Seleccin de componentes"
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SPANISH} "Seleccione que caractersticas de ${MUI_PRODUCT} desea instalar."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_SPANISH} "Descripcin"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SPANISH} "Situe el ratn encima de un componente para ver su descripcin."
- !endif
-
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_SPANISH} "Se instalar ${MUI_PRODUCT} en el siguiente directorio.$\r$\n$\r$\nPara instalar en este directorio, presione Instalar. Para instalar en un directorio distinto, presione Examinar y seleccione otro directorio."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_SPANISH} "Elegir lugar de instalacin"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SPANISH} "Elija el directorio en el que instalar ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SPANISH} "Directorio de destino"
- !endif
-
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SPANISH} "Instalando"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SPANISH} "Por favor espere mientas ${MUI_PRODUCT} se instala."
-
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_SPANISH} "Completado"
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SPANISH} "La instalacin se ha completado correctamente."
-
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_SPANISH} "Est seguro de que desea salir de la instalacin de ${MUI_PRODUCT}?"
- !endif
-
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Instalacin de ${MUI_NAME}"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_SPANISH} "Esto desinstalar ${MUI_PRODUCT} de su sistema."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_SPANISH} "Desinstalar ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_SPANISH} "Elimina ${MUI_PRODUCT} de su sistema."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_SPANISH} "Desinstalando"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_SPANISH} "Por favor espere mientras ${MUI_PRODUCT} se desinstala."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_SPANISH} "Completado"
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_SPANISH} "La desinstalacin se ha completado correctamente."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${MUI_PRODUCT} ${MUI_VERSION}"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Elimina ${MUI_PRODUCT} de su sistema."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Esto desinstalar ${MUI_PRODUCT} de su sistema."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere mientras ${MUI_PRODUCT} se desinstala."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Completado"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La desinstalacin se ha completado correctamente."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Desinstalacin de ${MUI_NAME}"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh
index 5ac1e058..838cd27a 100644
--- a/Contrib/Modern UI/Language files/TradChinese.nsh
+++ b/Contrib/Modern UI/Language files/TradChinese.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: 'Chinese (Traditional)' (1028)
;By Kii Ali
;--------------------------------
-!verbose 3
-!ifndef MUI_TRADCHINESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "TRADCHINESE"
-!define MUI_TRADCHINESE_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Chinese (Traditional)" ;Hy覡AgUyW
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf"
-
- !define MUI_TRADCHINESE_LANGNAME "Chinese (Traditional)" ;Hy覡AgUyW (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_TRADCHINESE} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_TRADCHINESE} "YnݱvXlAЫ [PgDn] UʭC"
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_TRADCHINESE} "vX"
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_TRADCHINESE} "bw ${MUI_PRODUCT} eA˾\vڡC"
- LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "pGAPNҦXڡA [ڦPN(A)] ~wˡCpGA [(C)] Aw˵{N|CnvX~w ${MUI_PRODUCT}C"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "vX"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "bw ${MUI_PRODUCT} eA˾\vڡC"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "YnݱvXlAЫ [PgDn] UʭC"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "pGAPNҦXڡA [ڦPN(A)] ~wˡCpGA [(C)] Aw˵{N|CnvX~w ${MUI_PRODUCT}C"
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_TRADCHINESE} "֨Qnw˪Aç⤣Qw˪Ѱ֨C [U@B(N)] ~C"
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_TRADCHINESE} ""
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_TRADCHINESE} " ${MUI_PRODUCT} AQnw˪C"
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_TRADCHINESE} "yz"
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_TRADCHINESE} "ʧAƹШ줸WAKi쥦yzC"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE " ${MUI_PRODUCT} AQnw˪C"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "֨Qnw˪Aç⤣Qw˪Ѱ֨C [U@B(N)] ~C"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "yz"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ʧAƹШ줸WAKi쥦yzC"
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_TRADCHINESE} "w˵{NbUCƧAw ${MUI_PRODUCT} C$\r$\n$\r$\nnw˨oӸƧA@U [w(I)] Cnw˦bPƧA@U [s(B)...] ÿܨLƧC"
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_TRADCHINESE} "w˦m"
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} " ${MUI_PRODUCT} nw˪ƧmC"
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_TRADCHINESE} "تƧ"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "w˦m"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE " ${MUI_PRODUCT} nw˪ƧmC"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "w˵{NbUCƧAw ${MUI_PRODUCT} C$\r$\n$\r$\nnw˨oӸƧA@U [w(I)] Cnw˦bPƧA@U [s(B)...] ÿܨLƧC"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "تƧ"
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "bw"
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} bwˡAеԡC"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "bw"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} bwˡAеԡC"
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "w˵{w\a槹C"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "w˵{w\a槹C"
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "ATwn} ${MUI_PRODUCT} w˵{H"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "ATwn} ${MUI_PRODUCT} w˵{H"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} w"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} w"
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_TRADCHINESE} "oN|qAtΤѰw ${MUI_PRODUCT}C"
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_TRADCHINESE} "Ѱw ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_TRADCHINESE} "qAtθѰw ${MUI_PRODUCT} C"
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_TRADCHINESE} "bѰw"
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} bѰwˡAеԡC"
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_TRADCHINESE} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} wqAtθѰwˡC"
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} w"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Ѱw ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "qAtθѰw ${MUI_PRODUCT} C"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "oN|qAtΤѰw ${MUI_PRODUCT}C"
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "bѰw"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} bѰwˡAеԡC"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${MUI_PRODUCT} wqAtθѰwˡC"
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Ѱw"
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Language files/Ukrainian.nsh b/Contrib/Modern UI/Language files/Ukrainian.nsh
index 917af86e..55649682 100644
--- a/Contrib/Modern UI/Language files/Ukrainian.nsh
+++ b/Contrib/Modern UI/Language files/Ukrainian.nsh
@@ -1,78 +1,54 @@
;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
;Language: Ukrainian (1058)
;By Yuri Holubow, Our Soft (http://www.ns.lviv.ua)
;--------------------------------
-!verbose 3
-!ifndef MUI_UKRAINIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "UKRAINIAN"
-!define MUI_UKRAINIAN_USED
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Ukrainian" ;Name of the language in the language itself
- LoadLanguageFile "${NSISDIR}\Contrib\Language files\Ukrainian.nlf"
-
- !define MUI_UKRAINIAN_LANGNAME "Ukrainian" ;Name of the language in the language itself (English, Deutsch, Franais etc.)
-
- ;INSTALLER
- Name /LANG=${LANG_UKRAINIAN} "${MUI_NAME}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
- !ifdef MUI_LICENSEPAGE
- LicenseText /LANG=${LANG_UKRAINIAN} "i PageDown ."
- LangString MUI_TEXT_LICENSE_TITLE ${LANG_UKRAINIAN} "ii "
- LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_UKRAINIAN} " ii ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} " i , i . i ii ${MUI_PRODUCT}."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ii "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " ii ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "i PageDown ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM " i , i . i ii ${MUI_PRODUCT}."
- !ifdef MUI_COMPONENTSPAGE
- ComponentText /LANG=${LANG_UKRAINIAN} "ii i , i , i ii ii , i . i i ."
- LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_UKRAINIAN} "i "
- LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_UKRAINIAN} "i i i ${MUI_PRODUCT} ."
- LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_UKRAINIAN} ""
- LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_UKRAINIAN} "ii , ."
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "i "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "i i i ${MUI_PRODUCT} ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "ii i , i , i ii ii , i . i i ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ii , ."
- !ifdef MUI_DIRECTORYPAGE
- DirText /LANG=${LANG_UKRAINIAN} "I ${MUI_PRODUCT} .$\r$\n$\r$\n , i . i i i i i ."
- LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_UKRAINIAN} "i i "
- LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_UKRAINIAN} "i ${MUI_PRODUCT}."
- LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_UKRAINIAN} " "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "i i "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "i ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "I ${MUI_PRODUCT} .$\r$\n$\r$\n , i . i i i i i ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION " "
- LangString MUI_TEXT_INSTALLING_TITLE ${LANG_UKRAINIAN} " "
- LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_UKRAINIAN} "- , ${MUI_PRODUCT}."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE " "
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "- , ${MUI_PRODUCT}."
- LangString MUI_TEXT_FINISHED_TITLE ${LANG_UKRAINIAN} ""
- LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} " i ."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE " i ."
- !ifdef MUI_ABORTWARNING
- LangString MUI_TEXT_ABORTWARNING ${LANG_UKRAINIAN} " i ${MUI_PRODUCT}?"
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING " i ${MUI_PRODUCT}?"
- !ifdef MUI_INSTALLOPTIONS
- LangString MUI_TEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} "
- ;UNINSTALLER
-
- !ifdef MUI_UNINSTALLER
- UninstallText /LANG=${LANG_UKRAINIAN} " ${MUI_PRODUCT} '."
- LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_UKRAINIAN} " ${MUI_PRODUCT}"
- LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_UKRAINIAN} " ${MUI_PRODUCT} '."
-
- LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_UKRAINIAN} ""
- LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_UKRAINIAN} "- ${MUI_PRODUCT}."
-
- LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_UKRAINIAN} ""
- LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} " i ."
- !endif
-
- !ifdef MUI_UNINSTALLOPTIONS
- LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} "
- !endif
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE " ${MUI_PRODUCT}"
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE " ${MUI_PRODUCT} '."
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO " ${MUI_PRODUCT} '."
-!endif
-
-!verbose 4
\ No newline at end of file
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "- ${MUI_PRODUCT}."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE ""
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE " i ."
+
+ !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} "
+
+!insertmacro MUI_LANGUAGEFILE_END
\ No newline at end of file
diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html
index ecbbf867..5f203fe1 100644
--- a/Contrib/Modern UI/Readme.html
+++ b/Contrib/Modern UI/Readme.html
@@ -126,28 +126,38 @@ with a custom user interface.
Modern UI (in order).
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
-
-!define MUI_PRODUCT "Test Software" ;Define your own software name here
+
+
+!define MUI_PRODUCT "Test Software" ;Define your own software name here
!define MUI_VERSION "1.0" ;Define your own software version here
-
-!define MUI_NAME "${NAME} ${VERSION}" ;Installer name
-Note: If you want to use a different name for different languages, undef these
-defines and define them again before you insert a language file.
+
The Modern UI should know which things it should insert. Use the following defines:
!define MUI_LICENSEPAGE ;License page
!define MUI_COMPONENTSPAGE ;Component-selection page
!define MUI_DIRECTORYPAGE ;Directory-selection page
!define MUI_LICENSEPAGE ;License page
+!define MUI_ABORTWARNING ;Abort warning messagebox
+!define MUI_INSTALLOPTIONS ;Install Options
+!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
+
!define MUI_UNINSTALLER ;Uninstaller
-!define MUI_ABORTWARNING ;Abort warning messabox
-!define MUI_INSTALLOPTIONS ;Use Install Options
-!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
+!define MUI_UNINSTALLOPTIONS ;Install Options in Uninstaller
+!define MUI_CUSTOMPAGECOMMANDS ;Use customized uninstaller pages
+
Insert the Modern UI language files for the languages you are using:
!insertmacro MUI_LANGUAGE "English"
- Note: The Modern UI language files load the NLF language files,
+
The Modern UI language files load the NLF language files,
so you should not use LoadLanguageFile.
+ You don't need to edit the language files if you want to customize
+ some strings. Use defines before you insert the language file:
+
+!define MUI_INNERTEXT_LICENSE_TOP "Text on the top of the license dialog"
+!insertmacro MUI_LANGUAGE "English"
+
+ Have a look at the language files for a complete list of all the
+ names.
You can change the settings of the interface by usings defines:
!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"
@@ -174,9 +184,7 @@ defines and define them again before you insert a language file.
You should insert the MUI_SECTIONS_FINISHHEADER after all the
sections to display the finish-header.
-
-!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
-
+!insertmacro MUI_SECTIONS_FINISHHEADER
In the uninstaller, insert MUI_UNFINISHHEADER at the end of the
Unintaller section.
@@ -195,7 +203,7 @@ LangString DESC_SectionName2 ${LANG_ENGLISH} "Description of section 2."
!insertmacro MUI_DESCRIPTION_TEXT ${SectionName2} $(DESC_SectionName2)
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
-Note: Always set a name for a section:
+Always set a name for a section:
Section "Section Name 1" SectionName1
...
@@ -219,8 +227,14 @@ of the page functions.
Page custom [function name] ;A custom page
!insertmacro MUI_PAGECOMMAND_INSTFILES
-Note: If you are using custom Page commands, define MUI_CUSTOMPAGECOMMANDS
-before inserting the MUI_SYSTEM macro.
+This is also possible the uninstaller:
+
+!insertmacro MUI_UNPAGECOMMAND_CONFIRM
+UninstPage custom [function name] ;A custom page
+!insertmacro MUI_UNPAGECOMMAND_INSTFILES
+
+Don't forget to define MUI_CUSTOMPAGECOMMANDS or
+MUI_UNCUSTOMPAGECOMMANDS before inserting the MUI_SYSTEM macro.
You can call Install Options in [function name]:
@@ -249,8 +263,8 @@ LangString TEXT_IO_PAGETITLE ${LANG_ENGLISH} "Page Title"
- There are two different versions of the interface.
- Modern.exe contains the dialogs of the standard interface.
+
There are two different versions of the interface
+ available. Modern.exe contains the dialogs of the standard interface.
If you have an installer with a lot of subsections
or long section names, use modern2.exe, which has a different
component-selection page.
@@ -269,10 +283,22 @@ The 'verifying installer' and 'unpacking data' texts are defined in
To change them, you need to edit this file and recompile NSIS.
+- 1.5 - November 8, 2002
+
+ - New language file format
+
- Language strings can be changed in the script without editing
+ language files
+
- Install Options macro's updated. MUI_INSTALLOPTIONS_DISPLAY is
+ the standard macro now. Use MUI_INSTALLOPTIONS_INITDIALOG and
+ MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
+
- Renamed macro's and defines
+
- Some small fixes
+
+
- 1.4 - November 4, 2002
- Uses new NSIS Page command
-
- Macro system updates (smaller)
+
- Macro System updates (smaller)
- Macro System a lot easier
- Modern UI Language Files load NLF language files
- Renamed macro's and defines
diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index f6fdcfb9..959fb364 100644
--- a/Contrib/Modern UI/System.nsh
+++ b/Contrib/Modern UI/System.nsh
@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
;Macro System
;Written by Joost Verburg
@@ -117,7 +117,7 @@
!macroend
-!macro MUI_DESCRIPTION_INIT
+!macro MUI_DESCRIPTION_BEGIN
!verbose 3
@@ -341,7 +341,7 @@
SetDetailsPrint both
!endif
- File /oname=$PLUGINSDIR\${FILE} "${FILE}"
+ File "/oname=$PLUGINSDIR\${FILE}" "${FILE}"
!verbose 4
@@ -364,7 +364,7 @@
!macroend
-!macro MUI_INSTALLOPTIONS_SHOW FILE
+!macro MUI_INSTALLOPTIONS_DISPLAY FILE
!verbose 3
@@ -386,6 +386,38 @@
!macroend
+!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
+
+ !verbose 3
+
+ InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\${FILE}"
+
+ !verbose 4
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_SHOW
+
+ !verbose 3S
+
+ Push ${MUI_TEMP1}
+
+ InstallOptions::show
+ Pop ${MUI_TEMP1}
+
+ StrCmp ${MUI_TEMP1} "cancel" "" +2
+ Quit
+
+ StrCmp ${MUI_TEMP1} "back" "" +3
+ Pop ${MUI_TEMP1}
+ Abort
+
+ Pop ${MUI_TEMP1}
+
+ !verbose 4
+
+!macroend
+
!macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
!verbose 3
@@ -413,7 +445,7 @@
Push ${MUI_TEMP1}
Push ${MUI_TEMP2}
- StrCpy ${MUI_TEMP1} "$(MUI_TEXT_SETUPCAPTION)"
+ StrCpy ${MUI_TEMP1} "$(MUI_TEXT_WINDOWTITLE)"
StrCpy ${MUI_TEMP2} "${TITLE}"
!insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "Title" "${MUI_TEMP1}: ${MUI_TEMP2}"
@@ -430,7 +462,7 @@
!ifdef MUI_ABORTWARNING
!insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
- !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
+ !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_WINDOWTITLE)"
!endif
@@ -502,7 +534,7 @@
FunctionEnd
Function "${SETLICENSEDIALOG}"
- !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE)
+ !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE_BOTTOM)
FunctionEnd
!verbose 4
@@ -518,8 +550,8 @@
FunctionEnd
Function "${SETCOMPONENTSDIALOG}"
- !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE)
- !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO)
+ !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE)
+ !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO)
FunctionEnd
!verbose 4
@@ -531,11 +563,11 @@
!verbose 3
Function "${SETDIRECTORYPAGE}"
- !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE)
+ !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRECTORY_TITLE) $(MUI_TEXT_DIRECTORY_SUBTITLE)
FunctionEnd
Function "${SETDIRECTORYDIALOGPAGE}"
- !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER)
+ !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DIRECTORY_DESTINATION)
FunctionEnd
!verbose 4
@@ -554,12 +586,12 @@
!macroend
-!macro MUI_FUNCTIONS_DESCRIPTION_START
+!macro MUI_FUNCTIONS_DESCRIPTION_BEGIN
!verbose 3
Function .onMouseOverSection
- !insertmacro MUI_DESCRIPTION_INIT
+ !insertmacro MUI_DESCRIPTION_BEGIN
!verbose 4
@@ -677,7 +709,131 @@
!macroend
+;--------------------------------
+;LANGUAGE FILES
+
+!macro MUI_LANGUAGEFILE_BEGIN LANGUAGE
+
+ !verbose 3
+
+ !define MUI_LANGUAGEFILE_CURRENT "${LANGUAGE}"
+
+ !ifndef "MUI_LANGUAGEFILE_${LANGUAGE}_USED"
+
+ !define "MUI_LANGUAGEFILE_${LANGUAGE}_USED"
+
+ LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_STRING STRING VALUE
+
+ !ifndef "${STRING}"
+ !define "${STRING}" "${VALUE}"
+ !endif
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_LANGSTRING NAME VALUE
+
+ LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+ !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME VALUE
+
+ LangString "un.${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+ !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_NSISCOMMAND COMMAND NAME VALUE
+
+ "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+ !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME VALUE
+
+ !ifndef "${DEFINE}"
+ !define "${DEFINE}" "${VALUE}"
+ !endif
+ !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_END
+
+ !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" "${MUI_LANGNAME}"
+
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME "${MUI_NAME}"
+
+ !ifdef MUI_LICENSEPAGE
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE" "${MUI_TEXT_LICENSE_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE" "${MUI_TEXT_LICENSE_SUBTITLE}"
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP" "${MUI_INNERTEXT_LICENSE_TOP}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM" "${MUI_INNERTEXT_LICENSE_BOTTOM}"
+ !endif
+
+ !ifdef MUI_COMPONENTSPAGE
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_TITLE" "${MUI_TEXT_COMPONENTS_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_SUBTITLE" "${MUI_TEXT_COMPONENTS_SUBTITLE}"
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "ComponentText" "MUI_INNERTEXT_COMPONENTS" "${MUI_INNERTEXT_COMPONENTS}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO}"
+ !endif
+
+ !ifdef MUI_DIRECTORYPAGE
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_TITLE" "${MUI_TEXT_DIRECTORY_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_SUBTITLE" "${MUI_TEXT_DIRECTORY_SUBTITLE}"
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "${MUI_INNERTEXT_DIRECTORY_TOP}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_INNERTEXT_DIRECTORY_DESTINATION "${MUI_INNERTEXT_DIRECTORY_DESTINATION}"
+ !endif
+
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" "${MUI_TEXT_INSTALLING_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE" "${MUI_TEXT_INSTALLING_SUBTITLE}"
+
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISHED_TITLE" "${MUI_TEXT_FINISHED_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISHED_SUBTITLE" "${MUI_TEXT_FINISHED_SUBTITLE}"
+
+ !ifdef MUI_ABORTWARNING
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING" "${MUI_TEXT_ABORTWARNING}"
+ !endif
+
+ !ifdef MUI_INSTALLOPTIONS
+ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WINDOWTITLE" "${MUI_TEXT_WINDOWTITLE}"
+ !endif
+
+ !ifdef MUI_UNINSTALLER
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_TITLE" "${MUI_UNTEXT_INTRO_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE" "${MUI_UNTEXT_INTRO_SUBTITLE}"
+
+ !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "UninstallText" "MUI_UNINNERTEXT_INTRO" "${MUI_UNINNERTEXT_INTRO}"
+
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_TITLE" "${MUI_UNTEXT_UNINSTALLING_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_SUBTITLE" "${MUI_UNTEXT_UNINSTALLING_SUBTITLE}"
+
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_TITLE" "${MUI_UNTEXT_FINISHED_TITLE}"
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_SUBTITLE" "${MUI_UNTEXT_FINISHED_SUBTITLE}"
+
+ !ifdef MUI_UNINSTALLOPTIONS
+ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_WINDOWTITLE" "${MUI_UNTEXT_WINDOWTITLE}"
+ !endif
+ !endif
+
+ !endif
+
+ !undef MUI_LANGUAGEFILE_CURRENT
+
+ !verbose 4
+
+!macroend
+
+;--------------------------------
+;END
+
!endif
-!verbose 4
-;--------------------------------
\ No newline at end of file
+!verbose 4
\ No newline at end of file
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 2cd538c0..0cf1a4f1 100644
--- a/Examples/Modern UI/Basic.nsi
+++ b/Examples/Modern UI/Basic.nsi
@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
-;Basic Macro System Example Script
+;NSIS Modern User Interface version 1.5
+;Basic Example Script
;Written by Joost Verburg
!define MUI_PRODUCT "Test Software" ;Define your own software name here
!define MUI_VERSION "1.0" ;Define your own software version here
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
;--------------------------------
@@ -58,7 +56,7 @@ SectionEnd
;--------------------------------
;Descriptions
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index 85fcd956..51b0352b 100644
--- a/Examples/Modern UI/InstallOptions.nsi
+++ b/Examples/Modern UI/InstallOptions.nsi
@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
;Install Options Example Script
;Written by Joost Verburg
!define MUI_PRODUCT "Test Software" ;Define your own software name here
!define MUI_VERSION "1.0" ;Define your own software version here
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
;--------------------------------
@@ -19,8 +17,6 @@
!define MUI_DIRECTORYPAGE
!define MUI_ABORTWARNING
!define MUI_UNINSTALLER
-
- !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
!define TEMP1 $R0
!define TEMP2 $R1
@@ -32,6 +28,8 @@
OutFile "InstallOptions.exe"
;Page order
+ !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
+
!insertmacro MUI_PAGECOMMAND_LICENSE
Page custom SetCustomA
Page custom SetCustomB
@@ -58,12 +56,8 @@
LangString TEXT_IO_PAGETITLE_B ${LANG_ENGLISH} "Custom Page B"
LangString TEXT_IO_PAGETITLE_C ${LANG_ENGLISH} "Custom Page C"
- ;Uninstaller
- !define MUI_UNCUSTOMPAGECOMMANDS
- !insertmacro MUI_UNPAGECOMMAND_CONFIRM
- !insertmacro MUI_UNPAGECOMMAND_INSTFILES
-
;Things that need to be extracted on startup (keep these lines before any File command!)
+ ;Only useful for BZIP2 compression
;Use ReserveFile for your own Install Options ini files too!
ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
ReserveFile "ioA.ini"
@@ -98,6 +92,13 @@ SectionEnd
!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
+ !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
+
;--------------------------------
;Installer Functions
@@ -122,17 +123,18 @@ FunctionEnd
Function SetCustomA
!insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
- !insertmacro MUI_INSTALLOPTIONS_SHOW "ioA.ini"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioA.ini"
FunctionEnd
Function SetCustomB
!insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
- !insertmacro MUI_INSTALLOPTIONS_SHOW "ioB.ini"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioB.ini"
FunctionEnd
Function SetCustomC
!insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
- !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioC.ini"
+
FunctionEnd
;--------------------------------
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 97476197..2e363aa0 100644
--- a/Examples/Modern UI/MultiLanguage.nsi
+++ b/Examples/Modern UI/MultiLanguage.nsi
@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
-;Basic Macro System & MultiLanguage Example Script
+;NSIS Modern User Interface version 1.5
+;MultiLanguage Example Script
;Written by Joost Verburg
!define MUI_PRODUCT "Test Software" ;Define your own software name here
!define MUI_VERSION "1.0" ;Define your own software version here
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
;--------------------------------
@@ -168,7 +166,7 @@ FunctionEnd
;--------------------------------
;Descriptions
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
!insertmacro MUI_FUNCTIONS_DESCRIPTION_END