From f5f0f98a798997455137fb84fb921d113b69450d Mon Sep 17 00:00:00 2001 From: joostverburg Date: Mon, 4 Nov 2002 11:19:21 +0000 Subject: [PATCH] macro system updates git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1578 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Changelog.txt | 9 +- Contrib/Modern UI/Language files/Arabic.nsh | 29 +++-- Contrib/Modern UI/Language files/Dutch.nsh | 29 +++-- Contrib/Modern UI/Language files/English.nsh | 29 +++-- Contrib/Modern UI/Language files/French.nsh | 27 +++-- Contrib/Modern UI/Language files/German.nsh | 27 +++-- Contrib/Modern UI/Language files/Greek.nsh | 27 +++-- Contrib/Modern UI/Language files/Italian.nsh | 29 +++-- Contrib/Modern UI/Language files/Japanese.nsh | 29 +++-- Contrib/Modern UI/Language files/Polish.nsh | 29 +++-- .../Modern UI/Language files/PortugueseBR.nsh | 29 +++-- Contrib/Modern UI/Language files/Russian.nsh | 29 +++-- .../Modern UI/Language files/SimpChinese.nsh | 31 ++--- Contrib/Modern UI/Language files/Spanish.nsh | 29 +++-- .../Modern UI/Language files/TradChinese.nsh | 31 ++--- .../Modern UI/Language files/Ukrainian.nsh | 29 +++-- Contrib/Modern UI/Readme.html | 99 ++++++++------- Contrib/Modern UI/System.nsh | 62 +++++++++- Examples/Modern UI/Basic.nsi | 31 +++-- Examples/Modern UI/InstallOptions.nsi | 64 +++++----- Examples/Modern UI/MultiLanguage.nsi | 114 +++++------------- 21 files changed, 431 insertions(+), 381 deletions(-) diff --git a/Contrib/Modern UI/Changelog.txt b/Contrib/Modern UI/Changelog.txt index 3cd1addb..c5e32b0e 100644 --- a/Contrib/Modern UI/Changelog.txt +++ b/Contrib/Modern UI/Changelog.txt @@ -1,10 +1,11 @@ NSIS Modern User Interface - VERSION HISTORY -1.4 - November 3, 2002 +1.4 - November 4, 2002 * Uses new NSIS Page command -* Macro system way smaller -* Advanced Macro System a lot easier -* Renamed some defines +* Macro system updates (smaller) +* Macro System a lot easier +* Modern UI Language Files load NLF language files +* Renamed macro's and defines 1.3 - October 27, 2002 * Easier macro system for basic scripts diff --git a/Contrib/Modern UI/Language files/Arabic.nsh b/Contrib/Modern UI/Language files/Arabic.nsh index d6e52ea0..cb8d361b 100644 --- a/Contrib/Modern UI/Language files/Arabic.nsh +++ b/Contrib/Modern UI/Language files/Arabic.nsh @@ -11,63 +11,66 @@ !define MUI_ARABIC_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\Arabic.nlf" + !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} " ${NAME}." - LangString MUI_INNERTEXT_LICENSE ${LANG_ARABIC} " ա ${NAME}." + 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} " ${NAME}." + 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} " ${NAME} $\r$\n$\r$\n . ѡ ." + DirText /LANG=${LANG_ARABIC} " ${MUI_PRODUCT} $\r$\n$\r$\n . ѡ ." LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ARABIC} " " - LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ARABIC} " ${NAME}." + 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} " ${NAME}." + 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} " ${NAME}" + LangString MUI_TEXT_ABORTWARNING ${LANG_ARABIC} " ${MUI_PRODUCT}" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_ARABIC} " ${NAME} ${VERSION}" + LangString MUI_TEXT_SETUPCAPTION ${LANG_ARABIC} " ${MUI_PRODUCT} ${MUI_VERSION}" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_ARABIC} " ${NAME}" - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ARABIC} " ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ARABIC} " ${NAME} " + 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} " ${NAME}." + 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 !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ARABIC} " ${NAME} ${VERSION}" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ARABIC} " ${MUI_PRODUCT} ${MUI_VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/Dutch.nsh b/Contrib/Modern UI/Language files/Dutch.nsh index f39e5834..252f71f2 100644 --- a/Contrib/Modern UI/Language files/Dutch.nsh +++ b/Contrib/Modern UI/Language files/Dutch.nsh @@ -11,15 +11,18 @@ !define MUI_DUTCH_USED + 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}" !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 ${NAME} 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 ${NAME} te installeren." + 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 !ifdef MUI_COMPONENTSPAGE @@ -31,43 +34,43 @@ !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_DUTCH} "Setup zal ${NAME} 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." + 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 ${NAME} in wilt installeren." + 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 LangString MUI_TEXT_INSTALLING_TITLE ${LANG_DUTCH} "Bezig met installeren" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik geduld terwijl ${NAME} wordt geinstalleerd." + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_DUTCH} "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." !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${NAME} Setup wilt afsluiten?" + LangString MUI_TEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_DUTCH} "${NAME} ${VERSION} Setup" + LangString MUI_TEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_DUTCH} "Dit programma zal ${NAME} verwijderen van uw systeem." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_DUTCH} "Denstalleer ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_DUTCH} "Verwijder ${NAME} van uw system." + 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." LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_DUTCH} "Bezig met denstalleren" - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik gedult terwijl ${NAME} van uw system wordt verwijderd." + LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik gedult terwijl ${MUI_PRODUCT} van uw system wordt verwijderd." LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_DUTCH} "Gereed" - LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "${NAME} is verwijderd van uw systeem." + 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} "${NAME} ${VERSION} Setup" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup" !endif !endif diff --git a/Contrib/Modern UI/Language files/English.nsh b/Contrib/Modern UI/Language files/English.nsh index 4824c8a7..35ffb830 100644 --- a/Contrib/Modern UI/Language files/English.nsh +++ b/Contrib/Modern UI/Language files/English.nsh @@ -11,63 +11,66 @@ !define MUI_ENGLISH_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" + !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 ${NAME}." - 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 ${NAME}." + 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 ${NAME} you want to install." + 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 ${NAME} 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." + 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 ${NAME}." + 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 ${NAME} is being installed." + 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 ${NAME} Setup?" + 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} "${NAME} ${VERSION} Setup" + LangString MUI_TEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_NAME} Setup" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_ENGLISH} "This will uninstall ${NAME} from your system." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${NAME} from your system." + 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." LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ENGLISH} "Uninstalling" - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${NAME} is being uninstalled." + LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${MUI_PRODUCT} is being uninstalled." 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} "${NAME} ${VERSION} Setup" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_PRODUCT} ${MUI_VERSION} Setup" !endif !endif diff --git a/Contrib/Modern UI/Language files/French.nsh b/Contrib/Modern UI/Language files/French.nsh index c23710a2..3da93f7b 100644 --- a/Contrib/Modern UI/Language files/French.nsh +++ b/Contrib/Modern UI/Language files/French.nsh @@ -11,15 +11,18 @@ !define MUI_FRENCH_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf" + !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 ${NAME}." - 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 ${NAME}." + 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 @@ -31,43 +34,43 @@ !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_FRENCH} "Le programme d'installation va maintenant installer ${NAME} 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." + 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 ${NAME}." + 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 ${NAME} est en train d'tre install sur votre ordinateur." + 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 ${NAME} ?" + 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 ${NAME} ${VERSION}" + LangString MUI_TEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${MUI_PRODUCT} ${MUI_VERSION}" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_FRENCH} "Ce programme va supprimer ${NAME} de votre ordinateur." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_FRENCH} "Dsinstaller ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_FRENCH} "Supprimer ${NAME} de votre ordinateur." + 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 ${NAME} est en train d'tre supprim de votre ordinateur." + 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 ${NAME} ${VERSION}" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${MUI_PRODUCT} ${MUI_VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/German.nsh b/Contrib/Modern UI/Language files/German.nsh index 705478d6..e261f258 100644 --- a/Contrib/Modern UI/Language files/German.nsh +++ b/Contrib/Modern UI/Language files/German.nsh @@ -11,15 +11,18 @@ !define MUI_GERMAN_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf" + !define MUI_GERMAN_LANGNAME "Deutsch" ;Name of the language in the language itself (English, Deutsch, Franais etc.) ;INSTALLER + Name /LANG=${LANG_GERMAN} "${MUI_NAME}" !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 ${NAME} zu installieren." + 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 !ifdef MUI_COMPONENTSPAGE @@ -31,43 +34,43 @@ !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_GERMAN} "${NAME} 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." + 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 ${NAME} installiert werden soll." + 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 LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GERMAN} "Installiere..." - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, whrend ${NAME} installiert wird." + 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 ${NAME} abbrechen wollen?" + LangString MUI_TEXT_ABORTWARNING ${LANG_GERMAN} "Sind Sie sicher, dass Sie die Installation von ${MUI_PRODUCT} abbrechen wollen?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_GERMAN} "${NAME} ${VERSION} Installation" + LangString MUI_TEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_GERMAN} "Deinstalliert ${NAME} von ihrem System." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GERMAN} "Deinstallation von ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GERMAN} "Entferne ${NAME} von ihrem System." + 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 ${NAME} entfernt wird." + 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 ${NAME} wurde erfolgreich abgeschlossen." + LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GERMAN} "Die Deinstallation von ${MUI_PRODUCT} wurde erfolgreich abgeschlossen." !endif !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GERMAN} "${NAME} ${VERSION} Installation" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation" !endif !endif diff --git a/Contrib/Modern UI/Language files/Greek.nsh b/Contrib/Modern UI/Language files/Greek.nsh index 28ac4d12..bc9ad32b 100644 --- a/Contrib/Modern UI/Language files/Greek.nsh +++ b/Contrib/Modern UI/Language files/Greek.nsh @@ -11,15 +11,18 @@ !define MUI_GREEK_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\Greek.nlf" + !define MUI_GREEK_LANGNAME "Greek" ; (English, Deutsch, Franais etc.) ;INSTALLER + Name /LANG=${LANG_GREEK} "${MUI_NAME}" !ifdef MUI_LICENSEPAGE LicenseText /LANG=${LANG_GREEK} " Page Down ." LangString MUI_TEXT_LICENSE_TITLE ${LANG_GREEK} " " - LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GREEK} " '${NAME}'." - LangString MUI_INNERTEXT_LICENSE ${LANG_GREEK} " . , , '${NAME}'." + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GREEK} " '${MUI_PRODUCT}'." + LangString MUI_INNERTEXT_LICENSE ${LANG_GREEK} " . , , '${MUI_PRODUCT}'." !endif !ifdef MUI_COMPONENTSPAGE @@ -31,43 +34,43 @@ !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_GREEK} " '${NAME}' .$\r$\n$\r$\n , . , ." + DirText /LANG=${LANG_GREEK} " '${MUI_PRODUCT}' .$\r$\n$\r$\n , . , ." LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GREEK} " " - LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GREEK} " '${NAME}'." + 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} " '${NAME}' ." + 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} " '${NAME}';" + LangString MUI_TEXT_ABORTWARNING ${LANG_GREEK} " '${MUI_PRODUCT}';" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_GREEK} " '${NAME} ${VERSION}'" + LangString MUI_TEXT_SETUPCAPTION ${LANG_GREEK} " '${MUI_PRODUCT} ${MUI_VERSION}'" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_GREEK} " '${NAME}' ." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GREEK} " '${NAME}'" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GREEK} " '${NAME}' ." + 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}' ." LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_GREEK} " " - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GREEK} " '${NAME}' ." + 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} " '${NAME} ${VERSION}'" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GREEK} " '${MUI_PRODUCT} ${MUI_VERSION}'" !endif !endif diff --git a/Contrib/Modern UI/Language files/Italian.nsh b/Contrib/Modern UI/Language files/Italian.nsh index 26aad2fe..ae6b8ae7 100644 --- a/Contrib/Modern UI/Language files/Italian.nsh +++ b/Contrib/Modern UI/Language files/Italian.nsh @@ -11,15 +11,18 @@ !define MUI_ITALIAN_USED - !define MUI_ITALIAN_LANGNAME "Italiano" ;Name of the language in the language itself (English, Deutsch, Franais, Italiano etc.) + 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}" !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 ${NAME}." - 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 ${NAME}." + 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 !ifdef MUI_COMPONENTSPAGE @@ -31,43 +34,43 @@ !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_ITALIAN} "Il programma d'installazione installer ${NAME} 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." + 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 ${NAME}." + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ITALIAN} "Scegli la cartella dove installare ${MUI_PRODUCT}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ITALIAN} "Cartella d'installazione" !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ITALIAN} "Installazione in corso" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ITALIAN} "Per favore attendi che ${NAME} sia completamente installato." + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ITALIAN} "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." !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${NAME} ?" + LangString MUI_TEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${MUI_PRODUCT} ?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${NAME} ${VERSION}" + LangString MUI_TEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_ITALIAN} "Questo programma rimuover ${NAME} dal vosto computer." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ITALIAN} "Disinstalla ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ITALIAN} "Rimuovi ${NAME} dal vostro computer." + 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 ${NAME} sia completamente disinstallato." + 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 ${NAME} ${VERSION}" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/Japanese.nsh b/Contrib/Modern UI/Language files/Japanese.nsh index b48036f1..1d361047 100644 --- a/Contrib/Modern UI/Language files/Japanese.nsh +++ b/Contrib/Modern UI/Language files/Japanese.nsh @@ -11,63 +11,66 @@ !define MUI_JAPANESE_USED + 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}" !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} " ${NAME} CXg[OɁACZXmFĂB" - LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${NAME} CXg[ɂ́A_񏑂ɓӂKv܂B$\r$\n_񏑂ׂ̂Ă̏ɓӂȂ΁A[ӂ] IŃCXg[𑱂ĂB" + 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 !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} "${NAME} ̃CXg[ IvVIł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 !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_JAPANESE} "${NAME} ȉ̃tH_ɃCXg[܂B$\r$\n$\r$\ñtH_ɃCXg[ɂ́A[CXg[]ĂB$\r$\nقȂtH_ɃCXg[ɂ́A[Q]āAʂ̃tH_IĂB" + 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} "${NAME} CXg[tH_IłB" + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} CXg[tH_IłB" LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_JAPANESE} "CXg[ tH_" !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_JAPANESE} "CXg[" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${NAME} CXg[Ă܂B΂炭҂B" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} CXg[Ă܂B΂炭҂B" LangString MUI_TEXT_FINISHED_TITLE ${LANG_JAPANESE} "" LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "CXg[ɐ܂B" !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${NAME} ̃CXg[𒆎~܂H" + LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${MUI_PRODUCT} ̃CXg[𒆎~܂H" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${NAME} ${VERSION} ZbgAbv" + LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} ZbgAbv" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_JAPANESE} "${NAME} ̃VXeACXg[܂B" - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_JAPANESE} "${NAME} ̃ACXg[B" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_JAPANESE} "${NAME} ̃VXeACXg[܂B" + 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} "${NAME} ACXg[Ă܂B΂炭҂B" + 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} "${NAME} ${VERSION} ZbgAbv" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} ZbgAbv" !endif !endif diff --git a/Contrib/Modern UI/Language files/Polish.nsh b/Contrib/Modern UI/Language files/Polish.nsh index 889daf5b..b8ad1363 100644 --- a/Contrib/Modern UI/Language files/Polish.nsh +++ b/Contrib/Modern UI/Language files/Polish.nsh @@ -11,63 +11,66 @@ !define MUI_POLISH_USED + 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}" !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 ${NAME}." - LangString MUI_INNERTEXT_LICENSE ${LANG_POLISH} "Jeeli akceptujesz wszystkie warunki umnowy wybierz Zgadzam si, aby kontynuowa. Musisz zaakceptowa warunki umowy, aby zainstalowa ${NAME}." + 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 !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 ${NAME}, ktre chcesz zainstalowa." + 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 !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_POLISH} "Instalator zainstaluje ${NAME} do nastpujcego folderu.$\r$\n$\r$\nAby zainstalowa w tym folderze kliknij Instaluj. Aby zainstalowa w innym folderze kliknij Przegldaj i wybierz inny folder." + 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 ${NAME}." + 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 LangString MUI_TEXT_INSTALLING_TITLE ${LANG_POLISH} "Instaluje" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_POLISH} "Prosz czeka, kiedy ${NAME} jest instalowany." + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_POLISH} "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." !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyj z instalatora ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyj z instalatora ${MUI_PRODUCT}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_POLISH} "${NAME} ${VERSION} Instalator" + LangString MUI_TEXT_SETUPCAPTION ${LANG_POLISH} "${MUI_PRODUCT} ${MUI_VERSION} Instalator" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_POLISH} "Deinstalator odinstaluje ${NAME} z twojego systemu." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_POLISH} "Odinstaluj ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_POLISH} "Usu ${NAME} z twojego systemu." + 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 ${NAME} jest odinstalowywany." + 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} "${NAME} ${VERSION} Instalator" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_POLISH} "${MUI_PRODUCT} ${MUI_VERSION} Instalator" !endif !endif diff --git a/Contrib/Modern UI/Language files/PortugueseBR.nsh b/Contrib/Modern UI/Language files/PortugueseBR.nsh index 77160686..3363849d 100644 --- a/Contrib/Modern UI/Language files/PortugueseBR.nsh +++ b/Contrib/Modern UI/Language files/PortugueseBR.nsh @@ -11,63 +11,66 @@ !define MUI_PORTUGUESEBR_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\PortugueseBR.nlf" + !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}" !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 ${NAME}." - 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 ${NAME}." + 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 !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 ${NAME} que voc deseja instalar." + 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 !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_PORTUGUESEBR} "O instalador instalar o ${NAME} 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." + 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 ${NAME}." + 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 ${NAME} est sendo instalado." + 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 ${NAME}?" + 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 ${NAME} ${VERSION}" + LangString MUI_TEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${MUI_PRODUCT} ${MUI_VERSION}" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_PORTUGUESEBR} "Isto desinstalar ${NAME} de seu sistema." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_PORTUGUESEBR} "Desinstalar ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_PORTUGUESEBR} "Remover ${NAME} de seu sistema." + 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." LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_PORTUGUESEBR} "Desinstalando" - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_PORTUGUESEBR} "Por favor, aguarde enquanto ${NAME} est sendo desinstalado." + 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 ${NAME} ${VERSION}" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalao de ${MUI_PRODUCT} ${MUI_VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/Russian.nsh b/Contrib/Modern UI/Language files/Russian.nsh index e17958ac..0f929b2d 100644 --- a/Contrib/Modern UI/Language files/Russian.nsh +++ b/Contrib/Modern UI/Language files/Russian.nsh @@ -11,63 +11,66 @@ !define MUI_RUSSIAN_USED + 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}" !ifdef MUI_LICENSEPAGE LicenseText /LANG=${LANG_RUSSIAN} " PageDown, ." LangString MUI_TEXT_LICENSE_TITLE ${LANG_RUSSIAN} " " - LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_RUSSIAN} " ${NAME}." - LangString MUI_INNERTEXT_LICENSE ${LANG_RUSSIAN} " , . ${NAME}." + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT}." + LangString MUI_INNERTEXT_LICENSE ${LANG_RUSSIAN} " , . ${MUI_PRODUCT}." !endif !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_RUSSIAN} " , , , . ." LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_RUSSIAN} " " - LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_RUSSIAN} " ${NAME} ." + LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT} ." LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_RUSSIAN} "" LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_RUSSIAN} " , ." !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_RUSSIAN} " ${NAME} .$\r$\n$\r$\n , . , ." + DirText /LANG=${LANG_RUSSIAN} " ${MUI_PRODUCT} .$\r$\n$\r$\n , . , ." LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_RUSSIAN} " " - LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_RUSSIAN} " ${NAME}." + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_RUSSIAN} " ${MUI_PRODUCT}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_RUSSIAN} " " !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_RUSSIAN} " " - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_RUSSIAN} " , ${NAME}." + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_RUSSIAN} " , ${MUI_PRODUCT}." LangString MUI_TEXT_FINISHED_TITLE ${LANG_RUSSIAN} "" LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} " ." !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_RUSSIAN} " , ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_RUSSIAN} " , ${MUI_PRODUCT}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_RUSSIAN} "${NAME} ${VERSION} " + LangString MUI_TEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} " !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_RUSSIAN} " ${NAME} ." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_RUSSIAN} " ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_RUSSIAN} " ${NAME} ." + 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} " , ${NAME}." + 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} "${NAME} ${VERSION} " + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} " !endif !endif diff --git a/Contrib/Modern UI/Language files/SimpChinese.nsh b/Contrib/Modern UI/Language files/SimpChinese.nsh index c265ea48..018429b9 100644 --- a/Contrib/Modern UI/Language files/SimpChinese.nsh +++ b/Contrib/Modern UI/Language files/SimpChinese.nsh @@ -11,63 +11,66 @@ !define MUI_SIMPCHINESE_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf" + !define MUI_SIMPCHINESE_LANGNAME "Chinese (Simplified)" ;Աķʽд (English, Deutsch, Franais etc.) ;INSTALLER + Name /LANG=${LANG_SIMPCHINESE} "${MUI_NAME}" !ifdef MUI_LICENSEPAGE LicenseText /LANG=${LANG_SIMPCHINESE} "ҪȨԼಿ֣밴 [PgDn] ¾ҳ档" LangString MUI_TEXT_LICENSE_TITLE ${LANG_SIMPCHINESE} "ȨԼ" - LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SIMPCHINESE} "ڰװ ${NAME} ֮ǰȨ" - LangString MUI_INNERTEXT_LICENSE ${LANG_SIMPCHINESE} "ͬкԼеѡ [ͬ(A)] װѡ [ȡ(C)] װ򽫻رաҪȨԼܰװ ${NAME}" + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SIMPCHINESE} "ڰװ ${MUI_PRODUCT} ֮ǰȨ" + LangString MUI_INNERTEXT_LICENSE ${LANG_SIMPCHINESE} "ͬкԼеѡ [ͬ(A)] װѡ [ȡ(C)] װ򽫻رաҪȨԼܰװ ${MUI_PRODUCT}" !endif !ifdef MUI_COMPONENTSPAGE ComponentText /LANG=${LANG_SIMPCHINESE} "ȡҪװѲ밲װȡ [һ(N)] " LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SIMPCHINESE} "ѡ" - LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${NAME} Ҫװ" + LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${MUI_PRODUCT} Ҫװ" LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_SIMPCHINESE} "" LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SIMPCHINESE} "ƶָ굽֮ϣɼ" !endif !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_SIMPCHINESE} "װļУװ ${NAME} $\r$\n$\r$\nҪװļУ [װ(I)] ҪװڲͬļУ [(B)...] ѡļС" + 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} "ѡ ${NAME} Ҫװļλá" + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SIMPCHINESE} "ѡ ${MUI_PRODUCT} Ҫװļλá" LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SIMPCHINESE} "Ŀļ" !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SIMPCHINESE} "ڰװ" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${NAME} ڰװȺ" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ڰװȺ" LangString MUI_TEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} "" LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "װѳɹɡ" !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_SIMPCHINESE} "ȷʵҪ˳ ${NAME} װ" + LangString MUI_TEXT_ABORTWARNING ${LANG_SIMPCHINESE} "ȷʵҪ˳ ${MUI_PRODUCT} װ" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${NAME} ${VERSION} װ" + LangString MUI_TEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} װ" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_SIMPCHINESE} "⽫ϵͳнװ ${NAME}" - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_SIMPCHINESE} "װ ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_SIMPCHINESE} "ϵͳװ ${NAME} " + 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} " LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_SIMPCHINESE} "ڽװ" - LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${NAME} ڽװȺ" + 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} "${NAME} Ѵϵͳװ" + LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} Ѵϵͳװ" !endif !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${NAME} ${VERSION} װ" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} װ" !endif !endif diff --git a/Contrib/Modern UI/Language files/Spanish.nsh b/Contrib/Modern UI/Language files/Spanish.nsh index 71c0525b..93789cc3 100644 --- a/Contrib/Modern UI/Language files/Spanish.nsh +++ b/Contrib/Modern UI/Language files/Spanish.nsh @@ -11,63 +11,66 @@ !define MUI_SPANISH_USED + LoadLanguageFile "${NSISDIR}\Contrib\Language files\Spanish.nlf" + !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 ${NAME}." - LangString MUI_INNERTEXT_LICENSE ${LANG_SPANISH} "Si acepta todos los trminos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${NAME}." + 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 ${NAME} desea instalar." + 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 ${NAME} 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." + 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 ${NAME}." + 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 ${NAME} se instala." + 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 ${NAME}?" + 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 ${NAME} ${VERSION}" + LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${MUI_PRODUCT} ${MUI_VERSION}" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_SPANISH} "Esto desinstalar ${NAME} de su sistema." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_SPANISH} "Desinstalar ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_SPANISH} "Elimina ${NAME} de su sistema." + 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 ${NAME} se desinstala." + 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 ${NAME} ${VERSION}" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SPANISH} "Instalacin de ${MUI_PRODUCT} ${MUI_VERSION}" !endif !endif diff --git a/Contrib/Modern UI/Language files/TradChinese.nsh b/Contrib/Modern UI/Language files/TradChinese.nsh index b0ca7080..5ac1e058 100644 --- a/Contrib/Modern UI/Language files/TradChinese.nsh +++ b/Contrib/Modern UI/Language files/TradChinese.nsh @@ -11,63 +11,66 @@ !define MUI_TRADCHINESE_USED + 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}" !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 ${NAME} eA˾\vڡC" - LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "pGAPNҦXڡA [ڦPN(A)] ~wˡCpGA [(C)] Aw˵{N|CnvX~w ${NAME}C" + 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 !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} " ${NAME} AQnw˪C" + 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 !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_TRADCHINESE} "w˵{NbUCƧAw ${NAME} C$\r$\n$\r$\nnw˨oӸƧA@U [w(I)] Cnw˦bPƧA@U [s(B)...] ÿܨLƧC" + 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} " ${NAME} nw˪ƧmC" + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} " ${MUI_PRODUCT} nw˪ƧmC" LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_TRADCHINESE} "تƧ" !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "bw" - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${NAME} bwˡAеԡC" + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} bwˡAеԡC" LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "" LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "w˵{w\a槹C" !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "ATwn} ${NAME} w˵{H" + LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "ATwn} ${MUI_PRODUCT} w˵{H" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} w" + LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} w" !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_TRADCHINESE} "oN|qAtΤѰw ${NAME}C" - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_TRADCHINESE} "Ѱw ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_TRADCHINESE} "qAtθѰw ${NAME} C" + 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} "${NAME} bѰwˡAеԡC" + 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} "${NAME} wqAtθѰwˡC" + LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} wqAtθѰwˡC" !endif !ifdef MUI_UNINSTALLOPTIONS - LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} w" + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} w" !endif !endif diff --git a/Contrib/Modern UI/Language files/Ukrainian.nsh b/Contrib/Modern UI/Language files/Ukrainian.nsh index 613d6f11..917af86e 100644 --- a/Contrib/Modern UI/Language files/Ukrainian.nsh +++ b/Contrib/Modern UI/Language files/Ukrainian.nsh @@ -11,63 +11,66 @@ !define MUI_UKRAINIAN_USED + 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}" !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 ${NAME}." - LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} " i , i . i ii ${NAME}." + LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_UKRAINIAN} " ii ${MUI_PRODUCT}." + LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} " i , i . i ii ${MUI_PRODUCT}." !endif !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 ${NAME} ." + 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 !ifdef MUI_DIRECTORYPAGE - DirText /LANG=${LANG_UKRAINIAN} "I ${NAME} .$\r$\n$\r$\n , i . i i i i i ." + 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 ${NAME}." + LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_UKRAINIAN} "i ${MUI_PRODUCT}." LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_UKRAINIAN} " " !endif LangString MUI_TEXT_INSTALLING_TITLE ${LANG_UKRAINIAN} " " - LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_UKRAINIAN} "- , ${NAME}." + LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_UKRAINIAN} "- , ${MUI_PRODUCT}." LangString MUI_TEXT_FINISHED_TITLE ${LANG_UKRAINIAN} "" LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} " i ." !ifdef MUI_ABORTWARNING - LangString MUI_TEXT_ABORTWARNING ${LANG_UKRAINIAN} " i ${NAME}?" + LangString MUI_TEXT_ABORTWARNING ${LANG_UKRAINIAN} " i ${MUI_PRODUCT}?" !endif !ifdef MUI_INSTALLOPTIONS - LangString MUI_TEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${VERSION} " + LangString MUI_TEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} " !endif ;UNINSTALLER !ifdef MUI_UNINSTALLER - UninstallText /LANG=${LANG_UKRAINIAN} " ${NAME} '." - LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_UKRAINIAN} " ${NAME}" - LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_UKRAINIAN} " ${NAME} '." + 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} "- ${NAME}." + 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} "${VERSION} " + LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} " !endif !endif diff --git a/Contrib/Modern UI/Readme.html b/Contrib/Modern UI/Readme.html index 67a03537..ed908949 100644 --- a/Contrib/Modern UI/Readme.html +++ b/Contrib/Modern UI/Readme.html @@ -62,6 +62,7 @@ table .subheader { + margin: 20px; font-size: 11pt; font-weight: bold; color: #303030; @@ -121,30 +122,32 @@ with a custom user interface.

has already been written for you!

The easiest way to use the Modern UI is to customize one of the example scripts, but you can also modify an existing script.

- There are 7 things you need to insert in an existing script to use the + There are 8 things you need to insert in an existing script to use the Modern UI (in order).

-

1. Insert the header files

+

1. Insert the header files

!include "${NSISDIR}\Contrib\Modern UI\System.nsh"
-

2. Define the name and version of your software

-
!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version here
-

3. Define which elements you are using

- The Modern UI should know which things it should insert. Use the following defines:

+

2. Define the name and version of your software and the installer name

+
!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
+

3. Define which elements you are using

+

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_UNINSTALL ;Uninstaller
 !define MUI_ABORTWARNING ;Abort warning messabox
-!define MUI_INSTALLOPTIONS ;Using Install Options
-

4. Insert language files

- Insert the Modern UI language files for the languages you are using:

- 
!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
-

5. Interface settings (optional)

- You can change the settings of the interface by usings defines:
- 

!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"

-

If you don't define a setting, the default will be used.

- The following settings are available: (default)

+!define MUI_INSTALLOPTIONS ;Use Install Options +!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages +

4. Interface settings (optional)

+

You can change the settings of the interface by usings defines:

+ 
!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"
+

If you don't define a setting, the default will be used.

+

The following settings are available: (default)

+ MUI_UI (${NSISDIR}\Contrib\UIs\modern.exe) + - The interface file with the dialog resources
MUI_ICON (${NSISDIR}\Contrib\Icons\modern-install.ico) - The icon of the instaleller
MUI_UNICON (${NSISDIR}\Contrib\Icons\modern-uninstall.ico) @@ -152,8 +155,6 @@ with a custom user interface.

MUI_CHECKBITMAP (${NSISDIR}\Contrib\Icons\modern.bmp) - The bitmap with images for the checks of the component select treeview.
- MUI_UI (${NSISDIR}\Contrib\UIs\modern.exe) - - The interface file with the dialog resources
MUI_FONT (Tahoma) - The font of the installer and uninstaller
MUI_INSTALLCOLORS (/windows) @@ -161,9 +162,25 @@ with a custom user interface.

MUI_PROGRESSBAR (smooth) - The style of the progress bar ("colored" to use the MUI_INSTALLCOLORS or "" for a old-school windows look)

-

6. Insert the MUI_SYSTEM macro

+

5. Insert the MUI_SYSTEM macro

!insertmacro MUI_SYSTEM
-

7. Set the descriptions for the sections

+

6. Insert language files

+

Insert the Modern UI language files for the languages you are using:

+ 
!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
+

Note: The Modern UI language files load the NLF language files, + so you should not use LoadLanguageFile.

+

7. Insert the MUI_SECTIONS_FINISHHEADER macro +

You should insert the MUI_SECTIONS_FINISHHEADER after all the + section to display the finish-header.

+
+!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
+
+

In the uninstaller, insert MUI_UNFINISHHEADER at the end of the +Unintaller section.

+
+!insertmacro MUI_UNFINISHHEADER
+
+

8. Set the descriptions for the sections

 LangString DESC_SectionName1 ${LANG_ENGLISH} "Description of section 1."
 LangString DESC_SectionName2 ${LANG_ENGLISH} "Description of section 2."
@@ -186,18 +203,19 @@ SectionEnd
 
Custom pages

 
Have a look at the 
 Install Options documentation for info about creating Install Options INI Files.

+
Custom Page Commands

 
If you want add custom pages to your installer using Install Options,
 you should insert you own page commands to set the order of the pages and the names
-of the page functions:

+of the page functions and define MUI_CUSTOMPAGECOMMANDS before inserting the MUI_SYSTEM
+macro:

 
-!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
-
 !insertmacro MUI_PAGECOMMAND_LICENSE
 !insertmacro MUI_PAGECOMMAND_COMPONENTS
 !insertmacro MUI_PAGECOMMAND_DIRECTORY
 Page custom [function name] ;A custom page
 !insertmacro MUI_PAGECOMMAND_INSTFILES
 

+
Call Install Options

 
You can call Install Options in [function name]:

 
 LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page"
@@ -208,20 +226,14 @@ Function [function name]
   !insertmacro MUI_INSTALLOPTIONS_SHOW "ioFile.ini"
 FunctionEnd
 

-
If you have defined MUI_INSTALLOPTIONS, there is a LangString for
-the setup caption available which you can use to write the caption in the current
-language to an Install Options INI File:

+
Write title and abortwarning

+
Use these macro's in .onInit to write the page
+title and abortwarning to an INI File.

 
 LangString TEXT_IO_PAGETITLE ${LANG_ENGLISH} "Page Title"
 
-!insertmacro MUI_INSTALLOPTIONS_WRITE "ioFile.ini" \
-"Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): $(TEXT_IO_PAGETITLE)"
-

-
If you are using abort warnings, you should also write the abort
-warning in the current language to an Install Options INI File:

-
-!insertmacro MUI_INSTALLOPTIONS_WRITE "ioFile.ini" \
-"Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
+!insertmacro MUI_INSTALLOPTIONS_WRITETITLE "ioFile.ini" "$(TEXT_IO_PAGETITLE)"
+!insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING "ioFile.ini" "$(TEXT_IO_PAGETITLE)"
 

 
Examples

 
Basic: Basic.nsi

@@ -229,15 +241,15 @@ warning in the current language to an Install Options INI File:

   Cutom pages: InstallOptions.nsi

   

 
The interface

-
Modern.exe and modern2.exe


-  There are two different versions of the interface.
+
Modern.exe and modern2.exe

+  
There are two different versions of the interface.
   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.

-
Customize the dialogs


-To change elements on the dialogs, modify modern.exe or modern2.exe in the
-  Contrib\UIs directory using a resource editor such as
+
Customize the dialogs

+  
To change elements on the dialogs, modify modern.exe or
+  modern2.exe in the Contrib\UIs directory using a resource editor such as
   Resource Hacker.


 The 'Loading Setup' text on the splash screen which 
   is being displayed when the installer is starting (Verifying 
@@ -250,12 +262,13 @@ The 'verifying installer' and 'unpacking data' texts are defined in
   To change them, you need to edit this file and recompile NSIS.

 
Version history

   
 
Complete version history

diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh
index fb8676c6..1e2dc159 100644
--- a/Contrib/Modern UI/System.nsh	
+++ b/Contrib/Modern UI/System.nsh	
@@ -22,6 +22,10 @@
   !verbose 3
 
   ;User interface
+  
+  !ifndef MUI_UI
+    !define MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
+  !endif
 
   !ifndef MUI_ICON
     !define MUI_ICON "${NSISDIR}\Contrib\Icons\modern-install.ico"
@@ -35,10 +39,6 @@
     !define MUI_CHECKBITMAP "${NSISDIR}\Contrib\Icons\modern.bmp"
   !endif
 
-  !ifndef MUI_UI
-    !define MUI_UI "${NSISDIR}\Contrib\UIs\modern.exe"
-  !endif
-
   !ifndef MUI_FONT
     !define MUI_FONT "Tahoma"
   !endif
@@ -57,10 +57,10 @@
 
   XPStyle On
 
+  ChangeUI all "${MUI_UI}"
   Icon "${MUI_ICON}"
   UninstallIcon "${MUI_UNICON}"
   CheckBitmap "${MUI_CHECKBITMAP}"
-  ChangeUI all "${MUI_UI}"
   SetFont "${MUI_FONT}" 8
   InstallColors "${MUI_INSTALLCOLORS}"
   InstProgressFlags "${MUI_PROGRESSBAR}"
@@ -71,6 +71,7 @@
 !macroend
 
 !macro MUI_INTERFACE_ALLRES UI ICON UNICON CHECKS PROGRESSBAR FONT
+  
   !define MUI_UI "${UI}"
   !define MUI_ICON "${ICON}"
   !define MUI_UNICON "${UNICON}"
@@ -78,6 +79,7 @@
   !define MUI_PROGRESSBAR "${PROGRESSBAR}"
   !define MUI_FONT "${FONT}"
   !insertmacro MUI_INTERFACE
+  
 !macroend
 
 !macro MUI_INNERDIALOG_TEXT CONTROL TEXT
@@ -394,6 +396,56 @@
 
 !macroend
 
+!macro MUI_INSTALLOPTIONS_WRITETITLE FILE TITLE
+
+  !verbose 3
+  
+  Push ${MUI_TEMP1}
+  Push ${MUI_TEMP2}
+
+    StrCpy ${MUI_TEMP1} "$(MUI_TEXT_SETUPCAPTION)"
+    StrCpy ${MUI_TEMP2} "${TITLE}"
+    
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "Title" "${MUI_TEMP1}: ${MUI_TEMP2}"
+  
+  Pop ${MUI_TEMP2}
+  Pop ${MUI_TEMP1}
+  
+!macroend
+
+!macro MUI_INSTALLOPTIONS_WRITEABORTWARNING FILE
+  
+  !verbose 3
+  
+  !ifdef MUI_ABORTWARNING
+
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
+  
+  !endif
+  
+  !verbose 4
+  
+!macroend
+
+;--------------------------------
+;SECTIONS
+
+!macro MUI_SECTIONS_FINISHHEADER
+
+  !verbose 3
+
+  Section ""
+
+    ;Invisible section to display the Finish header
+    !insertmacro MUI_FINISHHEADER
+
+  SectionEnd
+  
+  !verbose 4
+  
+!macroend
+
 ;--------------------------------
 ;FUNCTIONS
 
diff --git a/Examples/Modern UI/Basic.nsi b/Examples/Modern UI/Basic.nsi
index 9569f5b5..a08f3765 100644
--- a/Examples/Modern UI/Basic.nsi	
+++ b/Examples/Modern UI/Basic.nsi	
@@ -2,8 +2,10 @@
 ;Basic Macro System Example Script
 ;Written by Joost Verburg
 
-!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version 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 "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
@@ -17,13 +19,10 @@
   !define MUI_UNINSTALLER
 
   ;Language
-    ;English
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
-
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
+  
   ;General
   OutFile "Basic.exe"
-  Name "${NAME} ${VERSION}"
 
   ;License page
   LicenseData "${NSISDIR}\Contrib\Modern UI\License.txt"
@@ -32,7 +31,12 @@
   LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
 
   ;Folder-selection page
-  InstallDir "$PROGRAMFILES\${NAME}"
+  InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
+
+;--------------------------------
+;Modern UI System
+
+!insertmacro MUI_SYSTEM
 
 ;--------------------------------
 ;Installer Sections
@@ -49,17 +53,10 @@ Section "modern.exe" SecCopyUI
 
 SectionEnd
 
-Section ""
-
-  ;Invisible section to display the Finish header
-  !insertmacro MUI_FINISHHEADER
-
-SectionEnd
+!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
 
 ;--------------------------------
-;Modern UI System
-
-!insertmacro MUI_SYSTEM
+;Descriptions
 
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_START
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
diff --git a/Examples/Modern UI/InstallOptions.nsi b/Examples/Modern UI/InstallOptions.nsi
index 6ea7028e..7f47041a 100644
--- a/Examples/Modern UI/InstallOptions.nsi	
+++ b/Examples/Modern UI/InstallOptions.nsi	
@@ -2,8 +2,10 @@
 ;Install Options Example Script
 ;Written by Joost Verburg
 
-!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version 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 "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
@@ -18,20 +20,20 @@
   !define MUI_ABORTWARNING
   !define MUI_UNINSTALLER
   
+  !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
+    
   !define TEMP1 $R0
-
+  !define TEMP2 $R1
+  
   ;Language
-    ;English
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
+  
+  !insertmacro MUI_SYSTEM
 
   ;General
   OutFile "InstallOptions.exe"
-  Name "${NAME} ${VERSION}"
   
   ;Page order
-  !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
-  
   !insertmacro MUI_PAGECOMMAND_LICENSE
   Page custom SetCustomA
   Page custom SetCustomB
@@ -46,15 +48,18 @@
   ;Component-selection page
     ;Descriptions
     LangString DESC_SecCopyUI ${LANG_ENGLISH} "Copy the modern.exe file to the application folder."
-    LangString DESC_SecCreateUninst ${LANG_ENGLISH} "Create a uninstaller which can automatically delete ${NAME}."
 
   ;Folder-selection page
-  InstallDir "$PROGRAMFILES\${NAME}"
+  InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
   
   ;Install Options pages
   LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page"
   LangString TEXT_IO_SUBTITLE ${LANG_ENGLISH} "Create your own dialog!"
   
+  LangString TEXT_IO_PAGETITLE_A ${LANG_ENGLISH} "Custom Page A"
+  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
@@ -71,23 +76,22 @@
 ;Installer Sections
 
 Function .onInit
-  ;Init InstallOptions
+
+  ;Extract Install Options INI Files
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioA.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioB.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "ioC.ini"
+  
   ;Titles for Install Options dialogs
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page A"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page B"
-  !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): Custom page C"
-  !ifdef MUI_ABORTWARNING
-    ;Abort warnings for Install Options dialogs
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioB.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioC.ini" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
-  !endif
+  !insertmacro MUI_INSTALLOPTIONS_WRITETITLE "ioA.ini" "$(TEXT_IO_PAGETITLE_A)"
+  !insertmacro MUI_INSTALLOPTIONS_WRITETITLE "ioB.ini" "$(TEXT_IO_PAGETITLE_B)"
+  !insertmacro MUI_INSTALLOPTIONS_WRITETITLE "ioC.ini" "$(TEXT_IO_PAGETITLE_C)"
+  
+  ;Abort warnings for Install Options dialogs
+  !insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING "ioA.ini"
+  !insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING "ioB.ini"
+  !insertmacro MUI_INSTALLOPTIONS_WRITEABORTWARNING "ioC.ini"
+  
 FunctionEnd
 
 Section "modern.exe" SecCopyUI
@@ -108,12 +112,7 @@ Section "modern.exe" SecCopyUI
 
 SectionEnd
 
-Section ""
-
-  ;Invisible section to display the Finish header
-  !insertmacro MUI_FINISHHEADER
-
-SectionEnd
+!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
 
 ;--------------------------------
 ;Installer Functions
@@ -133,11 +132,6 @@ Function SetCustomC
   !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
 FunctionEnd
 
-;--------------------------------
-;Modern UI System
-
-!insertmacro MUI_SYSTEM
-
 ;--------------------------------
 ;Uninstaller Section
 
diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi
index 3a0a4866..227fe253 100644
--- a/Examples/Modern UI/MultiLanguage.nsi	
+++ b/Examples/Modern UI/MultiLanguage.nsi	
@@ -2,8 +2,10 @@
 ;Basic Macro System & MultiLanguage Example Script
 ;Written by Joost Verburg
 
-!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version 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 "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
 
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
@@ -17,79 +19,22 @@
   !define MUI_UNINSTALLER
 
   ;Languages
-    ;English
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
-       
-    ;French
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\French.nsh"
-    
-    ;German
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\German.nsh"
-    
-    ;Spanish
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Spanish.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Spanish.nsh"
-    
-    ;Simplified Chinese
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\SimpChinese.nsh"
-
-    ;Traditional Chinese
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\TradChinese.nsh"    
-    
-    ;Japanese
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh"    
-    
-    ;Italian
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Italian.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Italian.nsh"
-    
-    ;Dutch
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Dutch.nsh"
-    
-    ;Polish
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Polish.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Polish.nsh"
-    
-    ;Greek
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Greek.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Greek.nsh"
-
-    ;Russian
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Russian.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Russian.nsh"
-    
-    ;Portuguese (Brasil)
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\PortugueseBR.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\PortugueseBR.nsh"
-    
-    ;Ukrainian
-    LoadLanguageFile "${NSISDIR}\Contrib\Language files\Ukrainian.nlf"
-    !include "${NSISDIR}\Contrib\Modern UI\Language files\Ukrainian.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\French.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\German.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Spanish.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\SimpChinese.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\TradChinese.nsh"    
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Japanese.nsh"    
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Italian.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Dutch.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Polish.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Greek.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Russian.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\PortugueseBR.nsh"
+  !include "${NSISDIR}\Contrib\Modern UI\Language files\Ukrainian.nsh"
   
   OutFile "MultiLanguage.exe"
-  
-  ;Name
-  Name /LANG=${LANG_ENGLISH} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_FRENCH} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_GERMAN} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_SPANISH} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_SIMPCHINESE} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_TRADCHINESE} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_JAPANESE} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_ITALIAN} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_DUTCH} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_POLISH} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_GREEK} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_RUSSIAN} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_PORTUGUESEBR} "${NAME} ${VERSION}"
-  Name /LANG=${LANG_UKRAINIAN} "${NAME} ${VERSION}"
 
   ;License page
   LicenseData /LANG=${LANG_ENGLISH} "${NSISDIR}\Contrib\Modern UI\License.txt"
@@ -141,7 +86,12 @@
     LangString DESC_SecCopyUI ${LANG_UKRAINIAN} "modern.exe: Ukrainian description"
     
   ;Folder-selection page
-  InstallDir "$PROGRAMFILES\${NAME}"
+  InstallDir "$PROGRAMFILES\${MUI_PRODUCT}"
+  
+;--------------------------------
+;Modern UI System
+
+!insertmacro MUI_SYSTEM
   
 ;--------------------------------
 ;Installer Sections
@@ -159,12 +109,12 @@ SectionEnd
 
 Section ""
 
-  ;Invisible section to display the Finish header & write the language to the registry
+  ;Invisible section to write the language to the registry
+  WriteRegStr HKCU "Software\${MUI_PRODUCT}" "Installer Language" $LANGUAGE
   
-  WriteRegStr HKCU "Software\${NAME}" "Installer Language" $LANGUAGE
-  !insertmacro MUI_FINISHHEADER
-
 SectionEnd
+  
+!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
 
 ;--------------------------------
 ;Installer Functions
@@ -216,9 +166,7 @@ Function .onInit
 FunctionEnd
 
 ;--------------------------------
-;Modern UI System
-
-!insertmacro MUI_SYSTEM
+;Descriptions
 
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_START
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
@@ -236,7 +184,7 @@ Section "Uninstall"
 
   RMDir "$INSTDIR"
   
-  DeleteRegValue HKCU "Software\${NAME}" "Installer Language"
+  DeleteRegValue HKCU "Software\${MUI_PRODUCT}" "Installer Language"
 
   ;Display the Finish header
   !insertmacro MUI_UNFINISHHEADER
@@ -247,5 +195,5 @@ SectionEnd
 ;Uninstaller Functions
 
 Function un.onInit
-  ReadRegStr $LANGUAGE HKCU "Software\${NAME}" "Installer Language"
+  ReadRegStr $LANGUAGE HKCU "Software\${MUI_PRODUCT}" "Installer Language"
 FunctionEnd
\ No newline at end of file