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

@@ -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 

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, Français 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

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, Français 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} "Deïnstalleer ${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} "Deïnstalleer ${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 deïnstalleren"
-    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

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, Français 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

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 "Français" ;Name of the language in the language itself (English, Deutsch, Français 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 terminée"
   LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "L'installation s'est terminée avec succès."
   
   !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_FRENCH} "Êtes-vous sûr de vouloir quitter l'installation de ${NAME} ?"
+    LangString MUI_TEXT_ABORTWARNING ${LANG_FRENCH} "Êtes-vous sûr 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} "Désinstaller ${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} "Désinstaller ${MUI_PRODUCT}"
+    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_FRENCH} "Supprimer ${MUI_PRODUCT} de votre ordinateur."
   
     LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_FRENCH} "Désinstallation 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} "Désinstallation terminée"
     LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_FRENCH} "La désinstallation s'est terminée avec succès."
   !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

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, Français etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_GERMAN} "${MUI_NAME}"
 
   !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_GERMAN} "Drücken 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 müssen 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 müssen 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 möchten, klicken Sie auf Durchsuchen und wählen 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 möchten, klicken Sie auf Durchsuchen und wählen Sie ein anderes Verzeichnis aus."
     LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GERMAN} "Wählen Sie das Zielverzeichnis aus"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GERMAN} "Wählen Sie das Verzeichnis aus, in dem ${NAME} installiert werden soll."
+    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GERMAN} "Wählen 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, während ${NAME} installiert wird."
+  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, während ${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, während ${NAME} entfernt wird."
+    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, während ${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

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, Français 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

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, Français, Italiano etc.)
+  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Italian.nlf"
+
+  !define MUI_ITALIAN_LANGNAME "Italiano" ;Name of the language in the language itself (English, Deutsch, Français 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

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, Fran軋is etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_JAPANESE} "${MUI_NAME}"
   
   !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_JAPANESE} "[Page Down]を押して契約書をすべてお読みください。"
      LangString MUI_TEXT_LICENSE_TITLE ${LANG_JAPANESE} "ライセンス契約書"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_JAPANESE} " ${NAME} をインストールする前に、ライセンス条件を確認してください。"
-     LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${NAME} をインストールするには、契約書に同意する必要があります。$\r$\n契約書のすべての条件に同意するならば、[同意する] を選んでインストールを続けてください。"
+     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_JAPANESE} " ${MUI_PRODUCT} をインストールする前に、ライセンス条件を確認してください。"
+     LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールするには、契約書に同意する必要があります。$\r$\n契約書のすべての条件に同意するならば、[同意する] を選んでインストールを続けてください。"
   !endif
   
   !ifdef MUI_COMPONENTSPAGE
     ComponentText /LANG=${LANG_JAPANESE} "コンポーネントをインストールするにはチェックし、不要ならば、チェックを外してください。 $\r$\n続けるには[次へ]を押してください。"
     LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_JAPANESE} "コンポーネントを選んでください。"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_JAPANESE} "${NAME} のインストール オプションを選んでください。"
+    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} のインストール オプションを選んでください。"
     LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_JAPANESE} "説明"
     LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_JAPANESE} "コンポーネント上にマウス カーソルを移動すると、ここの説明が表示されます。"
   !endif
   
   !ifdef MUI_DIRECTORYPAGE
-    DirText /LANG=${LANG_JAPANESE} "${NAME} を以下のフォルダにインストールします。$\r$\n$\r$\nこのフォルダにインストールするには、[インストール]を押してください。$\r$\n異なったフォルダにインストールするには、[参照]を押して、別のフォルダを選択してください。"
+    DirText /LANG=${LANG_JAPANESE} "${MUI_PRODUCT} を以下のフォルダにインストールします。$\r$\n$\r$\nこのフォルダにインストールするには、[インストール]を押してください。$\r$\n異なったフォルダにインストールするには、[参照]を押して、別のフォルダを選択してください。"
     LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_JAPANESE} "インストール先を選んでください。"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${NAME} をインストールするフォルダを選んでください。"
+    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールするフォルダを選んでください。"
     LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_JAPANESE} "インストール先 フォルダ"
   !endif
   
   LangString MUI_TEXT_INSTALLING_TITLE ${LANG_JAPANESE} "インストール"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${NAME} をインストールしています。しばらくお待ちください。"
