From f5d0f40a3f20c55cbb60aeecf8aa4a9f623f1d1a Mon Sep 17 00:00:00 2001 From: Robert Strong Date: Fri, 2 Jan 2009 13:59:14 -0800 Subject: [PATCH] Bug 471367 - Change the property name WARN_UNSUPPORTED_MSG to WARN_MIN_SUPPORTED_OS_MSG. r=jmathies --- browser/installer/windows/nsis/defines.nsi.in | 2 +- browser/installer/windows/nsis/installer.nsi | 2 +- browser/locales/en-US/installer/custom.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/installer/windows/nsis/defines.nsi.in b/browser/installer/windows/nsis/defines.nsi.in index 32575b1addb..b119926d384 100755 --- a/browser/installer/windows/nsis/defines.nsi.in +++ b/browser/installer/windows/nsis/defines.nsi.in @@ -10,4 +10,4 @@ !define WindowClass "FirefoxMessageWindow" !define DDEApplication "Firefox" !define AppRegName "Firefox" -!define MinUnsupportedVer "Microsoft Windows 2000" +!define MinSupportedVer "Microsoft Windows 2000" diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index cb1c24d884d..be84a595d3b 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -760,7 +760,7 @@ 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" diff --git a/browser/locales/en-US/installer/custom.properties b/browser/locales/en-US/installer/custom.properties index d7787cb9bdb..3f275f56d07 100755 --- a/browser/locales/en-US/installer/custom.properties +++ b/browser/locales/en-US/installer/custom.properties @@ -77,7 +77,7 @@ WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with 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_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: