Modern UI 1.5

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1631 212acab6-be3b-0410-9dea-997c60f758d6

Contrib/Modern UI/Changelog.txt

@@ -1,8 +1,16 @@
 NSIS Modern User Interface - VERSION HISTORY
 
+1.5 - Novermber 8, 2002
+* New language file format
+* Language strings can be changed in the script without editing language files
+* Install Options macro's updated. MUI_INSTALLOPTIONS_DISPLAY is the standard macro now.
+  Use MUI_INSTALLOPTIONS_INITDIALOG and MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
+* Renamed macro's and defines
+* Some small fixes
+
 1.4 - November 4, 2002
 * Uses new NSIS Page command
-* Macro system updates (smaller)
+* Macro System updates (smaller)
 * Macro System a lot easier
 * Modern UI Language Files load NLF language files
 * Renamed macro's and defines

Contrib/Modern UI/Language files/Arabic.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Arabic (1025)
 ;By asdfuae@msn.com
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_ARABIC_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ARABIC"
 
-!define MUI_ARABIC_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Arabic" ;ÚŃČí
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Arabic.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "ÇáŃĚÇÁ ăŃÇĚÚÉ ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ ŢČá ĘäŐíČ ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "ĹÖŰŘ ÇÓÝá ÇáŐÝÍÉ áŢŃÂĺ ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "ĹÖŰŘ ăćÇÝŢ áĘßăáÉ ÇáĘäŐíČ Ĺä ćÇÝŢĘ Úáě ßÇăá ÇĘÝÇŢíÉţ ÇáĘŃÎíŐĄ áÇ ĘÓĘŘíÚ ÇáĘäŐíČ ČĎćä ÇáăćÇÝŢÉ Úáě ÇĘÝÇŢíÉţ ĘŃÎíŐ ${MUI_PRODUCT}."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "ĂÎĘŃ ÇáÚäÇŐŃ ááĘäŐíČ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "ĂÎĘŃ ÇáăíŇ ÇáăŃÇĎ ĘäŐíČĺÇ ăä ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "ĂÎĘŃ ÇáÚäÇŐŃ ÇáăŃÇĎ ĘäŐíČĺÇ ć ĂŇá ÇáÚäÇŐŃ ÇáŰíŃ ăŃŰćČÉĄ Ëă ĂÖŰŘ ÇáĘÇáí áĘßăáÉ ÇáĘäŐíČ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "ÇáćŐÝ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "ĂÔŃ ČÝĂŃß Úáě ĂÍĎ ÇáÚäÇŐŃ áăÚŃÝÉ ăíŇĘĺ Ăć ćŐÝĺ"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "ĂÎĘŃ ăćŢÚ ÇáĘäŐíČ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "ĂÎĘŃ ÇáăĚáĎ ÇáăŃÇĎ ĘäŐíČ Ýíĺ ÇáČŃäÇăĚ ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "ÓíĘă ĘäŐíČ ÇáČŃäÇăĚ ${MUI_PRODUCT} Ýí ÇáăĚáĎ ÇáĘÇáí$\r$\n$\r$\nĹÖŰŘ ĘäŐíČ áĘäŐíČĺ Ýí ĺĐÇ ÇáăĚáĎ. áĘäŐíČĺ Ýí ăĚáĎ ÂÎŃĄ ĹÖŰŘ ĘŐÝÍ ć ĂÎĘŃ ÇáăĚáĎ ÇáÂÎŃ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "ÇáăĚáĎ ÇáăÎŐŐ"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "íőäŐřöČţ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "ÇáŃĚÇÁ ÇáÇäĘŮÇŃ áÍíä ĘäŐíČ ${MUI_PRODUCT}."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "ÇáÍăĎááĺ Ęă ČäĚÇÍ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "ÇáÍăĎááĺ Ęă ČäĚÇÍ ĘäŐíČ ÇáČŃäÇăĚ"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "ĺá ĂäĘ ăĘĂßĎ ăä ĹŰáÇŢ ăäŐČ ${MUI_PRODUCT}ż"
 
-  !define MUI_ARABIC_LANGNAME "Arabic" ;ÚŃČí (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "ĘäŐíČ ${MUI_NAME}"
-
-  ;INSTALLER
-  Name /LANG=${LANG_ARABIC} "${MUI_NAME}"
-  
-  !ifdef MUI_LICENSEPAGE
-     LicenseText /LANG=${LANG_ARABIC} "ĹÖŰŘ ÇÓÝá ÇáŐÝÍÉ áŢŃÂĺ ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ"
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_ARABIC} "ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ARABIC} "ÇáŃĚÇÁ ăŃÇĚÚÉ ÇĘÝÇŢíÉţ ÇáĘŃÎíŐ ŢČá ĘäŐíČ ${MUI_PRODUCT}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_ARABIC} "ĹÖŰŘ ăćÇÝŢ áĘßăáÉ ÇáĘäŐíČ Ĺä ćÇÝŢĘ Úáě ßÇăá ÇĘÝÇŢíÉţ ÇáĘŃÎíŐĄ áÇ ĘÓĘŘíÚ ÇáĘäŐíČ ČĎćä ÇáăćÇÝŢÉ Úáě ÇĘÝÇŢíÉţ ĘŃÎíŐ ${MUI_PRODUCT}."
-  !endif
-  
-  !ifdef MUI_COMPONENTSPAGE
-    ComponentText /LANG=${LANG_ARABIC} "ĂÎĘŃ ÇáÚäÇŐŃ ÇáăŃÇĎ ĘäŐíČĺÇ ć ĂŇá ÇáÚäÇŐŃ ÇáŰíŃ ăŃŰćČÉĄ Ëă ĂÖŰŘ ÇáĘÇáí áĘßăáÉ ÇáĘäŐíČ"
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ARABIC} "ĂÎĘŃ ÇáÚäÇŐŃ ááĘäŐíČ"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ARABIC} "ĂÎĘŃ ÇáăíŇ ÇáăŃÇĎ ĘäŐíČĺÇ ăä ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ARABIC} "ÇáćŐÝ"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ARABIC} "ĂÔŃ ČÝĂŃß Úáě ĂÍĎ ÇáÚäÇŐŃ áăÚŃÝÉ ăíŇĘĺ Ăć ćŐÝĺ"
-  !endif
-  
-  !ifdef MUI_DIRECTORYPAGE
-    DirText /LANG=${LANG_ARABIC} "ÓíĘă ĘäŐíČ ÇáČŃäÇăĚ ${MUI_PRODUCT} Ýí ÇáăĚáĎ ÇáĘÇáí$\r$\n$\r$\nĹÖŰŘ ĘäŐíČ áĘäŐíČĺ Ýí ĺĐÇ ÇáăĚáĎ. áĘäŐíČĺ Ýí ăĚáĎ ÂÎŃĄ ĹÖŰŘ ĘŐÝÍ ć ĂÎĘŃ ÇáăĚáĎ ÇáÂÎŃ."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ARABIC} "ĂÎĘŃ ăćŢÚ ÇáĘäŐíČ"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ARABIC} "ĂÎĘŃ ÇáăĚáĎ ÇáăŃÇĎ ĘäŐíČ Ýíĺ ÇáČŃäÇăĚ ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ARABIC} "ÇáăĚáĎ ÇáăÎŐŐ"
-  !endif
-  
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ARABIC} "íőäŐřöČţ"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ARABIC} "ÇáŃĚÇÁ ÇáÇäĘŮÇŃ áÍíä ĘäŐíČ ${MUI_PRODUCT}."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_ARABIC} "ÇáÍăĎááĺ Ęă ČäĚÇÍ"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ARABIC} "ÇáÍăĎááĺ Ęă ČäĚÇÍ ĘäŐíČ ÇáČŃäÇăĚ"
-  
-  !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_ARABIC} "ĺá ĂäĘ ăĘĂßĎ ăä ĹŰáÇŢ ăäŐČ ${MUI_PRODUCT}ż"
-  !endif
-
-  !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_ARABIC} "ĘäŐíČ ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
   
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "ăŇíá ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "ĹŇÇáÉ ${MUI_PRODUCT} ăä äŮÇăß"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "ĺĐÇ ÓíŇíá ăä äŮÇăß ÇáČŃäÇăĚ ${MUI_PRODUCT}"
+    
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "ĹŇÇáÉ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "ÇáŃĚÇÁ ÇáÇäĘŮÇŃ áÍíä ĹŇÇáÉ ${MUI_PRODUCT}."
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "ĘăĘ"
-    UninstallText /LANG=${LANG_ARABIC} "ĺĐÇ ÓíŇíá ăä äŮÇăß ÇáČŃäÇăĚ ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "ĘăĘ ÇáĹŇÇáÉ ČäĚÇÍ ć ÇáÍăĎááĺ"
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ARABIC} "ăŇíá ${MUI_PRODUCT}"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ARABIC} "ĹŇÇáÉ ${MUI_PRODUCT} ăä äŮÇăß"
-  
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ARABIC} "ĹŇÇáÉ"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_ARABIC} "ÇáŃĚÇÁ ÇáÇäĘŮÇŃ áÍíä ĹŇÇáÉ ${MUI_PRODUCT}."
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ARABIC} "ĘăĘ"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ARABIC} "ĘăĘ ÇáĹŇÇáÉ ČäĚÇÍ ć ÇáÍăĎááĺ"
-  !endif
 
-  !ifdef MUI_UNINSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "ăŇíá ${MUI_NAME}"
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ARABIC} "ĘäŐíČ ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
 
-!endif
+!insertmacro MUI_LANGUAGEFILE_END
-
-!verbose 4

Contrib/Modern UI/Language files/Dutch.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Dutch (1043)
 ;By Joost Verburg
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_DUTCH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "DUTCH"
 
-!define MUI_DUTCH_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Nederlands" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Dutch.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licentie Overeenkomst"
-    LicenseText /LANG=${LANG_DUTCH} "Druk op Page Down om de rest van de overeenkomt te zien."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} installeerd."
-    LangString MUI_TEXT_LICENSE_TITLE ${LANG_DUTCH} "Licentie Overeenkomst"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Druk op Page Down om de rest van de overeenkomt te zien."
-    LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_DUTCH} "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} installeerd."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Als u de overeenkomt accepteert, kies Akkoord om verder te gaan. U moet met de overeenkomst acceptren om ${MUI_PRODUCT} te installeren."
-    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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Kies Onderdelen"
-    ComponentText /LANG=${LANG_DUTCH} "Selecteer de onderdelen die u wilt installleren en deselecteer de onderdelen die u niet wilt installeren. Klik Volgende om verder te gaan."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Kies de onderdelen die u wilt installeren."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_DUTCH} "Kies Onderdelen"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Selecteer de onderdelen die u wilt installleren en deselecteer de onderdelen die u niet wilt installeren. Klik Volgende om verder te gaan."
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_DUTCH} "Kies de onderdelen die u wilt installeren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschrijving"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_DUTCH} "Beschrijving"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Beweeg uw muis over een onderdeel om een beschrijving te zien."
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_DUTCH} "Beweeg uw muis over een onderdeel om een beschrijving te zien."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Kies Installatie Locatie"
-    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."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Kies de map waarin u ${MUI_PRODUCT} in wilt installeren."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_DUTCH} "Kies Installatie Locatie"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Setup zal ${MUI_PRODUCT} in de volgende map installeren.$\r$\n$\r$\nOm in een deze map te intalleren, klik Installeren. Om in een andere map te installeren, klik Bladeren en selecteer een andere map."
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_DUTCH} "Kies de map waarin u ${MUI_PRODUCT} in wilt installeren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Installatie Map"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_DUTCH} "Installatie Map"
-  !endif
  
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_DUTCH} "Bezig met installeren"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Bezig met installeren"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik geduld terwijl ${MUI_PRODUCT} wordt geinstalleerd."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Een ogenblik geduld terwijl ${MUI_PRODUCT} wordt geinstalleerd."
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_DUTCH} "Gereed"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Gereed"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "De installatie is succesvol verlopen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "De installatie is succesvol verlopen."
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_DUTCH} "Weet u zeker dat u ${MUI_PRODUCT} Setup wilt afsluiten?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Installatie"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Deïnstalleer ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Verwijder ${MUI_PRODUCT} van uw system."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Dit programma zal ${MUI_PRODUCT} verwijderen van uw systeem."
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Bezig met deïnstalleren"
-    UninstallText /LANG=${LANG_DUTCH} "Dit programma zal ${MUI_PRODUCT} verwijderen van uw systeem."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Een ogenblik gedult terwijl ${MUI_PRODUCT} van uw system wordt verwijderd."
-    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"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Gereed"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_DUTCH} "Een ogenblik gedult terwijl ${MUI_PRODUCT} van uw system wordt verwijderd."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${MUI_PRODUCT} is verwijderd van uw systeem."
   
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_DUTCH} "Gereed"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Deïnstallatie"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_DUTCH} "${MUI_PRODUCT} is verwijderd van uw systeem."
+   
-  !endif
+!insertmacro MUI_LANGUAGEFILE_END
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_DUTCH} "${MUI_PRODUCT} ${MUI_VERSION} Setup"
-  !endif
-    
-!endif
-
-!verbose 4