+  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールしています。しばらくお待ちください。"
   
   LangString MUI_TEXT_FINISHED_TITLE ${LANG_JAPANESE} "完了"
   LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "インストールに成功しました。"
   
   !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${NAME} のインストールを中止しますか？"
+    LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${MUI_PRODUCT} のインストールを中止しますか？"
   !endif
   
   !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${NAME} ${VERSION} セットアップ"
+    LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} セットアップ"
   !endif
 
 
   ;UNINSTALLER
   
   !ifdef MUI_UNINSTALLER
-    UninstallText /LANG=${LANG_JAPANESE} "${NAME} をこのシステムからアンインストールします。"
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_JAPANESE} "${NAME} のアンインストール。"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_JAPANESE} "${NAME} をこのシステムからアンインストールします。"
+    UninstallText /LANG=${LANG_JAPANESE} "${MUI_PRODUCT} をこのシステムからアンインストールします。"
+    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_JAPANESE} "${MUI_PRODUCT} のアンインストール。"
+    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をこのシステムからアンインストールします。"
   
     LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_JAPANESE} "アンインストール"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_JAPANESE} "${NAME} をアンインストールしています。しばらくお待ちください。"
+    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をアンインストールしています。しばらくお待ちください。"
   
     LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_JAPANESE} "完了"
     LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "アンインストールに成功しました。"
   !endif
   
   !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_JAPANESE} "${NAME} ${VERSION} セットアップ"
+    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} セットアップ"
   !endif
     
 !endif

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, Français 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} "Jeżeli 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} "Jeżeli 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, które chcesz zainstalowaæ oraz odznacz komponenty, które nie maj¹ byæ zainstalowane. Kliknij przycisk Dalej, aby kontynuowaæ."
     LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_POLISH} "Wybór komponentów"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_POLISH} "Wybierz komponenty ${NAME}, które chcesz zainstalować."
+    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_POLISH} "Wybierz komponenty ${MUI_PRODUCT}, które 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 następującego folderu.$\r$\n$\r$\nAby zainstalować w tym folderze kliknij Instaluj. Aby zainstalować w innym folderze kliknij Przeglądaj i wybierz inny folder."
+    DirText /LANG=${LANG_POLISH} "Instalator zainstaluje ${MUI_PRODUCT} do następującego folderu.$\r$\n$\r$\nAby zainstalować w tym folderze kliknij Instaluj. Aby zainstalować w innym folderze kliknij Przeglądaj i wybierz inny folder."
     LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_POLISH} "Wybór miejsca instalacji"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_POLISH} "Wybierz folder, w którym ma być zainstalowany ${NAME}."
+    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_POLISH} "Wybierz folder, w którym 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} "Zakoñczono"
   LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Instalacja zakoñczona 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} "Zakoñczono"
     LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Odinstalowanie zakoñczone 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

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, Français etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_PORTUGUESEBR} "${MUI_NAME}"
   
   !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_PORTUGUESEBR} "Pressione Page Down para ver o restante da licença."
      LangString MUI_TEXT_LICENSE_TITLE ${LANG_PORTUGUESEBR} "Contrato de Licença"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_PORTUGUESEBR} "Favor verificar os termos da licença antes de instalar ${NAME}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_PORTUGUESEBR} "Se você aceitar todos os termos da licença, escolha Concordo para continuar. Você deve aceitar o contrato para instalar ${NAME}."
+     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_PORTUGUESEBR} "Favor verificar os termos da licença antes de instalar ${MUI_PRODUCT}."
+     LangString MUI_INNERTEXT_LICENSE ${LANG_PORTUGUESEBR} "Se você aceitar todos os termos da licença, 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ê não deseja instalar. Clique em Avançar para continuar."
     LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_PORTUGUESEBR} "Escolhendo Componentes"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha as características do ${NAME} que você deseja instalar."
+    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_PORTUGUESEBR} "Escolha as características do ${MUI_PRODUCT} que você deseja instalar."
     LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_PORTUGUESEBR} "Descrição"
     LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_PORTUGUESEBR} "Repouse o ponteiro do mouse em cima de um componente para ver sua descrição."
   !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 Instalação"
-    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 instalação foi finalizada com sucesso."
   
   !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_PORTUGUESEBR} "Você deseja realmente finalizar a instalação ${NAME}?"
