Bug 470392 - Update installer for Unicode support and locale verification (locale fixes). r=philringnalda
authorRobert Strong <robert.bugzilla@gmail.com>
Sun, 21 Dec 2008 21:40:06 -0800
changeset 1478 82c571b8e4b3
parent 1477 e1d46719ab40
child 1479 f913fff0f7ba
push id1174
push userrstrong@mozilla.com
push date2008-12-22 05:40 +0000
treeherdercomm-central@82c571b8e4b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilringnalda
bugs470392
Bug 470392 - Update installer for Unicode support and locale verification (locale fixes). r=philringnalda
mail/installer/windows/nsis/defines.nsi.in
mail/installer/windows/nsis/installer.nsi
mail/installer/windows/nsis/uninstaller.nsi
mail/locales/Makefile.in
mail/locales/en-US/installer/custom.properties
mail/locales/en-US/installer/mui.properties
mail/locales/en-US/installer/override.properties
--- a/mail/installer/windows/nsis/defines.nsi.in
+++ b/mail/installer/windows/nsis/defines.nsi.in
@@ -9,9 +9,9 @@
 !define FileMainEXE           "thunderbird.exe"
 !define WindowClass           "ThunderbirdMessageWindow"
 
 !define AppRegNameMail        "Thunderbird"
 !define AppRegNameNews        "Thunderbird (News)"
 
 !define ClientsRegName        "Mozilla Thunderbird"
 
-!define MinUnsupportedVer     "Microsoft Windows 2000"
+!define MinSupportedVer       "Microsoft Windows 2000"
--- a/mail/installer/windows/nsis/installer.nsi
+++ b/mail/installer/windows/nsis/installer.nsi
@@ -53,46 +53,41 @@ RequestExecutionLevel user
 
 !addplugindir ./
 
 ; empty files - except for the comment line - for generating custom pages.
 !system 'echo ; > options.ini'
 !system 'echo ; > shortcuts.ini'
 !system 'echo ; > summary.ini'
 
-; USE_UAC_PLUGIN is temporary until other apps have been updated to use the UAC plugin
+; USE_UAC_PLUGIN is temporary until all applications have been updated to use
+; the UAC plugin
 !define USE_UAC_PLUGIN
 
 Var TmpVal
 Var StartMenuDir
 Var InstallType
 Var AddStartMenuSC
 Var AddQuickLaunchSC
 Var AddDesktopSC
 
 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
 !include FileFunc.nsh
 !include LogicLib.nsh
-!include TextFunc.nsh
+!include MUI.nsh
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh
-!include MUI.nsh
 
 !insertmacro GetOptions
 !insertmacro GetParameters
 !insertmacro GetSize
 !insertmacro WordFind
 
-; NSIS provided macros that we have overridden
-!include overrides.nsh
-!insertmacro LocateNoDetails
-!insertmacro TextCompareNoDetails
-
 ; The following includes are custom.
 !include branding.nsi
 !include defines.nsi
 !include common.nsh
 !include locales.nsi
 !include version.nsh
 
 VIAddVersionKey "FileDescription"  "${BrandShortName} Installer"
@@ -100,17 +95,16 @@ VIAddVersionKey "OriginalFilename" "setu
 
 ; Must be inserted before other macros that use logging
 !insertmacro _LoggingCommon
 
 !insertmacro AddHandlerValues
 !insertmacro ChangeMUIHeaderImage
 !insertmacro CheckForFilesInUse
 !insertmacro CleanUpdatesDir
-!insertmacro CloseApp
 !insertmacro CopyFilesFromDir
 !insertmacro GetPathFromString
 !insertmacro GetParent
 !insertmacro IsHandlerForInstallDir
 !insertmacro ManualCloseAppPrompt
 !insertmacro RegCleanMain
 !insertmacro RegCleanUninstall
 !insertmacro SetBrandNameVars
@@ -718,17 +712,17 @@ FunctionEnd
 
 ################################################################################
 # Initialization Functions
 
 Function .onInit
   StrCpy $LANGUAGE 0
   ${SetBrandNameVars} "$EXEDIR\localized\distribution\setup.ini"
 
-  ${InstallOnInitCommon} "$(WARN_UNSUPPORTED_MSG)"
+  ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OS_MSG)"
 
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "options.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "shortcuts.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "summary.ini"
 
   ; Setup the options.ini file for the Custom Options Page
   WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5"
 
--- a/mail/installer/windows/nsis/uninstaller.nsi
+++ b/mail/installer/windows/nsis/uninstaller.nsi
@@ -48,30 +48,30 @@
 SetDatablockOptimize on
 SetCompress off
 CRCCheck on
 
 RequestExecutionLevel user
 
 !addplugindir ./
 
-; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
+; USE_UAC_PLUGIN is temporary until all applications have been updated to use
+; the UAC plugin
 !define USE_UAC_PLUGIN
 
 ; prevents compiling of the reg write logging.
 !define NO_LOG
 
 Var TmpVal
 
 ; Other included files may depend upon these includes!
 ; The following includes are provided by NSIS.
 !include FileFunc.nsh
 !include LogicLib.nsh
 !include MUI.nsh
-!include TextFunc.nsh
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh
 
 !insertmacro GetOptions
 !insertmacro GetParameters
 !insertmacro GetParent
 !insertmacro WordFind
@@ -472,20 +472,26 @@ Function un.leaveConfirm
     ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)"
   ${EndIf}
 FunctionEnd
 
 !ifndef NO_UNINSTALL_SURVEY
 Function un.preFinish
   ; Do not modify the finish page if there is a reboot pending
   ${Unless} ${RebootFlag}
-    ; When we add an optional action to the finish page the cancel button
-    ; is enabled. This disables it and leaves the finish button as the
-    ; only choice.
-    !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
+    ; Don't display the option to take a survey on the finish page if the OS is
+    ; Vista or above since the process will be running elevated.
+    ${If} ${AtLeastWinVista}
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "NumFields" "3"
+    ${Else}
+      ; When we add an optional action to the finish page the cancel button
+      ; is enabled. This disables it and leaves the finish button as the
+      ; only choice.
+      !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0"
+    ${EndIf}
   ${EndUnless}
 FunctionEnd
 !endif
 
 ################################################################################
 # Initialization Functions
 
 Function .onInit
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -102,19 +102,21 @@ ISP_FILES = $(shell cat $(LOCALE_SRCDIR)
 
 libs:: $(addsuffix .rdf,$(ISP_FILES)) 
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/isp/$(AB_CD)
 
 install:: $(addsuffix .rdf,$(ISP_FILES))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/isp/$(AB_CD)
 
 tests:
+ifeq (WINNT,$(OS_ARCH))
 ifneq (en-US, $(AB_CD))
-	#@echo "Verifying $(AB_CD) installer variable usage"
-	#@$(PERL) $(MOZ_SRCDIR)/toolkit/mozapps/installer/windows/nsis/check-locales.pl $(LOCALE_SRCDIR)/installer
+	@echo "Verifying $(AB_CD) installer variable usage"
+	@$(PERL) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/check-locales.pl $(LOCALE_SRCDIR)/installer
+endif
 endif
 
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/locale-$*
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1
--- a/mail/locales/en-US/installer/custom.properties
+++ b/mail/locales/en-US/installer/custom.properties
@@ -36,65 +36,69 @@
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
-# Don't replace ${BrandShortName}, $(^Name), or $(^NameDA) with a custom string.
+# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
+# custom string and always use the same one as used by the en-US files.
+# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
+# for double ampersand) and prevents the letter following the ampersand from
+# being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
-REG_APP_DESC=${BrandShortName} is a full-featured email application. ${BrandShortName} supports IMAP and POP mail protocols, as well as HTML mail formatting. Built-in junk mail controls, RSS capabilities, powerful quick search, spell check as you type, global inbox, and advanced message filtering round out ${BrandShortName}'s modern feature set.
-CONTEXT_OPTIONS=${BrandShortName} &Options
-CONTEXT_SAFE_MODE=${BrandShortName} &Safe Mode
+REG_APP_DESC=$BrandShortName is a full-featured email application. $BrandShortName supports IMAP and POP mail protocols, as well as HTML mail formatting. Built-in junk mail controls, RSS capabilities, powerful quick search, spell check as you type, global inbox, and advanced message filtering round out $BrandShortName's modern feature set.
+CONTEXT_OPTIONS=$BrandShortName &Options
+CONTEXT_SAFE_MODE=$BrandShortName &Safe Mode
 SAFE_MODE=Safe Mode
 OPTIONS_PAGE_TITLE=Setup Type
 OPTIONS_PAGE_SUBTITLE=Choose setup options
 SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
 SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
 SUMMARY_PAGE_TITLE=Summary
-SUMMARY_PAGE_SUBTITLE=Ready to start installing ${BrandShortName}
-SUMMARY_INSTALLED_TO=${BrandShortName} will be installed to the following location:
+SUMMARY_PAGE_SUBTITLE=Ready to start installing $BrandShortName
+SUMMARY_INSTALLED_TO=$BrandShortName will be installed to the following location:
 SUMMARY_REBOOT_REQUIRED_INSTALL=A restart of your computer may be required to complete the installation.
 SUMMARY_REBOOT_REQUIRED_UNINSTALL=A restart of your computer may be required to complete the uninstall.
 SUMMARY_CLICK=Click Install to continue.
-SURVEY_TEXT=&Tell us what you thought of ${BrandShortName}
-LAUNCH_TEXT=&Launch $(^Name) now
-CREATE_ICONS_DESC=Create icons for ${BrandShortName}:
+SURVEY_TEXT=&Tell us what you thought of $BrandShortName
+LAUNCH_TEXT=&Launch $BrandFullName now
+CREATE_ICONS_DESC=Create icons for $BrandShortName:
 ICONS_DESKTOP=On my &Desktop
 ICONS_STARTMENU=In my &Start Menu Programs folder
 ICONS_QUICKLAUNCH=In my &Quick Launch bar
 WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
-WARN_MANUALLY_CLOSE_APP_UNINSTALL=${BrandFullName} must be closed to proceed with the uninstall.\n\nPlease close ${BrandFullName} to continue.
-WARN_MANUALLY_CLOSE_APP_LAUNCH=${BrandFullName} is already running.\n\nPlease close ${BrandFullName} prior to launching the version you have just installed.
+WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
+WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
 WARN_DISK_SPACE=You don't have sufficient disk space to install to this location.\n\nClick OK to select a different location.
-WARN_UNSUPPORTED_MSG=Sorry, ${BrandShortName} can't be installed. This version of ${BrandShortName} requires ${MinUnsupportedVer} or newer.
-WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of ${BrandShortName}. Do you want to reboot now?
-WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of ${BrandShortName}. Do you want to reboot now?
+WARN_MIN_SUPPORTED_OS_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
+WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of $BrandShortName. Do you want to reboot now?
+WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
 ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
 ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
 
 UN_CONFIRM_PAGE_TITLE=Uninstall $BrandFullName
 UN_CONFIRM_PAGE_SUBTITLE=Remove $BrandFullName from your computer.
 UN_CONFIRM_UNINSTALLED_FROM=$BrandShortName will be uninstalled from the following location:
 UN_CONFIRM_CLICK=Click Uninstall to continue.
 
 BANNER_CHECK_EXISTING=Checking existing installation…
 
-STATUS_INSTALL_APP=Installing ${BrandShortName}…
+STATUS_INSTALL_APP=Installing $BrandShortName…
 STATUS_INSTALL_LANG=Installing Language Files (${AB_CD})…
-STATUS_UNINSTALL_MAIN=Uninstalling ${BrandShortName}…
+STATUS_UNINSTALL_MAIN=Uninstalling $BrandShortName…
 STATUS_CLEANUP=Cleaning up the birdcage…
 
 # _DESC strings support approximately 65 characters per line.
 # One line
 OPTIONS_SUMMARY=Choose the type of setup you prefer, then click Next.
 # One line
-OPTION_STANDARD_DESC=${BrandShortName} will be installed with the most common options.
+OPTION_STANDARD_DESC=$BrandShortName will be installed with the most common options.
 OPTION_STANDARD_RADIO=&Standard
 # Two lines
 OPTION_CUSTOM_DESC=You may choose individual options to be installed. Recommended for experienced users.
 OPTION_CUSTOM_RADIO=&Custom
--- a/mail/locales/en-US/installer/mui.properties
+++ b/mail/locales/en-US/installer/mui.properties
@@ -39,59 +39,58 @@
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
-# Do not replace $(^NameDA) or $(^Name) with a custom string.
-
-# Do not change $(^NameDA) to $(^Name) or $(^Name) to $(^NameDA). NameDA allows
-# Name to contain an ampersand (e.g. DA stands for double ampersand) and
-# prevents the letter following the ampersand being used as an accesskey.
+# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
+# custom string and always use the same one as used by the en-US files.
+# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
+# for double ampersand) and prevents the letter following the ampersand from
+# being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
-MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $(^NameDA) Setup Wizard
-MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $(^NameDA).\n\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
+MUI_TEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Setup Wizard
+MUI_TEXT_WELCOME_INFO_TEXT=This wizard will guide you through the installation of $BrandFullNameDA.\n\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without having to reboot your computer.\n\n$_CLICK
 MUI_TEXT_LICENSE_TITLE=License Agreement
-MUI_TEXT_LICENSE_SUBTITLE=Please review the license terms before installing $(^NameDA).
+MUI_TEXT_LICENSE_SUBTITLE=Please review the license terms before installing $BrandFullNameDA.
 MUI_INNERTEXT_LICENSE_TOP=Press Page Down to see the rest of the agreement.
-MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX=If you accept the terms of the agreement, click the check box below. You must accept the agreement to install $(^NameDA). $_CLICK
-MUI_INNERTEXT_LICENSE_BOTTOM_RADIOBUTTONS=If you accept the terms of the agreement, select the first option below. You must accept the agreement to install $(^NameDA). $_CLICK
+MUI_INNERTEXT_LICENSE_BOTTOM_CHECKBOX=If you accept the terms of the agreement, click the check box below. You must accept the agreement to install $BrandFullNameDA. $_CLICK
 MUI_TEXT_COMPONENTS_TITLE=Choose Components
-MUI_TEXT_COMPONENTS_SUBTITLE=Choose which features of $(^NameDA) you want to install.
+MUI_TEXT_COMPONENTS_SUBTITLE=Choose which features of $BrandFullNameDA you want to install.
 MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE=Description
 MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO=Position your mouse over a component to see its description.
 MUI_TEXT_DIRECTORY_TITLE=Choose Install Location
-MUI_TEXT_DIRECTORY_SUBTITLE=Choose the folder in which to install $(^NameDA).
+MUI_TEXT_DIRECTORY_SUBTITLE=Choose the folder in which to install $BrandFullNameDA.
 MUI_TEXT_INSTALLING_TITLE=Installing
-MUI_TEXT_INSTALLING_SUBTITLE=Please wait while $(^NameDA) is being installed.
+MUI_TEXT_INSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being installed.
 MUI_TEXT_FINISH_TITLE=Installation Complete
 MUI_TEXT_FINISH_SUBTITLE=Setup was completed successfully.
 MUI_TEXT_ABORT_TITLE=Installation Aborted
 MUI_TEXT_ABORT_SUBTITLE=Setup was not completed successfully.
 MUI_BUTTONTEXT_FINISH=&Finish
-MUI_TEXT_FINISH_INFO_TITLE=Completing the $(^NameDA) Setup Wizard
-MUI_TEXT_FINISH_INFO_TEXT=$(^NameDA) has been installed on your computer.\n\nClick Finish to close this wizard.
-MUI_TEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the installation of $(^NameDA). Do you want to reboot now?
+MUI_TEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Setup Wizard
+MUI_TEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been installed on your computer.\n\nClick Finish to close this wizard.
+MUI_TEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the installation of $BrandFullNameDA. Do you want to reboot now?
 MUI_TEXT_FINISH_REBOOTNOW=Reboot now
 MUI_TEXT_FINISH_REBOOTLATER=I want to manually reboot later
 MUI_TEXT_STARTMENU_TITLE=Choose Start Menu Folder
-MUI_TEXT_STARTMENU_SUBTITLE=Choose a Start Menu folder for the $(^NameDA) shortcuts.
+MUI_TEXT_STARTMENU_SUBTITLE=Choose a Start Menu folder for the $BrandFullNameDA shortcuts.
 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.
-MUI_TEXT_ABORTWARNING=Are you sure you want to quit $(^Name) Setup?
-MUI_UNTEXT_WELCOME_INFO_TITLE=Welcome to the $(^NameDA) Uninstall Wizard
-MUI_UNTEXT_WELCOME_INFO_TEXT=This wizard will guide you through the uninstallation of $(^NameDA).\n\nBefore starting the uninstallation, make sure $(^NameDA) is not running.\n\n$_CLICK
-MUI_UNTEXT_CONFIRM_TITLE=Uninstall $(^NameDA)
-MUI_UNTEXT_CONFIRM_SUBTITLE=Remove $(^NameDA) from your computer.
+MUI_TEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Setup?
+MUI_UNTEXT_WELCOME_INFO_TITLE=Welcome to the $BrandFullNameDA Uninstall Wizard
+MUI_UNTEXT_WELCOME_INFO_TEXT=This wizard will guide you through the uninstallation of $BrandFullNameDA.\n\nBefore starting the uninstallation, make sure $BrandFullNameDA is not running.\n\n$_CLICK
+MUI_UNTEXT_CONFIRM_TITLE=Uninstall $BrandFullNameDA
+MUI_UNTEXT_CONFIRM_SUBTITLE=Remove $BrandFullNameDA from your computer.
 MUI_UNTEXT_UNINSTALLING_TITLE=Uninstalling
-MUI_UNTEXT_UNINSTALLING_SUBTITLE=Please wait while $(^NameDA) is being uninstalled.
+MUI_UNTEXT_UNINSTALLING_SUBTITLE=Please wait while $BrandFullNameDA is being uninstalled.
 MUI_UNTEXT_FINISH_TITLE=Uninstallation Complete
 MUI_UNTEXT_FINISH_SUBTITLE=Uninstall was completed successfully.
 MUI_UNTEXT_ABORT_TITLE=Uninstallation Aborted
 MUI_UNTEXT_ABORT_SUBTITLE=Uninstall was not completed successfully.
-MUI_UNTEXT_FINISH_INFO_TITLE=Completing the $(^NameDA) Uninstall Wizard
-MUI_UNTEXT_FINISH_INFO_TEXT=$(^NameDA) has been uninstalled from your computer.\n\nClick Finish to close this wizard.
-MUI_UNTEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the uninstallation of $(^NameDA). Do you want to reboot now?
-MUI_UNTEXT_ABORTWARNING=Are you sure you want to quit $(^Name) Uninstall?
+MUI_UNTEXT_FINISH_INFO_TITLE=Completing the $BrandFullNameDA Uninstall Wizard
+MUI_UNTEXT_FINISH_INFO_TEXT=$BrandFullNameDA has been uninstalled from your computer.\n\nClick Finish to close this wizard.
+MUI_UNTEXT_FINISH_INFO_REBOOT=Your computer must be restarted in order to complete the uninstallation of $BrandFullNameDA. Do you want to reboot now?
+MUI_UNTEXT_ABORTWARNING=Are you sure you want to quit $BrandFullName Uninstall?
--- a/mail/locales/en-US/installer/override.properties
+++ b/mail/locales/en-US/installer/override.properties
@@ -36,55 +36,55 @@
 
 # LOCALIZATION NOTE:
 
 # This file must be saved as UTF8
 
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
-# Do not replace $(^NameDA) or $(^Name) with a custom string.
-
-# Do not change $(^NameDA) to $(^Name) or $(^Name) to $(^NameDA). NameDA allows
-# Name to contain an ampersand (e.g. DA stands for double ampersand) and
-# prevents the letter following the ampersand being used as an accesskey.
+# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
+# custom string and always use the same one as used by the en-US files.
+# $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
+# for double ampersand) and prevents the letter following the ampersand from
+# being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 # Strings that require a space at the end should be enclosed with double
 # quotes and the double quotes will be removed. To add quotes to the beginning
 # and end of a string enclose the strin with an additional double quote
 # (e.g. ""This will include quotes"").
 
-SetupCaption=$(^Name) Setup
-UninstallCaption=$(^Name) Uninstall
+SetupCaption=$BrandFullName Setup
+UninstallCaption=$BrandFullName Uninstall
 BackBtn=< &Back
 NextBtn=&Next >
 AcceptBtn=I &accept the terms in the License Agreement
 DontAcceptBtn=I &do not accept the terms in the License Agreement
 InstallBtn=&Install
 UninstallBtn=&Uninstall
 CancelBtn=Cancel
 CloseBtn=&Close
 BrowseBtn=B&rowse…
 ShowDetailsBtn=Show &details
 ClickNext=Click Next to continue.
 ClickInstall=Click Install to start the installation.
 ClickUninstall=Click Uninstall to start the uninstallation.
 Completed=Completed
-LicenseTextRB=Please review the license agreement before installing $(^NameDA). If you accept all terms of the agreement, select the first option below. $_CLICK
+LicenseTextRB=Please review the license agreement before installing $BrandFullNameDA. If you accept all terms of the agreement, select the first option below. $_CLICK
 ComponentsText=Check the components you want to install and uncheck the components you don't want to install. $_CLICK
 ComponentsSubText2_NoInstTypes=Select components to install:
-DirText=Setup will install $(^NameDA) in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
+DirText=Setup will install $BrandFullNameDA in the following folder. To install in a different folder, click Browse and select another folder. $_CLICK
 DirSubText=Destination Folder
-DirBrowseText=Select the folder to install $(^NameDA) in:
+DirBrowseText=Select the folder to install $BrandFullNameDA in:
 SpaceAvailable="Space available: "
 SpaceRequired="Space required: "
-UninstallingText=$(^NameDA) will be uninstalled from the following folder. $_CLICK
+UninstallingText=$BrandFullNameDA will be uninstalled from the following folder. $_CLICK
 UninstallingSubText=Uninstalling from:
 FileError=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Abort to stop the installation,\r\nRetry to try again, or\r\nIgnore to skip this file.
 FileError_NoIgnore=Error opening file for writing: \r\n\r\n$0\r\n\r\nClick Retry to try again, or\r\nCancel to stop the installation.
 CantWrite="Can't write: "
 CopyFailed=Copy failed
 CopyTo="Copy to "
 Registering="Registering: "
 Unregistering="Unregistering: "