Contrib/Modern UI/Language files/English.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;version 2 - Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: English (1033)
 ;By Joost Verburg
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_ENGLISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ENGLISH"
 
-!define MUI_ENGLISH_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "English" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "License Agreement"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Please review the license terms before installing ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Press Page Down to see the rest of the agreement."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Choose Components"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Choose which features of ${MUI_PRODUCT} you want to install."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Description"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Hover your mouse over a component to see it's description."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Choose Install Location"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Choose the folder in which to install ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Setup will install ${MUI_PRODUCT} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Destination Folder"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installing"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being installed."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Finished"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Setup was completed successfully."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Are you sure you want to quit ${MUI_PRODUCT} Setup?"
 
-  !define MUI_ENGLISH_LANGNAME "English" ;Name of the language in the language itself (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Setup"
-
-  ;INSTALLER
-  Name /LANG=${LANG_ENGLISH} "${MUI_NAME}"
-  
-  !ifdef MUI_LICENSEPAGE
-     LicenseText /LANG=${LANG_ENGLISH} "Press Page Down to see the rest of the agreement."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_ENGLISH} "License Agreement"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ENGLISH} "Please review the license terms before installing ${MUI_PRODUCT}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_ENGLISH} "If you accept all the terms of the agreement, choose I Agree to continue. You must accept the agreement to install ${MUI_PRODUCT}."
-  !endif
-  
-  !ifdef MUI_COMPONENTSPAGE
-    ComponentText /LANG=${LANG_ENGLISH} "Check the components you want to install and uncheck the components you don't want to install. Click Next to continue."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ENGLISH} "Choose Components"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ENGLISH} "Choose which features of ${MUI_PRODUCT} you want to install."
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ENGLISH} "Description"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ENGLISH} "Hover your mouse over a component to see it's description."
-  !endif
-  
-  !ifdef MUI_DIRECTORYPAGE
-    DirText /LANG=${LANG_ENGLISH} "Setup will install ${MUI_PRODUCT} in the following folder.$\r$\n$\r$\nTo install in this folder, click Install. To install in a different folder, click Browse and select another folder."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ENGLISH} "Choose Install Location"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ENGLISH} "Choose the folder in which to install ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ENGLISH} "Destination Folder"
-  !endif
-  
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ENGLISH} "Installing"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ENGLISH} "Please wait while ${MUI_PRODUCT} is being installed."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_ENGLISH} "Finished"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Setup was completed successfully."
-  
-  !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_ENGLISH} "Are you sure you want to quit ${MUI_PRODUCT} Setup?"
-  !endif
-  
-  !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_NAME} Setup"
-  !endif
   
   
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Uninstall ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remove ${MUI_PRODUCT} from your system."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "This will uninstall ${MUI_PRODUCT} from your system."
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Uninstalling"
-    UninstallText /LANG=${LANG_ENGLISH} "This will uninstall ${MUI_PRODUCT} from your system."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being uninstalled."
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_ENGLISH} "Uninstall ${MUI_PRODUCT}"
+    
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_ENGLISH} "Remove ${MUI_PRODUCT} from your system."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Finished"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Uninstall was completed successfully."
   
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_ENGLISH} "Uninstalling"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Uninstall"
-    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"
+!insertmacro MUI_LANGUAGEFILE_END
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ENGLISH} "Uninstall was completed successfully."
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ENGLISH} "${MUI_NAME} Uninstall"
-  !endif
-  
-!endif
-
-!verbose 4

Contrib/Modern UI/Language files/French.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: French (1036)
 ;By Sébastien Delahaye <seb@delahaye.net>
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_FRENCH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "FRENCH"
 
-!define MUI_FRENCH_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Français" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\French.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licence utilisateur"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Veuillez examiner les termes de la licence avant d'installer ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Appuyez sur Page Down pour lire le reste de la licence utilisateur."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Si vous acceptez tous les termes de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur pour installer ${MUI_PRODUCT}."  
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Choisissez les composants"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Choisissez les composants que vous souhaitez installer."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Cochez les composants que vous souhaitez installer, et décochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Description"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Passer le curseur de votre souris sur un composant pour voir sa description."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Choisissez le dossier d'installation"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Choisissez le dossier dans lequel installer ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Le programme d'installation va maintenant installer ${MUI_PRODUCT} dans le dossier suivant.$\r$\n$\r$\nPour l'installer dans ce dossier, cliquez sur Installer. Pour l'installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Dossier d'installation"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installation en cours"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'être installé sur votre ordinateur."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Installation terminée"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "L'installation s'est terminée avec succès."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Êtes-vous sûr de vouloir quitter l'installation de ${MUI_PRODUCT} ?"
 
-  !define MUI_FRENCH_LANGNAME "Français" ;Name of the language in the language itself (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Installation de ${MUI_NAME}"
-
-  ;INSTALLER
-  Name /LANG=${LANG_FRENCH} "${MUI_NAME}"
-  
-  !ifdef MUI_LICENSEPAGE
-     LicenseText /LANG=${LANG_FRENCH} "Appuyez sur Page Down pour lire le reste de la licence utilisateur."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_FRENCH} "Licence utilisateur"  
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_FRENCH} "Veuillez examiner les termes de la licence avant d'installer ${MUI_PRODUCT}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_FRENCH} "Si vous acceptez tous les termes de la licence utilisateur, cliquez sur J'accepte pour continuer. Vous devez accepter la licence utilisateur pour installer ${MUI_PRODUCT}."  
-  !endif
-  
-  !ifdef MUI_COMPONENTSPAGE
-    ComponentText /LANG=${LANG_FRENCH} "Cochez les composants que vous souhaitez installer, et décochez ceux que vous ne voulez pas installer. Cliquez sur Suivant pour continuer."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_FRENCH} "Choisissez les composants"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_FRENCH} "Choisissez les composants que vous souhaitez installer."
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_FRENCH} "Description"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_FRENCH} "Passer le curseur de votre souris sur un composant pour voir sa description."
-  !endif
-  
-  !ifdef MUI_DIRECTORYPAGE
-    DirText /LANG=${LANG_FRENCH} "Le programme d'installation va maintenant installer ${MUI_PRODUCT} dans le dossier suivant.$\r$\n$\r$\nPour l'installer dans ce dossier, cliquez sur Installer. Pour l'installer dans un autre dossier, cliquez sur Parcourir et choisissez un autre dossier."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_FRENCH} "Choisissez le dossier d'installation"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_FRENCH} "Choisissez le dossier dans lequel installer ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_FRENCH} "Dossier d'installation"
-  !endif
-  
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_FRENCH} "Installation en cours"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_FRENCH} "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'être installé sur votre ordinateur."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_FRENCH} "Installation 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 ${MUI_PRODUCT} ?"
-  !endif
-
-  !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_FRENCH} "Installation de ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
   
   
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Désinstaller ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Supprimer ${MUI_PRODUCT} de votre ordinateur."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Ce programme va supprimer ${MUI_PRODUCT} 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 ${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 ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Désinstallation en cours"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Veuillez patienter pendant que ${MUI_PRODUCT} est en train d'être supprimé de votre ordinateur."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Désinstallation terminée"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La désinstallation s'est terminée avec succès."
+   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Désinstallation de ${MUI_NAME}"
+    
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/German.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: German (1031)
 ;By L.King
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_GERMAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "GERMAN"
 
-!define MUI_GERMAN_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Deutsch" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\German.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
 
-  !define MUI_GERMAN_LANGNAME "Deutsch" ;Name of the language in the language itself (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Lizenzabkommen"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Drücken Sie die Bild-nach-unten Taste um den Rest des Abkommens zu sehen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Falls Sie alle Bedingungen des Abkommens akzeptieren, klicken Sie auf Annehmen. Sie müssen die Lizenzvereinbarungen anerkennen um ${MUI_PRODUCT} zu installieren."
 
-  ;INSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Wählen Sie die Komponenten aus"
-  Name /LANG=${LANG_GERMAN} "${MUI_NAME}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Wählen Sie die Komponenten aus, die Sie installieren möchten."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Wählen Sie die Komponenten aus, die Sie installieren möchten und wählen Sie diejenigen ab, die Sie nicht installieren wollen. Klicken Sie auf Weiter um fortzufahren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Beschreibung"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Bewegen Sie den Mauszeiger über eine Komponente um ihre Beschreibung zu sehen."
 
-  !ifdef MUI_LICENSEPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Wählen Sie das Zielverzeichnis aus"
-     LicenseText /LANG=${LANG_GERMAN} "Drücken Sie die Bild-nach-unten Taste um den Rest des Abkommens zu sehen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Wählen Sie das Verzeichnis aus, in dem ${MUI_PRODUCT} installiert werden soll."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_GERMAN} "Lizenzabkommen"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "${MUI_PRODUCT} wird in das unten angegebene Verzeichnis installiert.$\r$\n$\r$\nKlicken Sie auf Installieren um fortzufahren. Falls Sie in ein anderes Verzeichnis installieren möchten, klicken Sie auf Durchsuchen und wählen Sie ein anderes Verzeichnis aus."
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GERMAN} "Bitte lesen Sie die Lizenzbedingungen durch, bevor Sie mit der Installation fortfahren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Zielverzeichnis"
-     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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installiere..."
-    ComponentText /LANG=${LANG_GERMAN} "Wählen Sie die Komponenten aus, die Sie installieren möchten und wählen Sie diejenigen ab, die Sie nicht installieren wollen. Klicken Sie auf Weiter um fortzufahren."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, während ${MUI_PRODUCT} installiert wird."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GERMAN} "Wählen Sie die Komponenten aus"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GERMAN} "Wählen Sie die Komponenten aus, die Sie installieren möchten."
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_GERMAN} "Beschreibung"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GERMAN} "Bewegen Sie den Mauszeiger über eine Komponente um ihre Beschreibung zu sehen."
-  !endif
 
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Fertig"
-    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."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Die Installation wurde erfolgreich abgeschlossen."
-    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 ${MUI_PRODUCT} installiert werden soll."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GERMAN} "Zielverzeichnis"
-  !endif
 
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GERMAN} "Installiere..."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Sind Sie sicher, dass Sie die Installation von ${MUI_PRODUCT} abbrechen wollen?"
-  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 ${MUI_PRODUCT} abbrechen wollen?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Installation"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation"
+
-  !endif
+
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Deinstallation von ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Entferne ${MUI_PRODUCT} von ihrem System."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Deinstalliert ${MUI_PRODUCT} von ihrem System."
   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Deinstalliere..."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Bitte warten Sie, während ${MUI_PRODUCT} entfernt wird."
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Fertig"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Die Deinstallation von ${MUI_PRODUCT} wurde erfolgreich abgeschlossen."
-  !ifdef MUI_UNINSTALLER
-    UninstallText /LANG=${LANG_GERMAN} "Deinstalliert ${MUI_PRODUCT} von ihrem System."
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GERMAN} "Deinstallation von ${MUI_PRODUCT}"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GERMAN} "Entferne ${MUI_PRODUCT} von ihrem System."
-
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_GERMAN} "Deinstalliere..."
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GERMAN} "Bitte warten Sie, 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 ${MUI_PRODUCT} wurde erfolgreich abgeschlossen."
-  !endif
   
-  !ifdef MUI_UNINSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Deinstallation"
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GERMAN} "${MUI_PRODUCT} ${MUI_VERSION} Installation"
-  !endif
 
-!endif
+!insertmacro MUI_LANGUAGEFILE_END
-
-!verbose 4

Contrib/Modern UI/Language files/Greek.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Greek (1032)
 ;By Makidis N. Mike
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_GREEK_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "GREEK"
 
-!define MUI_GREEK_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Greek" ;Ελληνικά
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Greek.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Συμφωνία ’δειας Χρήσης"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Ελέγξτε τους όρους της άδειας χρήσης πριν εγκαταστήσετε το '${MUI_PRODUCT}'."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Πατήστε το Page Down για να δείτε το υπόλοιπο της άδειας χρήσης."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Για να συνεχιστεί η εγκατάσταση πρέπει να αποδεχθείτε όλους τους όρους της άδειας χρήσης. Αν τους αποδέχεστε, κάντε κλικ στο Συμφωνώ, αλλιώς κάντε κλικ στο ’κυρο για να τερματιστεί η εγκατάσταση του '${MUI_PRODUCT}'."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Επιλογή Στοιχείων"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Επιλέξτε τα στοιχεία που θέλετε να εγκαταστήσετε."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Επιλέξτε τα μέρη που θέλετε να εγκαταστήσετε και αποεπιλέξτε αυτά που δε θέλετε να εγκαταστήσετε. Κάντε κλικ στο Επόμενο για να συνεχίσετε."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Περιγραφή"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Περάστε το δείκτη του ποντικιού πάνω από ένα στοιχείο για να δείτε την περιγραφή του."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Επιλογή Θέσης Εγκατάστασης"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Επιλέξτε το φάκελο μέσα στον οποίο θα εγκατασταθεί το '${MUI_PRODUCT}'."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Το πρόγραμμα εγκατάστασης θα εγκαταστήσει το '${MUI_PRODUCT}' στον παρακάτω φάκελο.$\r$\n$\r$\nΓια να το εγκαταστήσετε στο φάκελο αυτό, κάντε κλικ στο Εγκατάσταση. Για να το εγκαταστήσετε σε έναν άλλο φάκελο, κάντε κλικ στο Αναζήτηση και επιλέξτε κάποιον άλλο φάκελο."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Φάκελος εγκατάστασης"
 
-  !define MUI_GREEK_LANGNAME "Greek" ;Ελληνικά (English, Deutsch, Franηais etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Εγκατάσταση Σε Εξέλιξη"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Παρακαλώ περιμένετε όσο το '${MUI_PRODUCT}' εγκαθίσταται."
-  ;INSTALLER
-  Name /LANG=${LANG_GREEK} "${MUI_NAME}"
   
-  !ifdef MUI_LICENSEPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Ολοκληρώθηκε"
-    LicenseText /LANG=${LANG_GREEK} "Πατήστε το Page Down για να δείτε το υπόλοιπο της άδειας χρήσης."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Η εγκατάσταση ολοκληρώθηκε επιτυχώς."
-    LangString MUI_TEXT_LICENSE_TITLE ${LANG_GREEK} "Συμφωνία ’δειας Χρήσης"  
-    LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_GREEK} "Ελέγξτε τους όρους της άδειας χρήσης πριν εγκαταστήσετε το '${MUI_PRODUCT}'."
-    LangString MUI_INNERTEXT_LICENSE ${LANG_GREEK} "Για να συνεχιστεί η εγκατάσταση πρέπει να αποδεχθείτε όλους τους όρους της άδειας χρήσης. Αν τους αποδέχεστε, κάντε κλικ στο Συμφωνώ, αλλιώς κάντε κλικ στο ’κυρο για να τερματιστεί η εγκατάσταση του '${MUI_PRODUCT}'."
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Είστε σίγουροι πως θέλετε να τερματίσετε την εγκατάσταση του '${MUI_PRODUCT}';"
-    ComponentText /LANG=${LANG_GREEK} "Επιλέξτε τα μέρη που θέλετε να εγκαταστήσετε και αποεπιλέξτε αυτά που δε θέλετε να εγκαταστήσετε. Κάντε κλικ στο Επόμενο για να συνεχίσετε."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_GREEK} "Επιλογή Στοιχείων"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_GREEK} "Επιλέξτε τα στοιχεία που θέλετε να εγκαταστήσετε."
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_GREEK} "Περιγραφή"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_GREEK} "Περάστε το δείκτη του ποντικιού πάνω από ένα στοιχείο για να δείτε την περιγραφή του."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Εγκατάσταση του '${MUI_NAME}'"
-    DirText /LANG=${LANG_GREEK} "Το πρόγραμμα εγκατάστασης θα εγκαταστήσει το '${MUI_PRODUCT}' στον παρακάτω φάκελο.$\r$\n$\r$\nΓια να το εγκαταστήσετε στο φάκελο αυτό, κάντε κλικ στο Εγκατάσταση. Για να το εγκαταστήσετε σε έναν άλλο φάκελο, κάντε κλικ στο Αναζήτηση και επιλέξτε κάποιον άλλο φάκελο."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_GREEK} "Επιλογή Θέσης Εγκατάστασης"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_GREEK} "Επιλέξτε το φάκελο μέσα στον οποίο θα εγκατασταθεί το '${MUI_PRODUCT}'."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_GREEK} "Φάκελος εγκατάστασης"
-  !endif
-
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_GREEK} "Εγκατάσταση Σε Εξέλιξη"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_GREEK} "Παρακαλώ περιμένετε όσο το '${MUI_PRODUCT}' εγκαθίσταται."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_GREEK} "Ολοκληρώθηκε"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_GREEK} "Η εγκατάσταση ολοκληρώθηκε επιτυχώς."
-  
-  !ifdef MUI_ABORTWARNING
-    LangString MUI_TEXT_ABORTWARNING ${LANG_GREEK} "Είστε σίγουροι πως θέλετε να τερματίσετε την εγκατάσταση του '${MUI_PRODUCT}';"
-  !endif
-  
-  !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_GREEK} "Απεγκατάσταση του '${MUI_PRODUCT} ${MUI_VERSION}'"
-  !endif
   
   
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Απεγκατάσταση του '${MUI_PRODUCT}'"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Αφαίρεση του '${MUI_PRODUCT}' από τον υπολογιστή σας."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Αυτό το πρόγραμμα θα απεγκαταστήσει το '${MUI_PRODUCT}' από τον υπολογιστή σας."
+    
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Απεγκατάσταση Σε Εξέλιξη"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Παρακαλώ περιμένετε όσο το '${MUI_PRODUCT}' απεγκαθίσταται."
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Ολοκληρώθηκε"
-    UninstallText /LANG=${LANG_GREEK} "Αυτό το πρόγραμμα θα απεγκαταστήσει το '${MUI_PRODUCT}' από τον υπολογιστή σας."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Η απεγκατάσταση ολοκληρώθηκε επιτυχώς."
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_GREEK} "Απεγκατάσταση του '${MUI_PRODUCT}'"
+   
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_GREEK} "Αφαίρεση του '${MUI_PRODUCT}' από τον υπολογιστή σας."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Απεγκατάσταση του '${MUI_NAME}'"
   
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_GREEK} "Απεγκατάσταση Σε Εξέλιξη"
+!insertmacro MUI_LANGUAGEFILE_END
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_GREEK} "Παρακαλώ περιμένετε όσο το '${MUI_PRODUCT}' απεγκαθίσταται."
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_GREEK} "Ολοκληρώθηκε"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_GREEK} "Η απεγκατάσταση ολοκληρώθηκε επιτυχώς."
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_GREEK} "Απεγκατάσταση του '${MUI_PRODUCT} ${MUI_VERSION}'"
-  !endif
-
-!endif
-
-!verbose 4

Contrib/Modern UI/Language files/Italian.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Italian (1040)
 ;By SANFACE Software <sanface@sanface.com>
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_ITALIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "ITALIAN"
 
-!define MUI_ITALIAN_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Italiano" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Italian.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Licenza d'uso"  
-     LicenseText /LANG=${LANG_ITALIAN} "Seleziona Page Down per vedere il resto della licenza d'uso."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Per favore esamina i termini della licenza d'uso prima di installare ${MUI_PRODUCT}."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_ITALIAN} "Licenza d'uso"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Seleziona Page Down per vedere il resto della licenza d'uso."
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_ITALIAN} "Per favore esamina i termini della licenza d'uso prima di installare ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Se accetti i termini della licenza d'uso seleziona Accetto per continuare. Devi accettare i termini della licenza d'uso per installare ${MUI_PRODUCT}."  
-     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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Seleziona i componenti"
-    ComponentText /LANG=${LANG_ITALIAN} "Seleziona i componenti che vuoi installare e deseleziona i componenti che non vuoi installare. Per continuare clicca su Sucessivo."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Seleziona i componenti che vuoi installare."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_ITALIAN} "Seleziona i componenti"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Seleziona i componenti che vuoi installare e deseleziona i componenti che non vuoi installare. Per continuare clicca su Sucessivo."
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_ITALIAN} "Seleziona i componenti che vuoi installare."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrizione"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_ITALIAN} "Descrizione"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Per leggere una descrizione più approfondita dei componenti posiziona il puntatore del mouse sul componente di tuo interesse."
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_ITALIAN} "Per leggere una descrizione più approfondita dei componenti posiziona il puntatore del mouse sul componente di tuo interesse."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Scegli la cartella di installazione"
-    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."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Scegli la cartella dove installare ${MUI_PRODUCT}."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_ITALIAN} "Scegli la cartella di installazione"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Il programma d'installazione installerà ${MUI_PRODUCT} nella cartella selezionata.$\r$\n$\r$\nPer installare nella cartella selezionata clicca su Installa. Per installare in una cartella differente, clicca su Sfoglia e seleziona un'altra cartella."
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_ITALIAN} "Scegli la cartella dove installare ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Cartella d'installazione"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_ITALIAN} "Cartella d'installazione"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_ITALIAN} "Installazione in corso"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installazione in corso"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_ITALIAN} "Per favore attendi che ${MUI_PRODUCT} sia completamente installato."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Per favore attendi che ${MUI_PRODUCT} sia completamente installato."
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_ITALIAN} "Installazione completata"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Installazione completata"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "L'installazione è stata completata con successo."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "L'installazione è stata completata con successo."
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Sei sicuro di voler terminare l'installazione di ${MUI_PRODUCT} ?"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_ITALIAN} "Sei sicuro di voler terminare l'installazione di ${MUI_PRODUCT} ?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Installazione di ${MUI_NAME}"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Disinstalla ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Rimuovi ${MUI_PRODUCT} dal vostro computer."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Questo programma rimuoverà ${MUI_PRODUCT} dal vosto 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 ${MUI_PRODUCT} sia completamente disinstallato."
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_ITALIAN} "Disinstallazione completata"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_ITALIAN} "La disinstallazione è stata completata con successo."
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_ITALIAN} "Installazione di ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Disinstallazione in corso"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Per favore attendi che ${MUI_PRODUCT} sia completamente disinstallato."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Disinstallazione completata"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La disinstallazione è stata completata con successo."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Rimozione di ${MUI_NAME}"
+   
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/Japanese.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;version 2 - Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Japanese (1041)
 ;By Dnanako
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_JAPANESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "JAPANESE"
 
-!define MUI_JAPANESE_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Japanese" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Japanese.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "ライセンス契約書"  
-     LicenseText /LANG=${LANG_JAPANESE} "[Page Down]を押して契約書をすべてお読みください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE " ${MUI_PRODUCT} をインストールする前に、ライセンス条件を確認してください。"
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_JAPANESE} "ライセンス契約書"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "[Page Down]を押して契約書をすべてお読みください。"
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_JAPANESE} " ${MUI_PRODUCT} をインストールする前に、ライセンス条件を確認してください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "${MUI_PRODUCT} をインストールするには、契約書に同意する必要があります。$\r$\n契約書のすべての条件に同意するならば、[同意する] を選んでインストールを続けてください。"
-     LangString MUI_INNERTEXT_LICENSE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールするには、契約書に同意する必要があります。$\r$\n契約書のすべての条件に同意するならば、[同意する] を選んでインストールを続けてください。"
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "コンポーネントを選んでください。"
-    ComponentText /LANG=${LANG_JAPANESE} "コンポーネントをインストールするにはチェックし、不要ならば、チェックを外してください。 $\r$\n続けるには[次へ]を押してください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "${MUI_PRODUCT} のインストール オプションを選んでください。"
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_JAPANESE} "コンポーネントを選んでください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "コンポーネントをインストールするにはチェックし、不要ならば、チェックを外してください。 $\r$\n続けるには[次へ]を押してください。"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} のインストール オプションを選んでください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "説明"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_JAPANESE} "説明"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "コンポーネント上にマウス カーソルを移動すると、ここの説明が表示されます。"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_JAPANESE} "コンポーネント上にマウス カーソルを移動すると、ここの説明が表示されます。"
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "インストール先を選んでください。"
-    DirText /LANG=${LANG_JAPANESE} "${MUI_PRODUCT} を以下のフォルダにインストールします。$\r$\n$\r$\nこのフォルダにインストールするには、[インストール]を押してください。$\r$\n異なったフォルダにインストールするには、[参照]を押して、別のフォルダを選択してください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "${MUI_PRODUCT} をインストールするフォルダを選んでください。"
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_JAPANESE} "インストール先を選んでください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "${MUI_PRODUCT} を以下のフォルダにインストールします。$\r$\n$\r$\nこのフォルダにインストールするには、[インストール]を押してください。$\r$\n異なったフォルダにインストールするには、[参照]を押して、別のフォルダを選択してください。"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールするフォルダを選んでください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "インストール先 フォルダ"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_JAPANESE} "インストール先 フォルダ"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_JAPANESE} "インストール"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "インストール"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_JAPANESE} "${MUI_PRODUCT} をインストールしています。しばらくお待ちください。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} をインストールしています。しばらくお待ちください。"
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_JAPANESE} "完了"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "完了"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_JAPANESE} "インストールに成功しました。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "インストールに成功しました。"
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "${MUI_PRODUCT} のインストールを中止しますか？"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_JAPANESE} "${MUI_PRODUCT} のインストールを中止しますか？"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} セットアップ"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_JAPANESE} "${MUI_PRODUCT} ${MUI_VERSION} セットアップ"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "${MUI_PRODUCT} のアンインストール。"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "${MUI_PRODUCT} をこのシステムからアンインストールします。"
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "${MUI_PRODUCT} をこのシステムからアンインストールします。"
-    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} "${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} "${MUI_PRODUCT} ${MUI_VERSION} セットアップ"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "アンインストール"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} をアンインストールしています。しばらくお待ちください。"
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "完了"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "アンインストールに成功しました。"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} アンインストール"
+   
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/Polish.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Polish (1045)
 ;By Piotr Murawski & Rafa³ Lampe; www.lomsel.prv.pl mailto:ppiter@skrzynka.pl
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_POLISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "POLISH"
 
-!define MUI_POLISH_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Polski" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Polish.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Umowa licencyjna"  
-    LicenseText /LANG=${LANG_POLISH} "Proszê naduœ klawisz Page Down, aby zobaczyæ resztê umowy."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Proszê przejrzy warunki licencji przed instalacj¹ ${MUI_PRODUCT}."
-    LangString MUI_TEXT_LICENSE_TITLE ${LANG_POLISH} "Umowa licencyjna"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Proszê naduœ klawisz Page Down, aby zobaczyæ resztê umowy."
-    LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_POLISH} "Proszê przejrzy warunki licencji przed instalacj¹ ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Je¿eli akceptujesz wszystkie warunki umnowy wybierz Zgadzam siê, aby kontynuowaæ. Musisz zaakceptowaæ warunki umowy, aby zainstalowaæ ${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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Wybór komponentów"
-    ComponentText /LANG=${LANG_POLISH} "Zaznacz komponenty, które chcesz zainstalowaæ oraz odznacz komponenty, które nie maj¹ byæ zainstalowane. Kliknij przycisk Dalej, aby kontynuowaæ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Wybierz komponenty ${MUI_PRODUCT}, które chcesz zainstalowaæ."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_POLISH} "Wybór komponentów"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Zaznacz komponenty, które chcesz zainstalowaæ oraz odznacz komponenty, które nie maj¹ byæ zainstalowane. Kliknij przycisk Dalej, aby kontynuowaæ."
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_POLISH} "Wybierz komponenty ${MUI_PRODUCT}, które chcesz zainstalowaæ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Opis"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_POLISH} "Opis"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Przesuñ kursor myszy nad komponent, aby zobaczyæ jego opis."
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_POLISH} "Przesuñ kursor myszy nad komponent, aby zobaczyæ jego opis."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Wybór miejsca instalacji"
-    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."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Wybierz folder, w którym ma byæ zainstalowany ${MUI_PRODUCT}."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_POLISH} "Wybór miejsca instalacji"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "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_SUBTITLE ${LANG_POLISH} "Wybierz folder, w którym ma byæ zainstalowany ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Folder docelowy"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_POLISH} "Folder docelowy"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_POLISH} "Instaluje"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instaluje"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_POLISH} "Proszê czekaæ, kiedy ${MUI_PRODUCT} jest instalowany."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Proszê czekaæ, kiedy ${MUI_PRODUCT} jest instalowany."
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_POLISH} "Zakoñczono"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Zakoñczono"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_POLISH} "Instalacja zakoñczona powodzeniem."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Instalacja zakoñczona powodzeniem."
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Czy na pewno chcesz wyjϾ z instalatora ${MUI_PRODUCT}?"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_POLISH} "Czy na pewno chcesz wyjϾ z instalatora ${MUI_PRODUCT}?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Instalator"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_POLISH} "${MUI_PRODUCT} ${MUI_VERSION} Instalator"
-  !endif
   
   
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Odinstaluj ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Usuñ ${MUI_PRODUCT} z twojego systemu."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Deinstalator odinstaluje ${MUI_PRODUCT} 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 ${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} "${MUI_PRODUCT} ${MUI_VERSION} Instalator"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Odinstalowuje"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Proszê czekaæ, kiedy ${MUI_PRODUCT} jest odinstalowywany."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Zakoñczono"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Odinstalowanie zakoñczone powodzeniem."
+   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Odinstaluj"
+    
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/PortugueseBR.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: 'Portuguese (Brasil)' (1046)
 ;By Layout do Brasil www.layoutdobrasil.com
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_PORTUGUESEBR_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "PORTUGUESEBR"
 
-!define MUI_PORTUGUESEBR_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Portuguese (Brasil)" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\PortugueseBR.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Contrato de Licença"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Favor verificar os termos da licença antes de instalar ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Pressione Page Down para ver o restante da licença."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Se você aceitar todos os termos da licença, escolha Concordo para continuar. Você deve aceitar o contrato para instalar ${MUI_PRODUCT}."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Escolhendo Componentes"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Escolha as características do ${MUI_PRODUCT} que você deseja instalar."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Marque os componentes que você deseja instalar e desmarque os componentes que você não deseja instalar. Clique em Avançar para continuar."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descrição"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Repouse o ponteiro do mouse em cima de um componente para ver sua descrição."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Escolhendo o Local da Instalação"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Escolha a pasta na qual deseja instalar ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "O instalador instalará o ${MUI_PRODUCT} na pasta abaixo.$\r$\n$\r$\nPara prosseguir e instalar nesta pasta, clique em Instalar. Para instalar em uma pasta diferente, clique Procurar... e selecione outra pasta."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Pasta de destino"
 
-  !define MUI_PORTUGUESEBR_LANGNAME "Portuguese (Brasil)" ;Name of the language in the language itself (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instalando"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Por favor, aguarde enquanto ${MUI_PRODUCT} está sendo instalado."
-  ;INSTALLER
-  Name /LANG=${LANG_PORTUGUESEBR} "${MUI_NAME}"
   
-  !ifdef MUI_LICENSEPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Finalizando"
-     LicenseText /LANG=${LANG_PORTUGUESEBR} "Pressione Page Down para ver o restante da licença."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "A instalação foi finalizada com sucesso."
-     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 ${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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Você deseja realmente finalizar a instalação ${MUI_PRODUCT}?"
-    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 ${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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Instalação de ${MUI_NAME}"
-    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 ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_PORTUGUESEBR} "Pasta de destino"
-  !endif
-
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_PORTUGUESEBR} "Instalando"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_PORTUGUESEBR} "Por favor, aguarde enquanto ${MUI_PRODUCT} está sendo instalado."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_PORTUGUESEBR} "Finalizando"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_PORTUGUESEBR} "A instalação foi finalizada com sucesso."
-  
-  !ifdef MUI_ABORTWARNING
-    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 ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remover ${MUI_PRODUCT} de seu sistema."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Isto desinstalará ${MUI_PRODUCT} de seu sistema."
+    
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor, aguarde enquanto ${MUI_PRODUCT} está sendo desinstalado."
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Finalizando"
-    UninstallText /LANG=${LANG_PORTUGUESEBR} "Isto desinstalará ${MUI_PRODUCT} de seu sistema."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "A desinstalação foi finalizada com sucesso."
-    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"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Desinstalação de ${MUI_NAME}"
-    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 ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
 
-!endif
+!insertmacro MUI_LANGUAGEFILE_END
-
-!verbose 4

Contrib/Modern UI/Language files/Russian.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Russian (1049)
 ;By Nik Medved (brainsucker). Fixed by Scam.
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_RUSSIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "RUSSIAN"
 
-!define MUI_RUSSIAN_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Russian" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Russian.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Ëčöĺíçčîííîĺ Ńîăëŕřĺíčĺ"  
-     LicenseText /LANG=${LANG_RUSSIAN} "Íàæìèòå PageDown, ÷òîáû ïðîñìîòðåòü ëèöåíçèîííîå ñîãëàøåíèÿ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Ďđîńěîňđčňĺ óńëîâč˙ Ńîăëŕřĺíč˙ ďĺđĺä číńňŕë˙öčĺé ${MUI_PRODUCT}."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_RUSSIAN} "Ëèöåíçèîííîå Ñîãëàøåíèå"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Íŕćěčňĺ PageDown, ÷ňîáű ďđîńěîňđĺňü ëčöĺíçčîííîĺ ńîăëŕřĺíč˙."
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_RUSSIAN} "Ïðîñìîòðèòå óñëîâèÿ Ñîãëàøåíèÿ ïåðåä èíñòàëÿöèåé ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Ĺńëč Âű ďđčíčěŕĺňĺ âńĺ óńëîâč˙ Ńîăëŕřĺíč˙, íŕćěčňĺ íŕ ęíîďęó Ńîăëŕńĺí. Âű äîëćíű ďđčí˙ňü óńëîâč˙ Ńîăëŕřĺíč˙ äë˙ číńňŕë˙öčč ${MUI_PRODUCT}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_RUSSIAN} "Åñëè Âû ïðèíèìàåòå âñå óñëîâèÿ Ñîãëàøåíèÿ, íàæìèòå íà êíîïêó Ñîãëàñåí. Âû äîëæíû ïðèíÿòü óñëîâèÿ Ñîãëàøåíèÿ äëÿ èíñòàëÿöèè ${MUI_PRODUCT}."
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Âűáĺđčňĺ ęîěďîíĺíňű"
-    ComponentText /LANG=${LANG_RUSSIAN} "Îòìåòüòå òå êîìïîíåíòû, êîòîðûå Âû õîòèòå óñòàíîâèòü, è ñíèìèòå îòìåòêó äëÿ òåõ, êîòîðûå Âû óñòàíàâëèâàòü íå õîòèòå. Íàæìèòå Äàëåå äëÿ ïðîäîëæåíèÿ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Âűáĺđčňĺ ęŕęčĺ âîçěîćíîńňč ${MUI_PRODUCT} Âű őîňčňĺ óńňŕíîâčňü."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_RUSSIAN} "Âûáåðèòå êîìïîíåíòû"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Îňěĺňüňĺ ňĺ ęîěďîíĺíňű, ęîňîđűĺ Âű őîňčňĺ óńňŕíîâčňü, č ńíčěčňĺ îňěĺňęó äë˙ ňĺő, ęîňîđűĺ Âű óńňŕíŕâëčâŕňü íĺ őîňčňĺ. Íŕćěčňĺ Äŕëĺĺ äë˙ ďđîäîëćĺíč˙."
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_RUSSIAN} "Âûáåðèòå êàêèå âîçìîæíîñòè ${MUI_PRODUCT} Âû õîòèòå óñòàíîâèòü."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îďčńŕíčĺ"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_RUSSIAN} "Îïèñàíèå"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ďîäâĺäčňĺ ęóđńîđ ěűřč ę ęîěďîíĺíňó, ÷ňîáű óâčäĺňü ĺăî îďčńŕíčĺ."
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_RUSSIAN} "Ïîäâåäèòå êóðñîð ìûøè ê êîìïîíåíòó, ÷òîáû óâèäåòü åãî îïèñàíèå."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Âűáĺđčňĺ ěĺńňî óńňŕíîâęč"
-    DirText /LANG=${LANG_RUSSIAN} "Èíñòàëÿòîð óñòàíîâèò ${MUI_PRODUCT} â ñëåäóùèé êàòàëîã.$\r$\n$\r$\n×òîáû óñòàíîâèòü â ýòîò êàòàëîã, íàæìèòå Óñòàíîâèòü. ×òîáû óñòàíîâèòü â äðóãîé êàòàëîã, íàæìèòå Îáçîð è âûáåðèòå äðóãîé êàòàëîã."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Âűáĺđčňĺ ęŕňŕëîă äë˙ óńňŕíîâęč ${MUI_PRODUCT}."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_RUSSIAN} "Âûáåðèòå ìåñòî óñòàíîâêè"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Číńňŕë˙ňîđ óńňŕíîâčň ${MUI_PRODUCT} â ńëĺäóůčé ęŕňŕëîă.$\r$\n$\r$\n×ňîáű óńňŕíîâčňü â ýňîň ęŕňŕëîă, íŕćěčňĺ Óńňŕíîâčňü. ×ňîáű óńňŕíîâčňü â äđóăîé ęŕňŕëîă, íŕćěčňĺ Îáçîđ č âűáĺđčňĺ äđóăîé ęŕňŕëîă."
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_RUSSIAN} "Âûáåðèòå êàòàëîã äëÿ óñòàíîâêè ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Ęŕňŕëîă Íŕçíŕ÷ĺíč˙"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_RUSSIAN} "Êàòàëîã Íàçíà÷åíèÿ"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_RUSSIAN} "Èäåò óñòàíîâêà"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Čäĺň óńňŕíîâęŕ"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_RUSSIAN} "Ïîæàëóéñòà ïîäîæäèòå, ïîêà èäåò óñòàíîâêà ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Ďîćŕëóéńňŕ ďîäîćäčňĺ, ďîęŕ čäĺň óńňŕíîâęŕ ${MUI_PRODUCT}."
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_RUSSIAN} "Çàâåðøåíà"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Çŕâĺđřĺíŕ"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} "Óñòàíîâêà óñïåøíî çàâåðøåíà."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Óńňŕíîâęŕ óńďĺříî çŕâĺđřĺíŕ."
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Âű óâĺđĺíű, ÷ňî őîňčňĺ îňěĺíčňü óńňŕíîâęó ${MUI_PRODUCT}?"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_RUSSIAN} "Âû óâåðåíû, ÷òî õîòèòå îòìåíèòü óñòàíîâêó ${MUI_PRODUCT}?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Óńňŕíîâęŕ"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} Óñòàíîâêà"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Óäŕëĺíčĺ ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Óäŕëĺíčĺ ${MUI_PRODUCT} ń Âŕřĺăî ęîěďüţňĺđŕ."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Ýňŕ ďđîăđŕěěŕ óäŕëčň ${MUI_PRODUCT} ń âŕřĺăî ęîěďüţňĺđŕ."
-    UninstallText /LANG=${LANG_RUSSIAN} "Ýòà ïðîãðàììà óäàëèò ${MUI_PRODUCT} ñ âàøåãî êîìïüþòåðà."
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_RUSSIAN} "Óäàëåíèå ${MUI_PRODUCT}"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_RUSSIAN} "Óäàëåíèå ${MUI_PRODUCT} ñ Âàøåãî êîìïüþòåðà."
-  
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_RUSSIAN} "Óäàëåíèå"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_RUSSIAN} "Ïîæàëóéñòà ïîäîæäèòå, ïîêà óäàëÿåòñÿ ${MUI_PRODUCT}."
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_RUSSIAN} "Çàâåðøåíî"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_RUSSIAN} "Óäàëåíèå óñïåøíî çàâåðøåíî."
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_RUSSIAN} "${MUI_PRODUCT} ${MUI_VERSION} Óñòàíîâêà"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Óäŕëĺíčĺ"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Ďîćŕëóéńňŕ ďîäîćäčňĺ, ďîęŕ óäŕë˙ĺňń˙ ${MUI_PRODUCT}."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Çŕâĺđřĺíî"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Óäŕëĺíčĺ óńďĺříî çŕâĺđřĺíî."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Óäŕëĺíčĺ"
+   
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/SimpChinese.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: 'Chinese (Simplified)' (2052)
 ;By Kii Ali <kiiali@cpatch.org>
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_SIMPCHINESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "SIMPCHINESE"
 
-!define MUI_SIMPCHINESE_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Chinese (Simplified)" ;以语言本身的方式，写下语言名称
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\SimpChinese.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !define MUI_SIMPCHINESE_LANGNAME "Chinese (Simplified)" ;以语言本身的方式，写下语言名称 (English, Deutsch, Fran鏰is etc.)
-
-  ;INSTALLER
-  Name /LANG=${LANG_SIMPCHINESE} "${MUI_NAME}"
   
-  !ifdef MUI_LICENSEPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "授权合约"
-     LicenseText /LANG=${LANG_SIMPCHINESE} "若要看授权合约的其余部分，请按 [PgDn] 往下卷动页面。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "在安装 ${MUI_PRODUCT} 之前，请检阅授权条款。"
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_SIMPCHINESE} "授权合约"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "若要看授权合约的其余部分，请按 [PgDn] 往下卷动页面。"
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_SIMPCHINESE} "在安装 ${MUI_PRODUCT} 之前，请检阅授权条款。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "如果你同意所有合约中的条款，选定 [我同意(A)] 继续安装。如果你选定 [取消(C)] ，安装程序将会关闭。必须要接受授权合约才能安装  ${MUI_PRODUCT}。"
-     LangString MUI_INNERTEXT_LICENSE ${LANG_SIMPCHINESE} "如果你同意所有合约中的条款，选定 [我同意(A)] 继续安装。如果你选定 [取消(C)] ，安装程序将会关闭。必须要接受授权合约才能安装  ${MUI_PRODUCT}。"
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "选定组件"
-    ComponentText /LANG=${LANG_SIMPCHINESE} "核取想要安装的组件，并把不想安装的组件解除核取。按 [下一步(N)] 继续。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "选定 ${MUI_PRODUCT} 中你想要安装的组件。"
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_SIMPCHINESE} "选定组件"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "核取想要安装的组件，并把不想安装的组件解除核取。按 [下一步(N)] 继续。"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_SIMPCHINESE} "选定 ${MUI_PRODUCT} 中你想要安装的组件。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "描述"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_SIMPCHINESE} "描述"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "移动你的鼠标指标到组件之上，便可见到它的描述。"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_SIMPCHINESE} "移动你的鼠标指标到组件之上，便可见到它的描述。"
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "选定安装位置" 
-    DirText /LANG=${LANG_SIMPCHINESE} "安装程序将在下列文件夹，安装 ${MUI_PRODUCT} 。$\r$\n$\r$\n要安装到这个文件夹，单击 [安装(I)] 。要安装在不同文件夹，单击 [浏览(B)...] 并选择其他文件夹。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "选定 ${MUI_PRODUCT} 要安装的文件夹位置。"
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_SIMPCHINESE} "选定安装位置" 
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "安装程序将在下列文件夹，安装 ${MUI_PRODUCT} 。$\r$\n$\r$\n要安装到这个文件夹，单击 [安装(I)] 。要安装在不同文件夹，单击 [浏览(B)...] 并选择其他文件夹。"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_SIMPCHINESE} "选定 ${MUI_PRODUCT} 要安装的文件夹位置。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "目标文件夹"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SIMPCHINESE} "目标文件夹"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SIMPCHINESE} "正在安装" 
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "正在安装" 
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SIMPCHINESE} "${MUI_PRODUCT} 正在安装，请等候。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} 正在安装，请等候。"
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_SIMPCHINESE} "完成"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "完成"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SIMPCHINESE} "安装程序已成功地运行完成。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "安装程序已成功地运行完成。"
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "你确实要退出 ${MUI_PRODUCT} 安装程序？"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_SIMPCHINESE} "你确实要退出 ${MUI_PRODUCT} 安装程序？"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} 安装"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安装"
-  !endif
   
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "解除安装 ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "从你的系统解除安装 ${MUI_PRODUCT} 。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "这将会从你的系统中解除安装 ${MUI_PRODUCT}。"
+    
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "正在解除安装"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} 正在解除安装，请等候。"
   
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "完成"
-    UninstallText /LANG=${LANG_SIMPCHINESE} "这将会从你的系统中解除安装 ${MUI_PRODUCT}。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${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} "正在解除安装"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_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} "${MUI_PRODUCT} 已从你的系统解除安装。"
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_SIMPCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安装"
-  !endif
 
-!endif
+!insertmacro MUI_LANGUAGEFILE_END
-
-!verbose 4

Contrib/Modern UI/Language files/Spanish.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Spanish (1034)
 ;By MoNKi
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_SPANISH_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "SPANISH"
 
-!define MUI_SPANISH_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Español" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Spanish.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Acuerdo de licencia"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Por favor revise los términos de la licencia antes de instalar ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Presione Avanzar Página para ver el resto del acuerdo."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "Si acepta todos los términos del acuerdo, seleccione Acepto para continuar. Debe aceptar el acuerdo para instalar ${MUI_PRODUCT}."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Selección de componentes"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Seleccione que características de ${MUI_PRODUCT} desea instalar."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Marque los componentes que desea instalar y desmarque los componentes que no desea instalar. Presione Siguiente para continuar."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Descripción"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Situe el ratón encima de un componente para ver su descripción."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Elegir lugar de instalación"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Elija el directorio en el que instalar ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Se instalará ${MUI_PRODUCT} en el siguiente directorio.$\r$\n$\r$\nPara instalar en este directorio, presione Instalar. Para instalar en un directorio distinto, presione Examinar y seleccione otro directorio."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Directorio de destino"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Instalando"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Por favor espere mientas ${MUI_PRODUCT} se instala."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Completado"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "La instalación se ha completado correctamente."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "¿Está seguro de que desea salir de la instalación de ${MUI_PRODUCT}?"
 