+    LangString MUI_TEXT_ABORTWARNING ${LANG_PORTUGUESEBR} "Você deseja realmente finalizar a instalação ${MUI_PRODUCT}?"
   !endif
   
   !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalação de ${NAME} ${VERSION}"
+    LangString MUI_TEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalação 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 desinstalação foi finalizada com sucesso."
   !endif
   
   !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalação de ${NAME} ${VERSION}"
+    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_PORTUGUESEBR} "Instalação de ${MUI_PRODUCT} ${MUI_VERSION}"
   !endif
 
 !endif

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, Français 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

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, Fran鏰is 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

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 "Español" ;Name of the language in the language itself (English, Deutsch, Français etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_SPANISH} "${MUI_NAME}"
   
   !ifdef MUI_LICENSEPAGE
     LicenseText /LANG=${LANG_SPANISH} "Presione Avanzar Página 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 términos de la licencia antes de instalar ${NAME}."
-    LangString MUI_INNERTEXT_LICENSE ${LANG_SPANISH} "Si acepta todos los términos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${NAME}."
+    LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SPANISH} "Por favor revise los términos de la licencia antes de instalar ${MUI_PRODUCT}."
+    LangString MUI_INNERTEXT_LICENSE ${LANG_SPANISH} "Si acepta todos los términos 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} "Selección de componentes"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SPANISH} "Seleccione que características de ${NAME} desea instalar."
+    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SPANISH} "Seleccione que características de ${MUI_PRODUCT} desea instalar."
     LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_SPANISH} "Descripción"
     LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SPANISH} "Situe el ratón encima de un componente para ver su descripción."
   !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 instalación"
-    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 instalación se ha completado correctamente."
   
   !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_SPANISH} "¿Está seguro de que desea salir de la instalación de ${NAME}?"
+    LangString MUI_TEXT_ABORTWARNING ${LANG_SPANISH} "¿Está seguro de que desea salir de la instalación de ${MUI_PRODUCT}?"
   !endif
 
   !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalación de ${NAME} ${VERSION}"
+    LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalación 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 desinstalación se ha completado correctamente."
   !endif
   
   !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SPANISH} "Instalación de ${NAME} ${VERSION}"
+    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SPANISH} "Instalación de ${MUI_PRODUCT} ${MUI_VERSION}"
   !endif
     
 !endif

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)" ;以語言本身的方式，寫下語言名稱 (English, Deutsch, Fran蓷is etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_TRADCHINESE} "${MUI_NAME}"
   
   !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_TRADCHINESE} "若要看授權合約的其餘部分，請按 [PgDn] 往下捲動頁面。"
      LangString MUI_TEXT_LICENSE_TITLE ${LANG_TRADCHINESE} "授權合約"
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_TRADCHINESE} "在安裝 ${NAME} 之前，請檢閱授權條款。"
-     LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "如果你同意所有合約中的條款，選取 [我同意(A)] 繼續安裝。如果你選取 [取消(C)] ，安裝程式將會關閉。必須要接受授權合約才能安裝  ${NAME}。"
+     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_TRADCHINESE} "在安裝 ${MUI_PRODUCT} 之前，請檢閱授權條款。"
+     LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "如果你同意所有合約中的條款，選取 [我同意(A)] 繼續安裝。如果你選取 [取消(C)] ，安裝程式將會關閉。必須要接受授權合約才能安裝  ${MUI_PRODUCT}。"
   !endif
   
   !ifdef MUI_COMPONENTSPAGE
     ComponentText /LANG=${LANG_TRADCHINESE} "核取想要安裝的元件，並把不想安裝的元件解除核取。按 [下一步(N)] 繼續。"
     LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_TRADCHINESE} "選取元件"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_TRADCHINESE} "選取 ${NAME} 中你想要安裝的元件。"
+    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_TRADCHINESE} "選取 ${MUI_PRODUCT} 中你想要安裝的元件。"
     LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_TRADCHINESE} "描述"
     LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_TRADCHINESE} "移動你的滑鼠指標到元件之上，便可見到它的描述。"
   !endif
   
   !ifdef MUI_DIRECTORYPAGE
