fixed page text settings; support for uninst license, directory pages; renamed language file string; updated startmenu text; removed old language file strings

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

Contrib/Modern UI/Language files/Catalan.nsh

@@ -11,10 +11,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Català" ;Name of the language in the language itself
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Premi Següent per continuar."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Premi Instal·lar per iniciar la instal·lació."
-
+  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Benvingut a l'Assistent d'Instal·lació de ${MUI_PRODUCT}"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Aquest programa instal·larà ${MUI_PRODUCT} en el seu ordinador.\r\n\r\nEs recomana tancar tota la resta d'aplicacions abans d'iniciar la Instal·lació. Això permetrà a la Instal·lació actualitzar certs arxius del sistema sense haver de reiniciar el seu ordinador.\r\n\r\n"
 
@@ -61,8 +58,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Premi Desinstal·lar per efectuar la desinstal·lació."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstal·lar ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Eliminar ${MUI_PRODUCT} del seu sistema."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Desinstalˇlar ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Eliminar ${MUI_PRODUCT} del seu sistema."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Selecció de components"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccioni quines característiques de ${MUI_PRODUCT} desitja desinstal·lar."

Contrib/Modern UI/Language files/Dutch.nsh

@@ -49,7 +49,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME "Leesmij weergeven"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_TITLE "Kies Start Menu Map"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "Kies een map in het Startmenu voor de snelkoppelingen van het programma."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "Kies een map in het Startmenu voor de snelkoppelingen van ${MUI_PRODUCT}."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_TOP "Kies een map in het Start Menu waarin de snelkoppelingen moeten worden aangemaakt. U kunt ook een naam invoeren om een niewe map te maken."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_CHECKBOX "Geen snelkoppelingen aanmaken"
   
@@ -58,13 +58,22 @@
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Klik op Verwijder om het verwijderen te starten."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Verwijder ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Verwijder ${MUI_PRODUCT} van uw system."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Verwijder ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Verwijder ${MUI_PRODUCT} van uw system."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Deze wizard zal ${MUI_PRODUCT} verwijderen van uw systeem."
   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_LICENSE_TITLE "Licentie Overeenkomst"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_LICENSE_SUBTITLE "Lees de licentie overeenkomst voordat u ${MUI_PRODUCT} verwijdert."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM "Klik op Akkoord op verder te gaan als u de overeenkomst accepteert. U moet de overeenkomst accepteren om ${MUI_PRODUCT} te verwijderen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "Klik op het keuzevak hieronder als u de overeenkomst accepteert. U moet de overeenkomst accepteren om ${MUI_PRODUCT} te verwijderen."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "Selecteer de eerste optie hieronder als u de overeenkomst accepteert. U moet de overeenkomst accepteren om ${MUI_PRODUCT} te verwijderen."
+  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_TITLE "Kies Onderdelen"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_COMPONENTS_SUBTITLE "Kies de onderdelen die u wilt verwijderen."
   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Kies Deïnstallatie Locatie"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Kies de map waaruit u ${MUI_PRODUCT} in wilt verwijderen."
+  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Bezig met verwijderen"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Een ogenblik geduld a.u.b. terwijl ${MUI_PRODUCT} van uw systeem wordt verwijderd."
   

Contrib/Modern UI/Language files/English.nsh

@@ -49,7 +49,7 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_FINISH_SHOWREADME "&Show Readme"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_TITLE "Choose Start Menu Folder"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "Choose a Start Menu folder for the program's shortcuts."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_STARTMENU_SUBTITLE "Choose a Start Menu folder for the ${MUI_PRODUCT} shortcuts."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_TOP "Select the Start Menu folder in which you would like to create the program's shortcuts. You can also enter a name to create a new folder."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_STARTMENU_CHECKBOX "Do not create shortcuts"
   
@@ -58,12 +58,21 @@
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Click Uninstall to start the uninstallation."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Uninstall ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remove ${MUI_PRODUCT} from your computer."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Uninstall ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Remove ${MUI_PRODUCT} from your computer."
+  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_LICENSE_TITLE "License Agreement"  
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_LICENSE_SUBTITLE "Please review the license terms before uninstalling ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM "If you accept the terms of the agreement, click I Agree to continue. You must accept the agreement to uninstall ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX "If you accept the terms of the agreement, click the check box below. You must accept the agreement to uninstall ${MUI_PRODUCT}. $_CLICK"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS "If you accept the terms of the agreement, select the first option below. You must accept the agreement to uninstall ${MUI_PRODUCT}. $_CLICK"
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Choose Components"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Choose which features of ${MUI_PRODUCT} you want to uninstall."
   
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_DIRECTORY_TITLE "Choose Uninstall Location"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_DIRECTORY_SUBTITLE "Choose the folder from which to uninstall ${MUI_PRODUCT}."
+  
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_TITLE "Uninstalling"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_UNINSTALLING_SUBTITLE "Please wait while ${MUI_PRODUCT} is being uninstalled."
     

Contrib/Modern UI/Language files/Finnish.nsh

@@ -58,8 +58,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Valitse Poista poistaaksesi ohjelman."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Poista ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Poista ${MUI_PRODUCT} tietokoneestasi."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Poista ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Poista ${MUI_PRODUCT} tietokoneestasi."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Valitse komponentit"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Valitse ${MUI_PRODUCT} toiminnot, jotka haluat poistaa."

Contrib/Modern UI/Language files/German.nsh

@@ -29,7 +29,6 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_TITLE "Zielverzeichnis auswählen"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_DIRECTORY_SUBTITLE "Wählen Sie das Verzeichnis aus, in das ${MUI_PRODUCT} installiert werden soll."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_INNERTEXT_DIRECTORY_DESTINATION "Zielverzeichnis"
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_TITLE "Installiere..."
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_INSTALLING_SUBTITLE "Bitte warten Sie, während ${MUI_PRODUCT} installiert wird."
@@ -59,12 +58,12 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Klicken Sie auf Deinstallieren um mit der Deinstallation zu beginnen."
 
-  !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 Computer."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Deinstallation von ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Entferne ${MUI_PRODUCT} von Ihrem Computer."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Komponenten auswählen"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Wählen Sie die Komponenten aus, die Sie entfernen möchten."
-
+  
   !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."
 

Contrib/Modern UI/Language files/Greek.nsh

@@ -11,9 +11,6 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Greek" ;(Ελληνικά) Name of the language in the language itself
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Κάντε κλικ στο Επόμενο για να συνεχίσετε."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Κάντε κλικ στο Εγκατάσταση για να αρχίσετε την εγκατάσταση."
     
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Καλώς ήλθατε στην Εγκατάσταση του '${MUI_PRODUCT}'"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Ο οδηγός αυτός θα σας καθοδηγήσει κατά τη διάρκεια της εγκατάστασης του '${MUI_PRODUCT}'.\r\n\r\nΣυνιστάται να κλείσετε όλες τις άλλες εφαρμογές πριν ξεκινήσετε την Εγκατάσταση. Αυτό θα επιτρέψει στην Εγκατάσταση να ενημερώσει ορισμένα αρχεία συστήματος χωρίς την επανεκκίνηση του υπολογιστή σας.\r\n\r\n"
@@ -61,8 +58,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Κάντε κλικ στο Απεγκατάσταση για να αρχίσετε την απεγκατάσταση."  
   
-  !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_UNTEXT_CONFIRM_TITLE "ÁđĺăęáôÜóôáóç ôďő '${MUI_PRODUCT}'"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Áöáßńĺóç ôďő '${MUI_PRODUCT}' áđü ôďí őđďëďăéóôŢ óáň."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Επιλογή Στοιχείων"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Επιλέξτε τα στοιχεία του '${MUI_PRODUCT}' που θέλετε να απεγκαταστήσετε."

Contrib/Modern UI/Language files/PortugueseBR.nsh

@@ -58,8 +58,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Clique em Desinstalar para começar a desinstalação."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar o ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Remover o ${MUI_PRODUCT} do seu computador."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Desinstalar o ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Remover o ${MUI_PRODUCT} do seu computador."
   
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Escolher Componentes"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Escolha quais qualidades do ${MUI_PRODUCT} quer desinstalar."

Contrib/Modern UI/Language files/Romanian.nsh

@@ -61,8 +61,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Apasati butonul Dezinstalare pentru a porni dezinstalarea."
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Dezinstaleaza ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Sterge ${MUI_PRODUCT}."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Dezinstaleaza ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Sterge ${MUI_PRODUCT}."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Alegeti componentele"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Selectati componentele ${MUI_PRODUCT} pe care vreti sa le dezinstalati."

Contrib/Modern UI/Language files/Spanish.nsh