-  !define MUI_SPANISH_LANGNAME "Español" ;Name of the language in the language itself (English, Deutsch, Français etc.)
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "Instalación de ${MUI_NAME}"
-
-  ;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 ${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 ${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á ${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 ${MUI_PRODUCT}."
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_SPANISH} "Directorio de destino"
-  !endif
-  
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_SPANISH} "Instalando"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_SPANISH} "Por favor espere mientas ${MUI_PRODUCT} se instala."
-  
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_SPANISH} "Completado"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_SPANISH} "La 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 ${MUI_PRODUCT}?"
-  !endif
-
-  !ifdef MUI_INSTALLOPTIONS
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_SPANISH} "Instalación de ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
 
   
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Elimina ${MUI_PRODUCT} de su sistema."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Esto desinstalará ${MUI_PRODUCT} 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 ${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 ${MUI_PRODUCT} ${MUI_VERSION}"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Desinstalando"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Por favor espere mientras ${MUI_PRODUCT} se desinstala."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Completado"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "La desinstalación se ha completado correctamente."
+   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "Desinstalación de ${MUI_NAME}"
+    
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/TradChinese.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: 'Chinese (Traditional)' (1028)
 ;By Kii Ali <kiiali@cpatch.org>
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_TRADCHINESE_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "TRADCHINESE"
 
-!define MUI_TRADCHINESE_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Chinese (Traditional)" ;以語言本身的方式，寫下語言名稱
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\TradChinese.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !define MUI_TRADCHINESE_LANGNAME "Chinese (Traditional)" ;以語言本身的方式，寫下語言名稱 (English, Deutsch, Fran蓷is etc.)
-
-  ;INSTALLER
-  Name /LANG=${LANG_TRADCHINESE} "${MUI_NAME}"
   
-  !ifdef MUI_LICENSEPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "授權合約"
-     LicenseText /LANG=${LANG_TRADCHINESE} "若要看授權合約的其餘部分，請按 [PgDn] 往下捲動頁面。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "在安裝 ${MUI_PRODUCT} 之前，請檢閱授權條款。"
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_TRADCHINESE} "授權合約"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "若要看授權合約的其餘部分，請按 [PgDn] 往下捲動頁面。"
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_TRADCHINESE} "在安裝 ${MUI_PRODUCT} 之前，請檢閱授權條款。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "如果你同意所有合約中的條款，選取 [我同意(A)] 繼續安裝。如果你選取 [取消(C)] ，安裝程式將會關閉。必須要接受授權合約才能安裝  ${MUI_PRODUCT}。"
-     LangString MUI_INNERTEXT_LICENSE ${LANG_TRADCHINESE} "如果你同意所有合約中的條款，選取 [我同意(A)] 繼續安裝。如果你選取 [取消(C)] ，安裝程式將會關閉。必須要接受授權合約才能安裝  ${MUI_PRODUCT}。"
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "選取元件"
-    ComponentText /LANG=${LANG_TRADCHINESE} "核取想要安裝的元件，並把不想安裝的元件解除核取。按 [下一步(N)] 繼續。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "選取 ${MUI_PRODUCT} 中你想要安裝的元件。"
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_TRADCHINESE} "選取元件"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "核取想要安裝的元件，並把不想安裝的元件解除核取。按 [下一步(N)] 繼續。"
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_TRADCHINESE} "選取 ${MUI_PRODUCT} 中你想要安裝的元件。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "描述"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_TRADCHINESE} "描述"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "移動你的滑鼠指標到元件之上，便可見到它的描述。"
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_TRADCHINESE} "移動你的滑鼠指標到元件之上，便可見到它的描述。"
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "選取安裝位置" 
-    DirText /LANG=${LANG_TRADCHINESE} "安裝程式將在下列資料夾，安裝 ${MUI_PRODUCT} 。$\r$\n$\r$\n要安裝到這個資料夾，按一下 [安裝(I)] 。要安裝在不同資料夾，按一下 [瀏覽(B)...] 並選擇其他資料夾。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "選取 ${MUI_PRODUCT} 要安裝的資料夾位置。"
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_TRADCHINESE} "選取安裝位置" 
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "安裝程式將在下列資料夾，安裝 ${MUI_PRODUCT} 。$\r$\n$\r$\n要安裝到這個資料夾，按一下 [安裝(I)] 。要安裝在不同資料夾，按一下 [瀏覽(B)...] 並選擇其他資料夾。"
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_TRADCHINESE} "選取 ${MUI_PRODUCT} 要安裝的資料夾位置。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "目的資料夾"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_TRADCHINESE} "目的資料夾"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_TRADCHINESE} "正在安裝" 
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "正在安裝" 
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} 正在安裝，請等候。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "${MUI_PRODUCT} 正在安裝，請等候。"
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "完成"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "完成"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "安裝程式已成功地執行完成。"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "安裝程式已成功地執行完成。"
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "你確定要離開 ${MUI_PRODUCT} 安裝程式？"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_TRADCHINESE} "你確定要離開 ${MUI_PRODUCT} 安裝程式？"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} 安裝"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安裝"
-  !endif
 
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "解除安裝 ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "從你的系統解除安裝 ${MUI_PRODUCT} 。"
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "這將會從你的系統中解除安裝 ${MUI_PRODUCT}。"
-    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} "${MUI_PRODUCT} 正在解除安裝，請等候。"
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_TRADCHINESE} "完成"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_TRADCHINESE} "${MUI_PRODUCT} 已從你的系統解除安裝。"
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_TRADCHINESE} "${MUI_PRODUCT} ${MUI_VERSION} 安裝"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "正在解除安裝"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "${MUI_PRODUCT} 正在解除安裝，請等候。"
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "完成"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "${MUI_PRODUCT} 已從你的系統解除安裝。"
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} 解除安裝"
+   
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Language files/Ukrainian.nsh

@@ -1,78 +1,54 @@
 ;NSIS Modern User Interface - Language File
-;Compatible with Modern UI 1.4
+;Compatible with Modern UI 1.5
 
 ;Language: Ukrainian (1058)
 ;By Yuri Holubow, Our Soft (http://www.ns.lviv.ua)
 
 ;--------------------------------
-!verbose 3
 
-!ifndef MUI_UKRAINIAN_USED
+!insertmacro MUI_LANGUAGEFILE_BEGIN "UKRAINIAN"
 
-!define MUI_UKRAINIAN_USED
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Ukrainian" ;Name of the language in the language itself
 
-  LoadLanguageFile "${NSISDIR}\Contrib\Language files\Ukrainian.nlf"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !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
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Ëiöĺíçiéíŕ Óăîäŕ"  
-     LicenseText /LANG=${LANG_UKRAINIAN} "Íàòèñíiòü PageDown ùîá ïåðåãëÿíóòè çàëèøîê óãîäè."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_SUBTITLE "Ďĺđĺăë˙íüňĺ óěîâč Óăîäč ďĺđĺä iíńňŕë˙öişţ ${MUI_PRODUCT}."
-     LangString MUI_TEXT_LICENSE_TITLE ${LANG_UKRAINIAN} "Ëiöåíçiéíà Óãîäà"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_TOP "Íŕňčńíiňü PageDown ůîá ďĺđĺăë˙íóňč çŕëčřîę óăîäč."
-     LangString MUI_TEXT_LICENSE_SUBTITLE ${LANG_UKRAINIAN} "Ïåðåãëÿíüòå óìîâè Óãîäè ïåðåä iíñòàëÿöiºþ ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_LICENSE_BOTTOM "ßęůî Âč ďđčéěŕşňĺ âńi óěîâč Óăîäč, íŕňčńíiňü íŕ ęíîďęó Çăîäĺí. Âč ďîâčííi ďđčéí˙ňč óěîâč Óăîäč äë˙ iíńňŕë˙öiż ${MUI_PRODUCT}."
-     LangString MUI_INNERTEXT_LICENSE ${LANG_UKRAINIAN} "ßêùî Âè ïðèéìàºòå âñi óìîâè Óãîäè, íàòèñíiòü íà êíîïêó Çãîäåí. Âè ïîâèííi ïðèéíÿòè óìîâè Óãîäè äëÿ iíñòàëÿöi¿ ${MUI_PRODUCT}."
-  !endif
   
-  !ifdef MUI_COMPONENTSPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Âčáĺđiňü ęîěďîíĺíňč"
-    ComponentText /LANG=${LANG_UKRAINIAN} "Âiäìiòüòå òi êîìïîíåíòè, ÿêi Âè õî÷åòå âñòàíîâèòè, i çíiìiòü âiäìiòêó äëÿ òèõ, ÿêi Âè âñòàíîâëþâàòè íå áàæàºòå. Íàòèñíiòü Äàëi äëÿ ïðîäîâæåííÿ."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Âčáĺđiňü ˙ęi ěîëčâîńňi ${MUI_PRODUCT} Âč őî÷ĺňĺ âńňŕíîâčňč."
-    LangString MUI_TEXT_COMPONENTS_TITLE ${LANG_UKRAINIAN} "Âèáåðiòü êîìïîíåíòè"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS "Âiäěiňüňĺ ňi ęîěďîíĺíňč, ˙ęi Âč őî÷ĺňĺ âńňŕíîâčňč, i çíiěiňü âiäěiňęó äë˙ ňčő, ˙ęi Âč âńňŕíîâëţâŕňč íĺ áŕćŕşňĺ. Íŕňčńíiňü Äŕëi äë˙ ďđîäîâćĺíí˙."
-    LangString MUI_TEXT_COMPONENTS_SUBTITLE ${LANG_UKRAINIAN} "Âèáåðiòü ÿêi ìîëèâîñòi ${MUI_PRODUCT} Âè õî÷åòå âñòàíîâèòè."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE "Îďčń"
-    LangString MUI_INNERTEXT_DESCRIPTION_TITLE ${LANG_UKRAINIAN} "Îïèñ"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO "Ďiäâĺäiňü âŕřó ěčřęó äî ęîěďîíĺíňŕ, ůîá ďîáŕ÷čňč éîăî îďčń."
-    LangString MUI_INNERTEXT_DESCRIPTION_INFO ${LANG_UKRAINIAN} "Ïiäâåäiòü âàøó ìèøêó äî êîìïîíåíòà, ùîá ïîáà÷èòè éîãî îïèñ."
-  !endif
   
-  !ifdef MUI_DIRECTORYPAGE
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Âčáĺđiňü ěińöĺ óńňŕíîâęč"
-    DirText /LANG=${LANG_UKRAINIAN} "Iíñòàëÿòîð âñòàíîâèòü ${MUI_PRODUCT} ó íàñòóïíèé êàòàëîã.$\r$\n$\r$\nÙîá âñòàíîâèòè â öåé êàòàëîã, íàòèñíiòü Âñòàíîâèòè. Ùîá âñòàíîâèòè â iíøèé êàòàëîã íàòèñíiòü Âèáðàòè i Âèáåðiòü iíøèé êàòàëîã."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Âčáĺđiňü ęŕňŕëîă äë˙ óńňŕíîâęč ${MUI_PRODUCT}."
-    LangString MUI_TEXT_DIRSELECT_TITLE ${LANG_UKRAINIAN} "Âèáåðiòü ìiñöå óñòàíîâêè"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_TOP "Iíńňŕë˙ňîđ âńňŕíîâčňü ${MUI_PRODUCT} ó íŕńňóďíčé ęŕňŕëîă.$\r$\n$\r$\nŮîá âńňŕíîâčňč â öĺé ęŕňŕëîă, íŕňčńíiňü Âńňŕíîâčňč. Ůîá âńňŕíîâčňč â iířčé ęŕňŕëîă íŕňčńíiňü Âčáđŕňč i Âčáĺđiňü iířčé ęŕňŕëîă."
-    LangString MUI_TEXT_DIRSELECT_SUBTITLE ${LANG_UKRAINIAN} "Âèáåðiòü êàòàëîã äëÿ óñòàíîâêè ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Ęŕňŕëîă Ďđčçíŕ÷ĺíí˙"
-    LangString MUI_INNERTEXT_DESTINATIONFOLDER ${LANG_UKRAINIAN} "Êàòàëîã Ïðèçíà÷åííÿ"
-  !endif
   
-  LangString MUI_TEXT_INSTALLING_TITLE ${LANG_UKRAINIAN} "Éäå óñòàíîâêà"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Éäĺ óńňŕíîâęŕ"
-  LangString MUI_TEXT_INSTALLING_SUBTITLE ${LANG_UKRAINIAN} "Áóäü-ëàñêà çà÷åêàéòå, äîêè éäå óñòàíîâêà ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Áóäü-ëŕńęŕ çŕ÷ĺęŕéňĺ, äîęč éäĺ óńňŕíîâęŕ ${MUI_PRODUCT}."
   
-  LangString MUI_TEXT_FINISHED_TITLE ${LANG_UKRAINIAN} "Çàâåðøåíà"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_TITLE "Çŕâĺđřĺíŕ"
-  LangString MUI_TEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} "Óñòàíîâêà óñïiøíî çàâåðøåíà."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISHED_SUBTITLE "Óńňŕíîâęŕ óńďiříî çŕâĺđřĺíŕ."
   