-    DirText /LANG=${LANG_TRADCHINESE} "安裝程式將在下列資料夾，安裝 ${NAME} 。$\r$\n$\r$\n要安裝到這個資料夾，按一下 [安裝(I)] 。要安裝在不同資料夾，按一下 [瀏覽(B)...] 並選擇其他資料夾。"
+    DirText /LANG=${LANG_TRADCHINESE} "安裝程式將在下列資料夾，安裝 ${MUI_PRODUCT} 。$\r$\n$\r$\n要安裝到這個資料夾，按一下 [安裝(I)] 。要安裝在不同資料夾，按一下 [瀏覽(B)...] 並選擇其他資料夾。"
     LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_TRADCHINESE} "選取安裝位置" 
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} "選取 ${NAME} 要安裝的資料夾位置。"
+    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} "選取 ${MUI_PRODUCT} 要安裝的資料夾位置。"
     LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_TRADCHINESE} "目的資料夾"
   !endif
   
   LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "正在安裝" 
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${NAME} 正在安裝，請等候。"
+  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} 正在安裝，請等候。"
   
   LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "完成"
   LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "安裝程式已成功地執行完成。"
   
   !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "你確定要離開 ${NAME} 安裝程式？"
+    LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "你確定要離開 ${MUI_PRODUCT} 安裝程式？"
   !endif
   
   !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} 安裝"
+    LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安裝"
   !endif
 
 
   ;UNINSTALLER
   
   !ifdef MUI_UNINSTALLER
-    UninstallText /LANG=${LANG_TRADCHINESE} "這將會從你的系統中解除安裝 ${NAME}。"
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_TRADCHINESE} "解除安裝 ${NAME}"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_TRADCHINESE} "從你的系統解除安裝 ${NAME} 。"
+    UninstallText /LANG=${LANG_TRADCHINESE} "這將會從你的系統中解除安裝 ${MUI_PRODUCT}。"
+    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_TRADCHINESE} "解除安裝 ${MUI_PRODUCT}"
+    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_TRADCHINESE} "從你的系統解除安裝 ${MUI_PRODUCT} 。"
   
     LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_TRADCHINESE} "正在解除安裝"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${NAME} 正在解除安裝，請等候。"
+    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} 正在解除安裝，請等候。"
   
     LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "完成"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${NAME} 已從你的系統解除安裝。"
+    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} 已從你的系統解除安裝。"
   !endif
   
   !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${NAME} ${VERSION} 安裝"
+    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安裝"
   !endif
     
 !endif

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, Français etc.)
 
   ;INSTALLER
+  Name /LANG=${LANG_UKRAINIAN} "${MUI_NAME}"
   
   !ifdef MUI_LICENSEPAGE
      LicenseText /LANG=${LANG_UKRAINIAN} "Íàòèñíiòü PageDown ùîá ïåðåãëÿíóòè çàëèøîê óãîäè."
      LangString MUI_TEXT_LICENSE_TITLE ${LANG_UKRAINIAN} "Ëiöåíçiéíà Óãîäà"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_UKRAINIAN} "Ïåðåãëÿíüòå óìîâè Óãîäè ïåðåä iíñòàëÿöiºþ ${NAME}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} "ßêùî Âè ïðèéìàºòå âñi óìîâè Óãîäè, íàòèñíiòü íà êíîïêó Çãîäåí. Âè ïîâèííi ïðèéíÿòè óìîâè Óãîäè äëÿ iíñòàëÿöi¿ ${NAME}."
+     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_UKRAINIAN} "Ďĺđĺăë˙íüňĺ óěîâč Óăîäč ďĺđĺä iíńňŕë˙öişţ ${MUI_PRODUCT}."
+     LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} "ßęůî Âč ďđčéěŕşňĺ âńi óěîâč Óăîäč, íŕňčńíiňü íŕ ęíîďęó Çăîäĺí. Âč ďîâčííi ďđčéí˙ňč óěîâč Óăîäč äë˙ iíńňŕë˙öiż ${MUI_PRODUCT}."
   !endif
   
   !ifdef MUI_COMPONENTSPAGE
     ComponentText /LANG=${LANG_UKRAINIAN} "Âiäìiòüòå òi êîìïîíåíòè, ÿêi Âè õî÷åòå âñòàíîâèòè, i çíiìiòü âiäìiòêó äëÿ òèõ, ÿê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} "Ïiäâåäiòü âàøó ìèøêó äî êîìïîíåíòà, ùîá ïîáà÷èòè éîãî îïèñ."
   !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

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.</p>
   has already been written for you!<br><br>
   The easiest way to use the Modern UI is to customize one of the <a href="#examples">example</a>
   scripts, but you   can also modify an existing script.<br><br>