@@ -11,14 +11,11 @@
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_LANGNAME "Español" ;Name of the language in the language itself
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_NAME "${MUI_PRODUCT} ${MUI_VERSION}"
-  
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_NEXT "Presione Siguiente para continuar."
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_CONTINUE_INSTALL "Presione Instalar para iniciar la instalación."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TITLE "Bienvenido al Asistente de Instalación de ${MUI_PRODUCT}"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_WELCOME_INFO_TEXT "Este programa instalará ${MUI_PRODUCT} en su ordenador.\r\n\r\nSe recomienda que cierre todas las demás aplicaciones antes de iniciar la Instalación. Esto permitirá a la Instalación actualizar ciertos archivos del sistema sin reiniciar su ordenador.\r\n\r\n"
 
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_LICENSE_TITLE "Acuerdo de licencia"  
+  !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}."
@@ -61,8 +58,8 @@
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Presione Desinstalar para proceder a la desinstalación."
   
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Desinstalar ${MUI_PRODUCT}"
-  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Elimina ${MUI_PRODUCT} de su sistema."
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_TITLE "Desinstalar ${MUI_PRODUCT}"
+  !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONFIRM_SUBTITLE "Elimina ${MUI_PRODUCT} de su sistema."
 
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_TITLE "Selección de componentes"
   !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_COMPONENTS_SUBTITLE "Seleccione qué características de ${MUI_PRODUCT} desea desinstalar."

Contrib/Modern UI/Readme.html

@@ -198,7 +198,9 @@ will also help you to learn more about the Modern UI.</p>
   <p class="text">
   <span class="bold">Uninstaller Pages</span><br />
   MUI_UNPAGE_CONFIRM<br />
+  MUI_UNPAGE_LICENSE <span class="parameter">text/rtf_file</span><br />
   MUI_UNPAGE_COMPONENTS<br />
+  MUI_UNPAGE_DIRECTORY<br />
   MUI_UNPAGE_INSTFILES<br />
   </p>
   <p class="sub2header">Page Settings</p>

Contrib/Modern UI/System.nsh

@@ -546,7 +546,15 @@ Var MUI_TEMP2
     
     LicenseData "${LICENSEDATA}"
     
-    !ifdef MUI_LICENSEPAGE_TEXT
+    !ifndef MUI_LICENSEPAGE_TEXT
+      !ifndef MUI_LICENSEPAGE_CHECKBOX & MUI_LICENSEPAGE_RADIOBUTTONS
+        LicenseText "$(MUI_INNERTEXT_LICENSE_BOTTOM)"
+      !else ifdef MUI_LICENSEPAGE_CHECKBOX
+        LicenseText "$(MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX)"
+      !else
+        LicenseText "$(MUI_INNERTEXT_LICENSE_RADIOBUTTONS)"
+      !endif
+    !else
       LicenseText ${MUI_LICENSEPAGE_TEXT}
       !undef MUI_LICENSEPAGE_TEXT
     !endif
@@ -591,7 +599,7 @@ Var MUI_TEMP2
     Caption " "
     
     !ifdef MUI_COMPONENTSPAGE_TEXT
-      LicenseText ${MUI_COMPONENTSPAGE_TEXT}
+      ComponentText ${MUI_COMPONENTSPAGE_TEXT}
       !undef MUI_COMPONENTSPAGE_TEXT
     !endif
   
@@ -621,12 +629,12 @@ Var MUI_TEMP2
     Caption " "
     
     !ifdef MUI_DIRECTORYPAGE_TEXT
-      LicenseText ${MUI_DIRECTORYPAGE_TEXT}
+      DirText ${MUI_DIRECTORYPAGE_TEXT}
       !undef MUI_DIRECTORYPAGE_TEXT
     !endif
     
     !ifdef MUI_DIRECTORYPAGE_VARIABLE
-      LicenseText "${MUI_DIRECTORYPAGE_VARIABLE}"
+      DirVar "${MUI_DIRECTORYPAGE_VARIABLE}"
       !undef "MUI_DIRECTORYPAGE_VARAIBLE"
     !endif
     
@@ -801,6 +809,60 @@ Var MUI_TEMP2
    
 !macroend
 