-  !ifdef MUI_ABORTWARNING
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Âč âďĺâíĺííi ůî őî÷ĺňĺ ďîęčíóňč óńňŕíîâęó ${MUI_PRODUCT}?"
-    LangString MUI_TEXT_ABORTWARNING ${LANG_UKRAINIAN} "Âè âïåâíåííi ùî õî÷åòå ïîêèíóòè óñòàíîâêó ${MUI_PRODUCT}?"
-  !endif
   
-  !ifdef MUI_INSTALLOPTIONS
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WINDOWTITLE "${MUI_NAME} Óńňŕíîâęŕ"
-    LangString MUI_TEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} Óñòàíîâêà"
-  !endif
   
 
-  ;UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Âčäŕëĺíí˙ ${MUI_PRODUCT}"
-  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Âčäŕëĺíí˙ ${MUI_PRODUCT} ç âŕřîăî ęîěď'ţňĺđŕ."
-  !ifdef MUI_UNINSTALLER
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Ö˙ ďđîăđŕěŕ âčäŕëčňü ${MUI_PRODUCT} ç âŕřîăî ęîěď'ţňĺđŕ."
-    UninstallText /LANG=${LANG_UKRAINIAN} "Öÿ ïðîãðàìà âèäàëèòü ${MUI_PRODUCT} ç âàøîãî êîìï'þòåðà."
-    LangString un.MUI_UNTEXT_INTRO_TITLE ${LANG_UKRAINIAN} "Âèäàëåííÿ ${MUI_PRODUCT}"
-    LangString un.MUI_UNTEXT_INTRO_SUBTITLE ${LANG_UKRAINIAN} "Âèäàëåííÿ ${MUI_PRODUCT} ç âàøîãî êîìï'þòåðà."
-  
-    LangString un.MUI_UNTEXT_UNINSTALLING_TITLE ${LANG_UKRAINIAN} "Âèäàëåííÿ"
-    LangString un.MUI_UNTEXT_UNINSTALLING_SUBTITLE ${LANG_UKRAINIAN} "Áóäü-ëàñêà çà÷åêàéòå äîêè ïðîõîäèòü âèäàëåííÿ ${MUI_PRODUCT}."
-  
-    LangString un.MUI_UNTEXT_FINISHED_TITLE ${LANG_UKRAINIAN} "Çàâåðøåíî"
-    LangString un.MUI_UNTEXT_FINISHED_SUBTITLE ${LANG_UKRAINIAN} "Âèäàëåííÿ óñïiøíî çàâåðøåíî."
-  !endif
-  
-  !ifdef MUI_UNINSTALLOPTIONS
-    LangString un.MUI_UNTEXT_SETUPCAPTION ${LANG_UKRAINIAN} "${MUI_VERSION} Óñòàíîâêà"
-  !endif
     
-!endif
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Âčäŕëĺíí˙"
-
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Áóäü-ëŕńęŕ çŕ÷ĺęŕéňĺ äîęč ďđîőîäčňü âčäŕëĺíí˙ ${MUI_PRODUCT}."
-!verbose 4
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_TITLE "Çŕâĺđřĺíî"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_FINISHED_SUBTITLE "Âčäŕëĺíí˙ óńďiříî çŕâĺđřĺíî."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_WINDOWTITLE "${MUI_NAME} Âčäŕëĺíí˙"
+   
+!insertmacro MUI_LANGUAGEFILE_END

Contrib/Modern UI/Readme.html

@@ -126,28 +126,38 @@ with a custom user interface.</p>
   Modern UI (in order).<br><br>
   <p class="subheader">1. Include the header file</p>
   <pre class="margin">!include "${NSISDIR}\Contrib\Modern UI\System.nsh"</pre>
-  <p class="subheader">2. Define the name and version of your software and the installer name</p>
+  <p class="subheader">2. Define the name and version of your software</p>
-<pre class="margin">!define MUI_PRODUCT "Test Software" ;Define your own software name here
+<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
-
+</pre>
-!define MUI_NAME "${NAME} ${VERSION}" ;Installer name</pre>
-<p class="text">Note: If you want to use a different name for different languages, undef these
-defines and define them again before you insert a language file.</p>
   <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_ABORTWARNING ;Abort warning messagebox
+!define MUI_INSTALLOPTIONS ;Install Options
+!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
+
 !define MUI_UNINSTALLER ;Uninstaller
-!define MUI_ABORTWARNING ;Abort warning messabox
+!define MUI_UNINSTALLOPTIONS ;Install Options in Uninstaller
-!define MUI_INSTALLOPTIONS ;Use Install Options
+!define MUI_CUSTOMPAGECOMMANDS ;Use customized uninstaller pages
-!define MUI_CUSTOMPAGECOMMANDS ;Use customized pages</pre>
+</pre>
   <p class="subheader">4. Insert language files</span></p>
   <p class="text">Insert the Modern UI language files for the languages you are using:</p>
   <pre class="margin">!insertmacro MUI_LANGUAGE "English"</pre>
-  <p class="text">Note: The Modern UI language files load the NLF language files,
+  <p class="text">The Modern UI language files load the NLF language files,
   so you should not use LoadLanguageFile.</p>
+  <p class="text">You don't need to edit the language files if you want to customize
+  some strings. Use defines before you insert the language file:</p>
+  <pre class="margin">
+!define MUI_INNERTEXT_LICENSE_TOP "Text on the top of the license dialog"
+!insertmacro MUI_LANGUAGE "English"
+</pre>
+  <p class="text">Have a look at the language files for a complete list of all the
+  names.
   <p class="subheader">5. Define 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>
@@ -174,9 +184,7 @@ defines and define them again before you insert a language file.</p>
   <p class="subheader">7. Insert the MUI_SECTIONS_FINISHHEADER macro
   <p class="text">You should insert the MUI_SECTIONS_FINISHHEADER after all the
   sections to display the finish-header.</p>
-<pre class="margin">
+<pre class="margin">!insertmacro MUI_SECTIONS_FINISHHEADER</pre>
-!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">
@@ -195,7 +203,7 @@ LangString DESC_SectionName2 ${LANG_ENGLISH} "Description of section 2."
   !insertmacro MUI_DESCRIPTION_TEXT ${SectionName2} $(DESC_SectionName2)
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_END
 </pre>
-<p class="text">Note: Always set a name for a section:</p>
+<p class="text">Always set a name for a section:</p>
 <pre class="margin">
 Section "Section Name 1" SectionName1
  ...
@@ -219,8 +227,14 @@ of the page functions.</p>
 Page custom [function name] ;A custom page
 !insertmacro MUI_PAGECOMMAND_INSTFILES
 </pre>
-<p class="text">Note: If you are using custom Page commands, define MUI_CUSTOMPAGECOMMANDS
+<p class="text">This is also possible the uninstaller:</p>
-before inserting the MUI_SYSTEM macro.</p>
+<pre class="margin">
+!insertmacro MUI_UNPAGECOMMAND_CONFIRM
+UninstPage custom [function name] ;A custom page
+!insertmacro MUI_UNPAGECOMMAND_INSTFILES
+</pre>
+<p class="text">Don't forget to define MUI_CUSTOMPAGECOMMANDS or
+MUI_UNCUSTOMPAGECOMMANDS before inserting the MUI_SYSTEM macro.</p>
 <p class="subheader">Call Install Options</p>
 <p class="text">You can call Install Options in [function name]:</p>
 <pre class="margin">
@@ -249,8 +263,8 @@ LangString TEXT_IO_PAGETITLE ${LANG_ENGLISH} "Page Title"
   </p>
 <p class="header">The interface</p>
 <p class="subheader">Modern.exe and modern2.exe</span></p>
-  <p class="text">There are two different versions of the interface.
+  <p class="text">There are two different versions of the interface
-  Modern.exe contains the dialogs of the standard interface.
+  available. Modern.exe contains the dialogs of the standard interface.
   If you have an installer with a lot of subsections 
   or long section names, use modern2.exe, which has a different
   component-selection page.</p>
@@ -269,10 +283,22 @@ The 'verifying installer' and 'unpacking data' texts are defined in
   To change them, you need to edit this file and recompile NSIS.</p>
 <p class="header">Version history</p>
 <ul>
+<li class="changelog">1.5 - November 8, 2002
+  <ul>
+    <li>New language file format
+    <li>Language strings can be changed in the script without editing
+    language files
+    <li>Install Options macro's updated. MUI_INSTALLOPTIONS_DISPLAY is
+    the standard macro now. Use MUI_INSTALLOPTIONS_INITDIALOG and
+    MUI_INSTALLOPTIONS_SHOW if you want to customize dialog controls.
+    <li>Renamed macro's and defines
+    <li>Some small fixes
+  </ul>
+<p class="text"></p>
 <li class="changelog">1.4 - November 4, 2002
   <ul>
     <li>Uses new NSIS Page command
-    <li>Macro system updates (smaller)
+    <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

Contrib/Modern UI/System.nsh

@@ -1,4 +1,4 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
 ;Macro System
 ;Written by Joost Verburg
 
@@ -117,7 +117,7 @@
 
 !macroend
 
-!macro MUI_DESCRIPTION_INIT
+!macro MUI_DESCRIPTION_BEGIN
 
   !verbose 3
 
@@ -341,7 +341,7 @@
     SetDetailsPrint both
   !endif
 
-  File /oname=$PLUGINSDIR\${FILE} "${FILE}"
+  File "/oname=$PLUGINSDIR\${FILE}" "${FILE}"
 
   !verbose 4
 
@@ -364,7 +364,7 @@
 
 !macroend
 
-!macro MUI_INSTALLOPTIONS_SHOW FILE
+!macro MUI_INSTALLOPTIONS_DISPLAY FILE
 
   !verbose 3
 
@@ -386,6 +386,38 @@
 
 !macroend
 