-  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).<br><br>
-  <p class="text"><span class="subheader">1. Insert the header files</span></p>
+  <p class="subheader">1. Insert the header files</p>
   <pre class="margin">!include "${NSISDIR}\Contrib\Modern UI\System.nsh"</pre>
-  <p class="text"><span class="subheader">2. Define the name and version of your software</span></p>
-<pre class="margin">!define NAME "Test Software" ;Define your own software name here
-!define VERSION "1.0" ;Define your own software version here</pre>
-  <p class="text"><span class="subheader">3. Define which elements you are using</span><br><br>
-  The Modern UI should know which things it should insert. Use the following defines:</p>
+  <p class="subheader">2. Define the name and version of your software and the installer name</p>
+<pre class="margin">!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</pre>
+  <p class="subheader">3. Define which elements you are using</span></p>
+  <p class="text">The Modern UI should know which things it should insert. Use the following defines:</p>
 <pre class="margin">!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</pre>
-  <p class="text"><span class="subheader">4. Insert language files</span><br><br>
-  Insert the Modern UI language files for the languages you are using:</p>
-  <pre class="margin">!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"</pre>
-  <p class="text"><span class="subheader">5. Interface settings (optional)</span><br><br>
-  You can change the settings of the interface by usings defines:<br>
-  <pre class="margin">!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"</pre></p>
-  <p class="text">If you don't define a setting, the default will be used.<br><br>
-  The following settings are available: <i>(default)</i><br><br>
+!define MUI_INSTALLOPTIONS ;Use Install Options
+!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages</pre>
+  <p class="subheader">4. Interface settings (optional)</span></p>
+  <p class="text">You can change the settings of the interface by usings defines:</p>
+  <pre class="margin">!define MUI_UI "${NSISDIR}\Contrib\UIs\modern2.exe"</pre>
+  <p class="text">If you don't define a setting, the default will be used.</p>
+  <p class="text">The following settings are available: <i>(default)</i><br><br>
+  <span class="bold">MUI_UI</span> <i>(${NSISDIR}\Contrib\UIs\modern.exe)</i>
+   - The interface file with the dialog resources<br>
   <span class="bold">MUI_ICON</span> <i>(${NSISDIR}\Contrib\Icons\modern-install.ico)</i>
    - The icon of the instaleller<br>
   <span class="bold">MUI_UNICON</span> <i>(${NSISDIR}\Contrib\Icons\modern-uninstall.ico)</i>
@@ -152,8 +155,6 @@ with a custom user interface.</p>
   <span class="bold">MUI_CHECKBITMAP</span> <i>(${NSISDIR}\Contrib\Icons\modern.bmp)</i>
    - The bitmap with images for the checks of the
   component select treeview.<br>
-  <span class="bold">MUI_UI</span> <i>(${NSISDIR}\Contrib\UIs\modern.exe)</i>
-   - The interface file with the dialog resources<br>
   <span class="bold">MUI_FONT</span> <i>(Tahoma)</i> 
   - The font of the installer and uninstaller<br>
   <span class="bold">MUI_INSTALLCOLORS</span> <i>(/windows)</i>
@@ -161,9 +162,25 @@ with a custom user interface.</p>
   <span class="bold">MUI_PROGRESSBAR</span> <i>(smooth)</i>
    - The style of the progress bar ("colored" to use the MUI_INSTALLCOLORS or ""
   for a old-school windows look)</p>
-  <p class="text"><span class="subheader">6. Insert the MUI_SYSTEM macro</span></p>
+  <p class="subheader">5. Insert the MUI_SYSTEM macro</p>
   <pre class="margin">!insertmacro MUI_SYSTEM</pre>