+!macro MUI_UNPAGE_LICENSE LICENSEDATA
+
+  !verbose push
+  !verbose 3
+
+  !ifndef MUI_UNLICENSEPAGE
+    !define MUI_UNLICENSEPAGE
+  !endif
+  
+  !insertmacro MUI_UNIQUEID
+  
+  PageEx un.license
+  
+    PageCallbacks un.mui.LicensePre_${MUI_UNIQUEID} un.mui.LicenseShow_${MUI_UNIQUEID} un.mui.LicenseLeave_${MUI_UNIQUEID}
+    
+    Caption " "
+    
+    LicenseData "${LICENSEDATA}"
+    
+    !ifndef MUI_LICENSEPAGE_TEXT
+      !ifndef MUI_LICENSEPAGE_CHECKBOX & MUI_LICENSEPAGE_RADIOBUTTONS
+        LicenseText "$(MUI_UNINNERTEXT_LICENSE_BOTTOM)"
+      !else ifdef MUI_LICENSEPAGE_CHECKBOX
+        LicenseText "$(MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX)"
+      !else
+        LicenseText "$(MUI_UNINNERTEXT_LICENSE_RADIOBUTTONS)"
+      !endif
+    !else
+      LicenseText ${MUI_LICENSEPAGE_TEXT}
+      !undef MUI_LICENSEPAGE_TEXT
+    !endif
+    
+    !ifdef MUI_LICENSEPAGE_CHECKBOX
+      !ifndef MUI_UNLICENSEPAGE_CHECKBOX_USED
+        !define MUI_UNLICENSEPAGE_CHECKBOX_USED
+      !endif
+      LicenseForceSelection checkbox
+      !undef MUI_LICENSEPAGE_CHECKBOX
+    !else ifdef MUI_LICENSEPAGE_RADIOBUTTONS
+      !ifndef MUI_UNLICENSEPAGE_RADIOBUTTONS_USED
+        !define MUI_UNLICENSEPAGE_RADIOBUTTONS_USED
+      !endif
+      LicenseForceSelection radiobuttons
+      !undef MUI_LICENSEPAGE_RADIOBUTTONS
+    !endif
+    
+  PageExEnd
+  
+  !insertmacro MUI_UNFUNCTION_LICENSEPAGE un.mui.LicensePre_${MUI_UNIQUEID} un.mui.LicenseShow_${MUI_UNIQUEID} un.mui.LicenseLeave_${MUI_UNIQUEID}
+  
+  !verbose pop
+  
+!macroend
+
 !macro MUI_UNPAGE_COMPONENTS
 
   !verbose push
@@ -822,6 +884,11 @@ Var MUI_TEMP2
     
     Caption " "
     
+    !ifdef MUI_COMPONENTSPAGE_TEXT
+      ComponentText ${MUI_COMPONENTSPAGE_TEXT}
+      !undef MUI_COMPONENTSPAGE_TEXT
+    !endif
+    
   PageExEnd
   
   !insertmacro MUI_UNFUNCTION_COMPONENTSPAGE un.mui.ComponentsPre_${MUI_UNIQUEID} un.mui.ComponentsShow_${MUI_UNIQUEID} un.mui.ComponentsLeave_${MUI_UNIQUEID}
@@ -830,6 +897,41 @@ Var MUI_TEMP2
    
 !macroend
 
+!macro MUI_UNPAGE_DIRECTORY
+
+  !verbose push
+  !verbose 3
+
+  !ifndef MUI_UNDIRECTORYPAGE
+    !define MUI_UNDIRECTORYPAGE
+  !endif
+    
+  !insertmacro MUI_UNIQUEID
+    
+  PageEx un.directory
+  
+    PageCallbacks un.mui.DirectoryPre_${MUI_UNIQUEID} un.mui.DirectoryShow_${MUI_UNIQUEID} un.mui.DirectoryLeave_${MUI_UNIQUEID}
+    
+    Caption " "
+    
+    !ifdef MUI_DIRECTORYPAGE_TEXT
+      DirText ${MUI_DIRECTORYPAGE_TEXT}
+      !undef MUI_DIRECTORYPAGE_TEXT
+    !endif
+    
+    !ifdef MUI_DIRECTORYPAGE_VARIABLE
+      DirVar "${MUI_DIRECTORYPAGE_VARIABLE}"
+      !undef "MUI_DIRECTORYPAGE_VARAIBLE"
+    !endif
+    
+  PageExEnd
+  
+  !insertmacro MUI_UNFUNCTION_DIRECTORYPAGE un.mui.DirectoryPre_${MUI_UNIQUEID} un.mui.DirectoryShow_${MUI_UNIQUEID} un.mui.DirectoryLeave_${MUI_UNIQUEID}
+  
+  !verbose pop
+  
+!macroend
+
 !macro MUI_UNPAGE_INSTFILES
 
   !verbose push