+!macro MUI_INSTALLOPTIONS_INITDIALOG FILE
+
+  !verbose 3
+
+  InstallOptions::initDialog /NOUNLOAD "$PLUGINSDIR\${FILE}"
+
+  !verbose 4
+
+!macroend
+
+!macro MUI_INSTALLOPTIONS_SHOW
+
+  !verbose 3S
+
+  Push ${MUI_TEMP1}
+
+  InstallOptions::show
+  Pop ${MUI_TEMP1}
+
+  StrCmp ${MUI_TEMP1} "cancel" "" +2
+    Quit
+
+  StrCmp ${MUI_TEMP1} "back" "" +3
+    Pop ${MUI_TEMP1}
+    Abort
+
+  Pop ${MUI_TEMP1}
+
+  !verbose 4
+
+!macroend
+
 !macro MUI_INSTALLOPTIONS_READ VAR FILE SECTION KEY
 
   !verbose 3
@@ -413,7 +445,7 @@
   Push ${MUI_TEMP1}
   Push ${MUI_TEMP2}
 
-    StrCpy ${MUI_TEMP1} "$(MUI_TEXT_SETUPCAPTION)"
+    StrCpy ${MUI_TEMP1} "$(MUI_TEXT_WINDOWTITLE)"
     StrCpy ${MUI_TEMP2} "${TITLE}"
     
     !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "Title" "${MUI_TEMP1}: ${MUI_TEMP2}"
@@ -430,7 +462,7 @@
   !ifdef MUI_ABORTWARNING
 
     !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirm" "$(MUI_TEXT_ABORTWARNING)"
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_SETUPCAPTION)"
+    !insertmacro MUI_INSTALLOPTIONS_WRITE "${FILE}" "Settings" "CancelConfirmCaption" "$(MUI_TEXT_WINDOWTITLE)"
   
   !endif
   
@@ -502,7 +534,7 @@
   FunctionEnd
 
   Function "${SETLICENSEDIALOG}"
-    !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE)
+    !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE_BOTTOM)
   FunctionEnd
   
   !verbose 4
@@ -518,8 +550,8 @@
   FunctionEnd
 
   Function "${SETCOMPONENTSDIALOG}"
-    !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_DESCRIPTION_TITLE)
+    !insertmacro MUI_INNERDIALOG_TEXT 1042 $(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE)
-    !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_DESCRIPTION_INFO)
+    !insertmacro MUI_INNERDIALOG_TEXT 1043 $(MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO)
   FunctionEnd
   
   !verbose 4
@@ -531,11 +563,11 @@
   !verbose 3
 
   Function "${SETDIRECTORYPAGE}"
-    !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRSELECT_TITLE) $(MUI_TEXT_DIRSELECT_SUBTITLE)
+    !insertmacro MUI_HEADER_TEXT $(MUI_TEXT_DIRECTORY_TITLE) $(MUI_TEXT_DIRECTORY_SUBTITLE)
   FunctionEnd
 
   Function "${SETDIRECTORYDIALOGPAGE}"
-    !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DESTINATIONFOLDER)
+    !insertmacro MUI_INNERDIALOG_TEXT 1041 $(MUI_INNERTEXT_DIRECTORY_DESTINATION)
   FunctionEnd
   
   !verbose 4
@@ -554,12 +586,12 @@
   
 !macroend
 
-!macro MUI_FUNCTIONS_DESCRIPTION_START
+!macro MUI_FUNCTIONS_DESCRIPTION_BEGIN
 
   !verbose 3
 
   Function .onMouseOverSection
-    !insertmacro MUI_DESCRIPTION_INIT
+    !insertmacro MUI_DESCRIPTION_BEGIN
 
   !verbose 4
 
@@ -677,7 +709,131 @@
 
 !macroend
 
+;--------------------------------
+;LANGUAGE FILES
+
+!macro MUI_LANGUAGEFILE_BEGIN LANGUAGE
+
+  !verbose 3
+  
+  !define MUI_LANGUAGEFILE_CURRENT "${LANGUAGE}"
+  
+  !ifndef "MUI_LANGUAGEFILE_${LANGUAGE}_USED"
+  
+    !define "MUI_LANGUAGEFILE_${LANGUAGE}_USED"
+
+    LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
+  
+!macroend
+
+!macro MUI_LANGUAGEFILE_STRING STRING VALUE
+
+  !ifndef "${STRING}"
+    !define "${STRING}" "${VALUE}"
+  !endif
+  
+!macroend
+
+!macro MUI_LANGUAGEFILE_LANGSTRING NAME VALUE
+
+  LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+  !undef "${NAME}"
+  
+!macroend
+
+!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME VALUE
+
+  LangString "un.${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+  !undef "${NAME}"
+  
+!macroend
+
+!macro MUI_LANGUAGEFILE_NSISCOMMAND COMMAND NAME VALUE
+
+  "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}"
+  !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME VALUE
+
+  !ifndef "${DEFINE}"
+    !define "${DEFINE}" "${VALUE}"
+  !endif
+  !undef "${NAME}"
+
+!macroend
+
+!macro MUI_LANGUAGEFILE_END
+
+  !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" "${MUI_LANGNAME}"
+
+  !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME "${MUI_NAME}"
+
+  !ifdef MUI_LICENSEPAGE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE" "${MUI_TEXT_LICENSE_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE" "${MUI_TEXT_LICENSE_SUBTITLE}"
+    !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP" "${MUI_INNERTEXT_LICENSE_TOP}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM" "${MUI_INNERTEXT_LICENSE_BOTTOM}"
+  !endif
+  
+  !ifdef MUI_COMPONENTSPAGE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_TITLE" "${MUI_TEXT_COMPONENTS_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_SUBTITLE" "${MUI_TEXT_COMPONENTS_SUBTITLE}"
+    !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "ComponentText" "MUI_INNERTEXT_COMPONENTS" "${MUI_INNERTEXT_COMPONENTS}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO}"
+  !endif
+  
+  !ifdef MUI_DIRECTORYPAGE
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_TITLE" "${MUI_TEXT_DIRECTORY_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_SUBTITLE" "${MUI_TEXT_DIRECTORY_SUBTITLE}"
+    !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "${MUI_INNERTEXT_DIRECTORY_TOP}"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_INNERTEXT_DIRECTORY_DESTINATION "${MUI_INNERTEXT_DIRECTORY_DESTINATION}"
+  !endif
+  
+  !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" "${MUI_TEXT_INSTALLING_TITLE}"
+  !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE" "${MUI_TEXT_INSTALLING_SUBTITLE}"
+  
+  !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISHED_TITLE" "${MUI_TEXT_FINISHED_TITLE}"
+  !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISHED_SUBTITLE" "${MUI_TEXT_FINISHED_SUBTITLE}"
+  
+  !ifdef MUI_ABORTWARNING
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING" "${MUI_TEXT_ABORTWARNING}"
+  !endif
+  
+  !ifdef MUI_INSTALLOPTIONS
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WINDOWTITLE" "${MUI_TEXT_WINDOWTITLE}"
+  !endif
+  
+  !ifdef MUI_UNINSTALLER
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_TITLE" "${MUI_UNTEXT_INTRO_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE" "${MUI_UNTEXT_INTRO_SUBTITLE}"
+  
+    !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "UninstallText" "MUI_UNINNERTEXT_INTRO" "${MUI_UNINNERTEXT_INTRO}"
+  
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_TITLE" "${MUI_UNTEXT_UNINSTALLING_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_SUBTITLE" "${MUI_UNTEXT_UNINSTALLING_SUBTITLE}"
+     
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_TITLE" "${MUI_UNTEXT_FINISHED_TITLE}"
+    !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_SUBTITLE" "${MUI_UNTEXT_FINISHED_SUBTITLE}"
+  
+    !ifdef MUI_UNINSTALLOPTIONS
+      !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_WINDOWTITLE" "${MUI_UNTEXT_WINDOWTITLE}"
+    !endif
+  !endif
+  
+  !endif
+  
+  !undef MUI_LANGUAGEFILE_CURRENT
+  
+  !verbose 4
+
+!macroend
+
+;--------------------------------
+;END
+
 !endif
 
-!verbose 4
+!verbose 4
-;--------------------------------

Examples/Modern UI/Basic.nsi

@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
-;Basic Macro System Example Script
+;Basic Example Script
 ;Written by Joost Verburg
 
 !define MUI_PRODUCT "Test Software" ;Define your own software name here
 !define MUI_VERSION "1.0" ;Define your own software version here
 
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
 ;--------------------------------
@@ -58,7 +56,7 @@ SectionEnd
 ;--------------------------------
 ;Descriptions
 
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_END
  

Examples/Modern UI/InstallOptions.nsi

@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
 ;Install Options Example Script
 ;Written by Joost Verburg
 
 !define MUI_PRODUCT "Test Software" ;Define your own software name here
 !define MUI_VERSION "1.0" ;Define your own software version here
 
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
 ;--------------------------------
@@ -19,8 +17,6 @@
   !define MUI_DIRECTORYPAGE
   !define MUI_ABORTWARNING
   !define MUI_UNINSTALLER
-  
-  !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages
     
   !define TEMP1 $R0
   !define TEMP2 $R1
@@ -32,6 +28,8 @@
   OutFile "InstallOptions.exe"
   
   ;Page order
+  !define MUI_CUSTOMPAGECOMMANDS ;Use customized pages  
+  
   !insertmacro MUI_PAGECOMMAND_LICENSE
   Page custom SetCustomA
   Page custom SetCustomB
@@ -58,12 +56,8 @@
   LangString TEXT_IO_PAGETITLE_B ${LANG_ENGLISH} "Custom Page B"
   LangString TEXT_IO_PAGETITLE_C ${LANG_ENGLISH} "Custom Page C"
   
-  ;Uninstaller
-  !define MUI_UNCUSTOMPAGECOMMANDS
-  !insertmacro MUI_UNPAGECOMMAND_CONFIRM
-  !insertmacro MUI_UNPAGECOMMAND_INSTFILES
-  
   ;Things that need to be extracted on startup (keep these lines before any File command!)
+  ;Only useful for BZIP2 compression
   ;Use ReserveFile for your own Install Options ini files too!
   ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
   ReserveFile "ioA.ini"
@@ -98,6 +92,13 @@ SectionEnd
 
 !insertmacro MUI_SECTIONS_FINISHHEADER ;Insert this macro after the sections
 
+;--------------------------------
+;Descriptions
+
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_END
+
 ;--------------------------------
 ;Installer Functions
 
@@ -122,17 +123,18 @@ FunctionEnd
 
 Function SetCustomA
   !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
-  !insertmacro MUI_INSTALLOPTIONS_SHOW "ioA.ini"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioA.ini"
 FunctionEnd
 
 Function SetCustomB
   !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
-  !insertmacro MUI_INSTALLOPTIONS_SHOW "ioB.ini"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioB.ini"
 FunctionEnd
 
 Function SetCustomC
   !insertmacro MUI_HEADER_TEXT $(TEXT_IO_TITLE) $(TEXT_IO_SUBTITLE)
-  !insertmacro MUI_INSTALLOPTIONS_SHOW "ioC.ini"
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioC.ini"
+
 FunctionEnd
 
 ;--------------------------------

Examples/Modern UI/MultiLanguage.nsi

@@ -1,12 +1,10 @@
-;NSIS Modern User Interface version 1.4
+;NSIS Modern User Interface version 1.5
-;Basic Macro System & MultiLanguage Example Script
+;MultiLanguage Example Script
 ;Written by Joost Verburg
 
 !define MUI_PRODUCT "Test Software" ;Define your own software name here
 !define MUI_VERSION "1.0" ;Define your own software version here
 
-!define MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}" ;Installer name
-
 !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
 
 ;--------------------------------
@@ -168,7 +166,7 @@ FunctionEnd
 ;--------------------------------
 ;Descriptions
 
-!insertmacro MUI_FUNCTIONS_DESCRIPTION_START
+!insertmacro MUI_FUNCTIONS_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCopyUI} $(DESC_SecCopyUI)
 !insertmacro MUI_FUNCTIONS_DESCRIPTION_END