-  <p class="text"><span class="subheader">7. Set the descriptions for the sections</span></p>
+  <p class="subheader">6. Insert language files</span></p>
+  <p class="text">Insert the Modern UI language files for the languages you are using:</p>
+  <pre class="margin">!include "${NSISDIR}\Contrib\Modern UI\Language files\English.nsh"</pre>
+  <p class="text">Note: The Modern UI language files load the NLF language files,
+  so you should not use LoadLanguageFile.</p>
+  <p class="subheader">7. Insert the MUI_SECTIONS_FINISHHEADER macro
+  <p class="text">You should insert the MUI_SECTIONS_FINISHHEADER after all the
+  section to display the finish-header.</p>
+<pre class="margin">
+!insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
+</pre>
+<p class="text">In the uninstaller, insert MUI_UNFINISHHEADER at the end of the
+Unintaller section.</p>
+<pre class="margin">
+!insertmacro MUI_UNFINISHHEADER
+</pre>
+  <p class="subheader">8. Set the descriptions for the sections</p>
 <pre class="margin">
 LangString DESC_SectionName1 ${LANG_ENGLISH} "Description of section 1."
 LangString DESC_SectionName2 ${LANG_ENGLISH} "Description of section 2."
@@ -186,18 +203,19 @@ SectionEnd
 <p class="header">Custom pages</p>
 <p class="text">Have a look at the <a href="..\InstallOptions\Install Options.html">
 Install Options documentation</a> for info about creating Install Options INI Files.</p>
+<p class="subheader">Custom Page Commands</p>
 <p class="text">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:</p>
+of the page functions and define MUI_CUSTOMPAGECOMMANDS before inserting the MUI_SYSTEM
+macro:</p>
 <pre class="margin">
-!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
 </pre>
+<p class="subheader">Call Install Options</p>
 <p class="text">You can call Install Options in [function name]:</p>
 <pre class="margin">
 LangString TEXT_IO_TITLE ${LANG_ENGLISH} "Install Options Page"
@@ -208,20 +226,14 @@ Function [function name]
   !insertmacro MUI_INSTALLOPTIONS_SHOW "ioFile.ini"
 FunctionEnd
 </pre>
-<p class="text">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:</p>
+<p class="subheader">Write title and abortwarning</p>
+<p class="text">Use these macro's in .onInit to write the page
+title and abortwarning to an INI File.</p>
 <pre class="margin">
 LangString TEXT_IO_PAGETITLE ${LANG_ENGLISH} "Page Title"
 
-!insertmacro MUI_INSTALLOPTIONS_WRITE "ioFile.ini" \
-"Settings" "Title" "$(MUI_TEXT_SETUPCAPTION): $(TEXT_IO_PAGETITLE)"
-</pre>
-<p class="text">If you are using abort warnings, you should also write the abort
-warning in the current language to an Install Options INI File:</p>
-<pre class="margin">
-!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)"
 </pre>
 <p class="header"><a name="examples">Examples</a></p>
 <p class="text">Basic: <a href="../../Examples/Modern UI/Basic.nsi">Basic.nsi</a><br>
@@ -229,15 +241,15 @@ warning in the current language to an Install Options INI File:</p>
   Cutom pages: <a href="../../Examples/Modern UI/InstallOptions.nsi">InstallOptions.nsi</a><br>
   </p>
 <p class="header">The interface</p>
-<p class="text"><span class="subheader">Modern.exe and modern2.exe</span><br><br>
-  There are two different versions of the interface.
+<p class="subheader">Modern.exe and modern2.exe</span></p>
+  <p class="text">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.</p>
-<p class="text"><span class="subheader">Customize the dialogs</span><br><br>
-To change elements on the dialogs, modify modern.exe or modern2.exe in the
-  Contrib\UIs directory using a resource editor such as
+<p class="subheader">Customize the dialogs</span></p>
+  <p class="text">To change elements on the dialogs, modify modern.exe or
+  modern2.exe in the Contrib\UIs directory using a resource editor such as
   <a href="http://www.users.on.net/johnson/resourcehacker/">Resource Hacker</a>.<br><br>
 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.</p>
 <p class="header">Version history</p>
 <ul>
-<li class="changelog">1.4 - November 3, 2002
+<li class="changelog">1.4 - November 4, 2002
   <ul>
     <li>Uses new NSIS Page command
-    <li>Macro system way smaller
-    <li>Advanced Macro System a lot easier
-    <li>Renamed some defines
+    <li>Macro system updates (smaller)
+    <li>Macro System a lot easier
+    <li>Modern UI Language Files load NLF language files
+    <li>Renamed macro's and defines
   </ul>
 </ul>  
 <p class="text"><a href="Changelog.txt">Complete version history</a></p>

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
 

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)

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
 

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