@@ -1623,7 +1725,7 @@ Var MUI_TEMP2
   Function "${PRE}"
   
    !insertmacro MUI_FUNCTION_CUSTOM PRE
-   !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_UNTEXT_INTRO_TITLE) $(MUI_UNTEXT_INTRO_SUBTITLE)
+   !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_UNTEXT_CONFIRM_TITLE) $(MUI_UNTEXT_CONFIRM_SUBTITLE)
   
   FunctionEnd
   
@@ -1641,6 +1743,35 @@ Var MUI_TEMP2
   
 !macroend
 
+!macro MUI_UNFUNCTION_LICENSEPAGE PRE SHOW LEAVE
+
+  Function "${PRE}"
+  
+    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_UNTEXT_LICENSE_TITLE) $(MUI_UNTEXT_LICENSE_SUBTITLE)
+    
+  FunctionEnd
+
+  Function "${SHOW}"
+  
+    !ifndef MUI_LICENSEPAGE_TEXT_TOP
+      !insertmacro MUI_INNERDIALOG_TEXT 1040 $(MUI_INNERTEXT_LICENSE_TOP)
+    !else
+      !insertmacro MUI_INNERDIALOG_TEXT 1040 "${MUI_LICENSEPAGE_TEXT_TOP}"
+      !undef MUI_LICENSEPAGE_TEXT_TOP
+    !endif
+    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+    
+  FunctionEnd
+  
+  Function "${LEAVE}"
+  
+    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+    
+  FunctionEnd
+
+!macroend
+
 !macro MUI_UNFUNCTION_COMPONENTSPAGE PRE SHOW LEAVE
 
   Function "${PRE}"
@@ -1670,6 +1801,23 @@ Var MUI_TEMP2
   
 !macroend
 
+!macro MUI_UNFUNCTION_DIRECTORYPAGE PRE SHOW LEAVE
+
+  Function "${PRE}"
+    !insertmacro MUI_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_HEADER_TEXT_PAGE $(MUI_UNTEXT_DIRECTORY_TITLE) $(MUI_UNTEXT_DIRECTORY_SUBTITLE)
+  FunctionEnd
+
+  Function "${SHOW}"
+    !insertmacro MUI_FUNCTION_CUSTOM SHOW
+  FunctionEnd
+  
+  Function "${LEAVE}"
+    !insertmacro MUI_FUNCTION_CUSTOM LEAVE
+  FunctionEnd
+
+!macroend
+
 !macro MUI_UNFUNCTION_INSTFILESPAGE PRE SHOW LEAVE
 
   Function ${PRE}
@@ -1913,12 +2061,12 @@ Var MUI_TEMP2
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_TOP"
-    !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMSTRING "MUI_INNERTEXT_LICENSE_BOTTOM" "^LicenseText"
+    !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM"
     !ifdef MUI_LICENSEPAGE_CHECKBOX_USED
-      !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMSTRING "MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX" "^LicenseTextCB"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX"
     !endif
     !ifdef MUI_LICENSEPAGE_RADIOBUTTONS_USED
-      !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CUSTOMSTRING "MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS" "^LicenseTextRB"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
     !endif
   !endif
   
@@ -1982,14 +2130,34 @@ Var MUI_TEMP2
   !ifdef MUI_UNINSTALLER
     
     !ifdef MUI_UNCONFIRMPAGE
-      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_INTRO_TITLE"
-      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_CONFIRM_TITLE"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_CONFIRM_SUBTITLE"
+    !endif
+    
+    !ifdef MUI_UNLICENSEPAGE
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_LICENSE_TITLE"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_LICENSE_SUBTITLE"
+      !ifndef MUI_LICENSEPAGE
+        !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_TOP"
+      !endif
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNINNERTEXT_LICENSE_BOTTOM"
+      !ifdef MUI_UNLICENSEPAGE_CHECKBOX_USED
+        !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNINNERTEXT_LICENSE_BOTTOM_CHECKBOX"
+      !endif
+      !ifdef MUI_UNLICENSEPAGE_RADIOBUTTONS_USED
+        !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNINNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS"
+      !endif
     !endif
     
     !ifdef MUI_UNCOMPONENTSPAGE
       !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_COMPONENTS_TITLE"
       !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_COMPONENTS_SUBTITLE"
     !endif
+    
+    !ifdef MUI_DIRECTORYPAGE
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_DIRECTORY_TITLE"
+      !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_DIRECTORY_SUBTITLE"
+    !endif
      
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_FINISH_TITLE"
     !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_UNTEXT_FINISH_SUBTITLE"