aviary branch landing - land installer localization changes

2025-02-04 21:18:35 +00:00 · 2004-12-02 00:52:27 +00:00 · 2004-12-02 00:52:27 +00:00 · 2edb5bc579
commit 2edb5bc579
parent 2c4c901bcc
13 changed files with 608 additions and 744 deletions
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@ -20,6 +20,7 @@
 #
 # Contributor(s):
 #  Brian Ryner <bryner@brianryner.com>
 #  Benjamin Smedberg <bsmedberg@covad.net>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@ -40,61 +41,23 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-NO_GECKO_SDK=1
+include $(DEPTH)/config/autoconf.mk
 NO_PKG_FILES = \
 	TestGtkEmbed \
 	bloaturls.txt \
 	codesighs* \
 	elf-dynstr-gc \
 	firefox-config \
 	mangle* \
 	maptsv* \
 	mfc* \
 	mkdepend* \
 	msdump* \
 	msmap* \
 	nm2tsv* \
 	nsinstall* \
 	regchrome* \
 	regxpcom* \
 	res/samples \
 	res/throbber \
 	shlibsign* \
 	winEmbed.exe \
 	xpcshell* \
 	xpidl* \
 	xpt_dump* \
 	xpt_link* \
 	chrome/chrome.rdf \
 	$(NULL)
-include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
-ifeq ($(OS_ARCH), Darwin)
+include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
 MOZ_PKG_APPNAME = Firefox
 endif
-include $(DEPTH)/xpinstall/packager/Makefile
+installer:
-
+ifdef INSTALLER_DIR
-# Rename the archive after it's created, so that we can differentiate between
+	$(MAKE) -C $(INSTALLER_DIR)
 # the gtk1 and gtk2 packages on ftp, and so the Windows package has a
 # friendlier name.
 ifeq ($(OS_ARCH)_$(TARGET_CPU)_$(MOZ_WIDGET_TOOLKIT)_$(MOZ_ENABLE_XFT), Linux_i686_gtk2_1)
 PACKAGE_NAME = firefox-i686-linux-gtk2+xft.tar.gz
 else
 ifeq ($(OS_ARCH), WINNT)
 PACKAGE_NAME = Firefox-win32.zip
 else
 ifeq ($(OS_ARCH), Darwin)
 PACKAGE_NAME = Firefox-mac.dmg.gz
 endif
 endif
 endif
 ifdef PACKAGE_NAME
 libs:: $(PACKAGE)
 	@rm -f $(DIST)/$(PACKAGE_NAME)
 	@mv $(DIST)/$(PACKAGE) $(DIST)/$(PACKAGE_NAME)
 endif
--- a/browser/installer/unix/Makefile.in
+++ b/browser/installer/unix/Makefile.in
@ -42,14 +42,43 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
-CONFIG_DIR = $(shell pwd)
+include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 CONFIG_DIR = $(shell pwd)/instgen
 ABS_topsrcdir = $(shell cd $(topsrcdir) && pwd)
 ABS_depth = $(shell cd $(DEPTH) && pwd)
-installer: installer.cfg firefox.manifest
+LOCALIZED_FILES = \
-ifneq ($(ABS_topsrcdir),$(ABS_depth))
+	install.it \
-	ln -sf $(srcdir)/*.jst $(srcdir)/*.it $(srcdir)/packages* .
+	$(NULL)
-endif
+
 PP_LOCALIZED_FILES = \
 	packages-static \
 	installer.cfg \
 	config.it \
 	$(NULL)
 INSTALLER_FILES = \
 	abe.jst \
 	adt.jst \
 	browser.jst \
 	help.jst \
 	talkback.jst \
 	xpcom.jst \
 	$(NULL)
 AB_CD = $(MOZ_UI_LOCALE)
 DEFINES += -DAB_CD=$(AB_CD) -DPKG_BASENAME=$(PKG_BASENAME)
 installer:
 	$(NSINSTALL) -D instgen
 	$(INSTALL) $(addprefix $(topsrcdir)/toolkit/locales/$(AB_CD)/installer/unix/,$(LOCALIZED_FILES)) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) instgen
 	$(EXIT_ON_ERROR) \
 	for i in $(PP_LOCALIZED_FILES); do \
 	  $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/browser/locales/$(AB_CD)/installer/installer.inc $(srcdir)/$$i > instgen/$$i; \
 	done
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/browser/locales/$(AB_CD)/defines.inc $(srcdir)/ab-CD.jst > instgen/$(AB_CD).jst
 ifndef MOZ_USE_OFFICIAL_BRANDING
 	$(NSINSTALL) -D $(DIST)/install
 	cp $(srcdir)/header.png $(DIST)/install/header.png
@ -57,19 +86,4 @@ ifndef MOZ_USE_OFFICIAL_BRANDING
 endif
 	$(PERL) $(topsrcdir)/toolkit/mozapps/installer/build_static.pl -config $(CONFIG_DIR) -objdir $(ABS_depth) -srcdir $(ABS_topsrcdir)
 ifeq ($(OS_ARCH)_$(TARGET_CPU)_$(MOZ_WIDGET_TOOLKIT)_$(MOZ_ENABLE_XFT), Linux_i686_gtk2_1)
 INSTALLER_NAME = firefox-i686-linux-gtk2+xft-installer
 else
 INSTALLER_NAME = firefox-$(TARGET_CPU)-$(TARGET_VENDOR)-$(TARGET_OS)-installer
 endif
 installer.cfg: installer.cfg.in
 	sed -e 's/\$$INSTALLER_NAME\$$/$(INSTALLER_NAME)/' $^ > $@
 # Create a manifest for use with codesighs, by stripping "bin/" off of the
 # beginning of lines in the packages file.
 firefox.manifest: packages-static
 	grep "^bin/" $^ | sed "s?^bin/??" > $@
 include $(topsrcdir)/config/rules.mk
--- a/browser/installer/unix/browser.jst
+++ b/browser/installer/unix/browser.jst
@ -45,6 +45,10 @@ function upgradeCleanup()
  deleteThisFile("Program",	      "defaults/profile/panels.rdf");
  deleteThisFolder("Program",	    "defaults/profile/US");
  // These files are related to app patches and will interfere with the 
  // UA/app version strings if we do not remove them. 
  deleteThisFile("Program",	    "defaults/pref/bug259708.js");
  // Remove defunct miscellany
  deleteThisFolder("Program",     "ipc");
  deleteThisFile("Program",       "mangle");
@ -56,7 +60,7 @@ function upgradeCleanup()
 var srDest = $SpaceRequired$;
-var err = initInstall("$ProductName$", "Firefox", "$Version$"); 
+var err = initInstall("$ProductName$", "Browser", "$Version$"); 
 logComment("initInstall: " + err);
 var communicatorFolder = getFolder("Program");
--- a/browser/installer/unix/config.it
+++ b/browser/installer/unix/config.it
@ -1,3 +1,5 @@
 #filter substitution
 [General]
 ; Run Mode values:
 ;   Normal - Shows all dialogs.  Requires user input.
@ -183,51 +185,35 @@ Verify Existence=
 [Dialog Welcome]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SETUP_TITLE@
-Title=$ProductName$ Setup
+MessageWelcome=@SETUP_WELCOME@
-;*** LOCALIZE ME BABY ***
+Message0=@SETUP_MESSAGE0@
-MessageWelcome=Welcome to %s.
+Message1=@SETUP_MESSAGE1_UNIX@
-;*** LOCALIZE ME BABY ***
+Message2=@SETUP_MESSAGE2@
-Message0=You are about to install %s $Version$.
+Message3=@SETUP_MESSAGE3@
 ;*** LOCALIZE ME BABY ***
 Message1=It is strongly recommended that you exit all instances of %s before running this Setup program.
 ;*** LOCALIZE ME BABY ***
 Message2=Click Cancel to quit Setup and then close any programs you have running.  Click Next to continue the Setup program.
 ;*** LOCALIZE ME BABY ***
 Message3=Click Next to continue installing %s $Version$.
 Watermark=watermark.png
 [Dialog License]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@LICENSE_TITLE@
-Title=Software License Agreement
+Sub Title=@LICENSE_SUBTITLE@
 ;*** LOCALIZE ME BABY ***
 Sub Title=Terms and conditions for using this software.
 License File=license.txt
-;*** LOCALIZE ME BABY ***
+Message0=@LICENSE_MESSAGE0@
-Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement.
+RadioAccept=@LICENSE_ACCEPT@
-;*** LOCALIZE ME BABY ***
+RadioDecline=@LICENSE_DECLINE@
 RadioAccept=I Accept the terms of the License Agreement
 ;*** LOCALIZE ME BABY ***
 RadioDecline=I do NOT Accept the terms of the License Agreement
 [Dialog Setup Type]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SETUP_TYPE_TITLE@
-Title=Setup Type
+Sub Title=@SETUP_TYPE_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@SETUP_TYPE_MESSAGE0@
-Sub Title=Choose setup options.
+MessageExistingInstall=@SETUP_TYPE_EXISTING@
 ;*** LOCALIZE ME BABY ***
 Message0=Choose the type of Setup you prefer, then click Next.
 MessageExistingInstall=The selected directory already contains a Firefox installation. To delete %s completely, please press the 'Delete Directory' button. Your Firefox settings should not be affected. Or, please press the 'Cancel' button and choose a different destination directory.
 ; at least one Setup Type needs to be set, and up to 4 can be
 ; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3).
 [Setup Type0]
-;*** LOCALIZE ME BABY ***
+Description Short=@TYPE_STANDARD@
-Description Short=&Standard
+Description Long=@TYPE_STANDARD_DESC@
 ;*** LOCALIZE ME BABY ***
 Description Long=Browser will be installed with the most common options.
 ; List of components to install/enable for this Setup Type.
 ; All other components not listed here will be disabled if
@ -235,132 +221,100 @@ Description Long=Browser will be installed with the most common options.
 C0=Component XPCOM
 C1=Component Browser
 ;C2=Component Uninstaller
-C2=Component US English Profile Defaults
+C2=Component Langpack
-C3=Component En US lang pack
+C3=Component Help
 C4=Component US region pack
 C5=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-C6=Component QFA
+C4=Component QFA
 [Setup Type1]
-;*** LOCALIZE ME BABY ***
+Description Short=@TYPE_CUSTOM@
-Description Short=&Custom
+Description Long=@TYPE_CUSTOM_DESC@
 ;*** LOCALIZE ME BABY ***
 Description Long=You may choose individual options to be installed. Recommended for experienced users. 
 ; List of components to install/enable for this Setup Type.
 ; All other components not listed here will be disabled if
 ; this Setup Type is selected.
 C0=Component XPCOM
 C1=Component Browser
-C2=Component ABE
+C2=Component ADT
-C3=Component ADT
+;C3=Component Uninstaller
-;C4=Component Uninstaller
+C3=Component Langpack
-C4=Component US English Profile Defaults
+C4=Component Help
 C5=Component En US lang pack
 C6=Component US region pack
 C7=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-C8=Component QFA
+C5=Component QFA
 [Dialog Select Components]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SELECT_TITLE@
-Title=Select Components
+Sub Title=@SELECT_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@SELECT_MESSAGE0@
 Sub Title=Additional components that enhance $ProductName$.
 ;*** LOCALIZE ME BABY ***
 Message0=Choose additional components you want to install, then click Next.
 [Dialog Select Install Path]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@LOCATION_TITLE@
-Title=Install Folder
+Sub Title=@LOCATION_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@LOCATION_MESSAGE0@
 Sub Title=Where $ProductName$ will be installed.
 ;*** LOCALIZE ME BABY ***
 Message0=$ProductName$ will be installed into the following folder:
 [Dialog Upgrade]
 Show Dialog=FALSE
 Show In Easy Install=FALSE
-;*** LOCALIZE ME BABY ***
+Title=@UPGRADE_TITLE@
-Title=Upgrade
+Sub Title=@UPGRADE_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message Cleanup=@UPGRADE_CLEANUP@
 Sub Title=Upgrades an existing $ProductName$ installation.
 ;*** LOCALIZE ME BABY ***
 Message Cleanup=A previous $ProductNameInternal$ installation has been found in the chosen folder.
 ; XXXben - we need a strategy for uninstallation that obviates the need for "Safe Upgrade" which can doing nasty things if you have installed the app into a stupid location.
-;*** LOCALIZE ME BABY ***
+
-;Checkbox Clean Install=Perform a Safe Upgrade
+Checkbox Clean Install=@UPGRADE_CLEAN@
-Checkbox Clean Install=Perform a Clean Install
+Message Clean Install=@UPGRADE_CLEAN_MSG@
-;*** LOCALIZE ME BABY ***
+Message Install Over=@UPGRADE_OVER@
-;Message Clean Install=A Safe Upgrade will completely remove the old installation. Any third party components you have installed will be lost. This is recommended as it may prevent incompatibilities. 
+Message Install Over Windir=@UPGRADE_OVER_WINDIR@
-Message Clean Install=A Clean Install will COMPLETELY REMOVE the contents of the install folder! Any third party components you have installed will be lost. This is recommended as it may prevent incompatibilities. (XXXben) 
+; xxxbsmedberg this doesn't make sense in the unix installer
 ;*** LOCALIZE ME BABY ***
 ;Message Install Over=If you choose not to perform a Safe Upgrade, third party components will not be removed, which may cause unpredictable behavior. 
 Message Install Over=If you choose not to perform a Clean Install, third party components will not be removed, which may cause unpredictable behavior. 
 ;*** LOCALIZE ME BABY ***
 Message Install Over Windir=A Safe Upgrade of $ProductNameInternal$ cannot be performed because the program is installed within the Windows folder. It is recommended that you choose another folder to install $ProductNameInternal$ into. 
 [Dialog Select Additional Components]
 Show Dialog=FALSE
-;*** LOCALIZE ME BABY ***
+Title=@ADD_TITLE@
-Title=$ProductName$ Setup - Select Additional Components
+Message0=@ADD_MESSAGE0@
 ;*** LOCALIZE ME BABY ***
 Message0=Select or clear the additional components you want to install.
 [Dialog Windows Integration]
 ; Note - this dialog isn't actually used yet!
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@WININT_TITLE@
-Title=Windows Integration
+Sub Title=@WININT_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@WININT_MESSAGE0@
 Sub Title=Create Shortcuts and set Default Browser
 ;*** LOCALIZE ME BABY ***
 Message0=Create %s shortcuts:
 ; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
 ; shows up as a checkbox in the Windows Integration dialog.
 [Windows Integration-Item0]
 CheckBoxState=TRUE
-;*** LOCALIZE ME BABY ***
+Description=@WININT_DESKTOP@
 Description=On my Desktop
 Archive=
 [Windows Integration-Item1]
 CheckBoxState=TRUE 
 ;*** LOCALIZE ME BABY ***
-Description=In my Start Menu Programs folder
+Description=@WININT_START@
 Archive=
 [Windows Integration-Item2]
 CheckBoxState=TRUE
 ;*** LOCALIZE ME BABY ***
-Description=In my Quick Launch bar
+Description=@WININT_QUICKL@
 Archive=
 [Windows Integration-Item3]
 CheckBoxState=TRUE
-;*** LOCALIZE ME BABY ***
+Description=@USE_AS_DEFAULT@
 Description=Use %s as my Default Browser.
 Archive=
 [Dialog Program Folder]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@WININT_PFOLDER_TITLE@
-Title=$ProductName$ Setup - Select Program Folder
+Message0=@WININT_PFOLDER_MESSAGE0@
 ;*** LOCALIZE ME BABY ***
 Message0=Setup will add program icons to the Program Folder listed below.  You may type a new folder name, or select one from the Existing Folders list.  Click Next to continue.
 [Dialog Additional Options]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@ADDL_OPTIONS_TITLE@
-Title=$ProductName$ Setup - Additional Options
+Message1=@ADDL_OPTIONS_MSG1@
 ;*** LOCALIZE ME BABY ***
 Message1=Select the following option if you wish to save downloaded Setup files on your own computer.  This allows you to re-run Setup without downloading the files again.  The Setup files will be saved to the path below.
 Save Installer=
 ; The following settings control whether the Recapture Homepage checkbox is displayed.
 ;    For this option to work the file nsResetPref.js must be installed into the 
@ -372,10 +326,8 @@ Recapture Homepage=FALSE
 [Dialog Advanced Settings]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@ADV_SETTINGS_TITLE@
-Title=$ProductName$ Setup - Advanced Settings
+Message0=@ADV_SETTINGS_MSG@
 ;*** LOCALIZE ME BABY ***
 Message0=If your Internet connection requires a proxy server, enter your server name and port information.  If your Internet connection doesn't require a proxy server, leave the fields blank.
 Proxy Server=
 Proxy Port=
 Proxy User=
@ -414,66 +366,43 @@ Turbo Mode Enabled=TRUE
 [Dialog Start Install]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@START_TITLE@
-Title=Summary
+Sub Title=@START_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message Install=@START_INSTALL@
-Sub Title=Ready to start installing $ProductName$.
+Message Download=@START_DOWNLOAD@
-;*** LOCALIZE ME BABY ***
+Message0=@START_MESSAGE0@
 Message Install=Setup will now install the following components:
 ;*** LOCALIZE ME BABY ***
 Message Download=Setup will now download and install the following components:
 ;*** LOCALIZE ME BABY ***
 Message0=Click Install to continue.
 XPInstall Engine=xpcom.xpi
 [Dialog Downloading]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@DL_TITLE@
-Title=Downloading
+Sub Title=@DL_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Blurb=@DL_BLURB@
-Sub Title=Downloading required components...
+File Name=@DL_FILENAME@
-;*** LOCALIZE ME BABY ***
+Time Remaining=@DL_TIMELEFT@
 Blurb=Setup is downloading the files required to install $ProductName$.
 ;*** LOCALIZE ME BABY ***
 File Name=Currently Downloading:
 ;*** LOCALIZE ME BABY ***
 Time Remaining=Time Remaining:
 [Dialog Installing]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@INSTALL_TITLE@
-Title=Installing
+Sub Title=@INSTALL_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Blurb=@INSTALL_BLURB@
-Sub Title=Installing $ProductName$...
+Status File=@INSTALL_STATUSFILE@
-;*** LOCALIZE ME BABY ***
+Status Component=@INSTALL_STATUSCOMP@
 Blurb=Setup is installing application files. 
 ;*** LOCALIZE ME BABY ***
 Status File=Preparing File:
 ;*** LOCALIZE ME BABY ***
 Status Component=Currently Installing:
 [Dialog Install Successful]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@COMPLETE_TITLE@
-Title=Install Complete
+MessageHeader=@COMPLETE_TITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@COMPLETE_MESSAGE0@
-MessageHeader=Install Complete
+Message1=@COMPLETE_MESSAGE1@
-;*** LOCALIZE ME BABY ***
+Launch App=@COMPLETE_LAUNCH@
 Message0=%s $Version$ was successfully installed.
 ;*** LOCALIZE ME BABY ***
 Message1=Click Finish to complete Setup. 
 ;*** LOCALIZE ME BABY ***
 Launch App=Launch %s $Version$ now.
 Launch App Checked=TRUE
 [Dialog Download]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@DL2_TITLE@
-Title=$ProductName$ Setup - Download
+Message Download0=@DL2_MESSAGE0@
-;*** LOCALIZE ME BABY ***
+Message Retry0=@DL2_RETRY@
 Message Download0=Setup is downloading the required files now.  This may take some time depending on your network connection speed.
 ;*** LOCALIZE ME BABY ***
 Message Retry0=Some files have failed the CRC check and are being downloaded again.  Only those files that have failed will be downloaded.
 [Dialog Reboot]
 ; Show Dialog values are:
@ -491,12 +420,9 @@ Class Name=MozillaMessageWindow
 Window Name=
 Process Name=$MainExeFile$
 Pretty Name=$ProductNameInternal$
-;*** LOCALIZE ME BABY ***
+Message=@CLOSE_CHECK@
-Message=Download of $ProductName$ was successful. $ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation.
+Message Full Installer=@CLOSE_CHECK2@
-;*** LOCALIZE ME BABY ***
+Message wait=@CLOSE_WAIT@
 Message Full Installer=$ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation.
 ;*** LOCALIZE ME BABY ***
 Message wait=Shutting down $ProductNameInternal$.  Please wait...
 ; This key indicates whether or not to close all the windows associated with
 ; the process id of this app instance window found.
@ -634,9 +560,8 @@ Extra Cmd1 Parameter=-kill
 ;for it's xpinstall engine from the TEMP dir.  The files that
 ;this component has are already in Component GRE.
 [Component XPCOM]
-Description Short=Cross Platform COM
+Description Short=@XPCOM_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@XPCOM_SHORT@
 Description Long=Cross Platform COM
 Archive=xpcom.xpi
 $InstallSize$:xpcom
 $InstallSizeSystem$
@ -645,9 +570,8 @@ Attributes=SELECTED|INVISIBLE
 FileCount=$FileCount$
 [Component Browser]
-Description Short=$ProductName$ Browser
+Description Short=@BROWSER_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@BROWSER_SHORT@
 Description Long=The $ProductName$ Browser
 Archive=browser.xpi
 $InstallSize$:browser
 $InstallSizeSystem$
@ -656,21 +580,9 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE|MAIN_COMPONENT
 Force Upgrade File0=[SETUP PATH]\$MainExeFile$
 FileCount=$FileCount$
 [Component ABE]
 Description Short=Additional Browsing Enhancements
 ;*** LOCALIZE ME BABY ***
 Description Long=Additional tools including mouse-gesture navigation, a site navigation bar and other enhanced functionality. 
 Archive=abe.xpi
 $InstallSize$:abe
 $InstallSizeSystem$
 $InstallSizeArchive$:abe.xpi
 Attributes=VISIBLE|DISABLED
 FileCount=$FileCount$
 [Component ADT]
-Description Short=Developer Tools
+Description Short=@ADT_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@ADT_LONG@
 Description Long=Tools for web developers including an error console, the Document Inspector and a JavaScript Debugger. 
 Archive=adt.xpi
 $InstallSize$:adt
 $InstallSizeSystem$
@ -681,9 +593,8 @@ Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar
 FileCount=$FileCount$
 [Component Help]
-Description Short=$ProductName$ Help
+Description Short=@HELP_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@HELP_SHORT@
 Description Long=Offline Help for learning about and using $ProductName$.
 Archive=help.xpi
 $InstallSize$:help
 $InstallSizeSystem$
@ -693,9 +604,8 @@ Force Upgrade File0=[SETUP PATH]\chrome\help.jar
 FileCount=$FileCount$
 [Component Uninstaller]
-Description Short=$CompanyName$ Uninstaller
+Description Short=@UNINSTALL_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@UNINSTALL_SHORT@
 Description Long=Uninstaller for $ProductName$
 Archive=$UninstallFileZip$
 $InstallSize$:$UninstallFileZip$
 $InstallSizeSystem$
@ -709,48 +619,20 @@ FileCount=$FileCount$
 [Component Uninstaller-Destination Path0]
 Path=[WINDIR]
-[Component US English Profile Defaults]
+[Component Langpack]
-Description Short=US English Defaults
+Description Short=@AB_CD@ @LANGPACK_TITLE@
-;*** LOCALIZE ME BABY ***
+Description Long=@AB_CD@ @LANGPACK_TITLE@
-Description Long=US English Default Profile Data
+Archive=@AB_CD@.xpi
-Archive=deflenus.xpi
+$InstallSize$:@AB_CD@
 $InstallSize$:deflenus
 $InstallSizeSystem$
-$InstallSizeArchive$:deflenus.xpi
+$InstallSizeArchive$:@AB_CD@.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
-Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html
+Force Upgrade File0=[SETUP PATH]\chrome\@AB_CD@.jar
 FileCount=$FileCount$
 [Component En US lang pack]
 ;*** LOCALIZE ME BABY ***
 Description Short=English (US) Language Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=English (US) Language Pack
 Archive=langenus.xpi
 $InstallSize$:langenus
 $InstallSizeSystem$
 $InstallSizeArchive$:langenus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar
 FileCount=$FileCount$
 [Component US region pack]
 ;*** LOCALIZE ME BABY ***
 Description Short=US Region Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=Regional content for US users
 Archive=regus.xpi
 $InstallSize$:regus
 $InstallSizeSystem$
 $InstallSizeArchive$:regus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\US.jar
 FileCount=$FileCount$
 [Component QFA]
-Description Short=Quality Feedback Agent
+Description Short=@QFA_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@QFA_LONG@
 Description Long=for reporting $ProductName$ crash information
 Archive=talkback.xpi
 $InstallSize$:talkback
 $InstallSizeSystem$
@ -763,15 +645,14 @@ FileCount=$FileCount$
 ; This particular value will set the checkbox checked [number]% of the time.
 ; This logic is done only during the initialization of setup, not in any
 ; particular dialog.
-Random Install Percentage=100
+Random Install Percentage=20
 [Core]
 Source=[XPI PATH]\xpcom.xpi
 Destination=[WIZTEMP]\xpcom.ns
 $InstallSize$:xpcom
 Cleanup=TRUE
-;*** LOCALIZE ME BABY ***
+Message=@CORE_PREPARING@
 Message=Preparing Install, please wait...
 ; Status= values: Disabled, Enabled
 ; If nothing is set, default value is Enabled.  If set to Disabled,
 ; it will then use GRE as the xpinstall engine, in which case, there
@ -819,7 +700,7 @@ Timing=post smartupdate
 Source=[XPI PATH]\$UninstallFileZip$
 Destination=[WINDIR]
 ;*** LOCALIZE ME BABY ***
-Message=Installing the uninstaller, please wait...
+Message=@INST_UNINST@
 Only If Exists=FALSE
@ -1234,58 +1115,34 @@ Restricted Access=ONLY_RESTRICTED
 ;Icon Id=0
 [Strings]
-;*** LOCALIZE ME BABY ***
+Message Unfinished Download Restart=@MSG_UNFINISHED_DL@
-Message Unfinished Download Restart=A previous session of Setup did not finish downloading all the necessary files.  Would you like to use the files previously downloaded, to avoid downloading them again?
+Message Unfinished Install Xpi Restart=@MSG_UNFINISHED_INSTALL@
-;*** LOCALIZE ME BABY ***
+Error Corrupted Archives Detected=@MSG_CORRUPTED@
-Message Unfinished Install Xpi Restart=A previous session of Setup did not finish with installation of all the necessary files.  Would you like to use the files previously downloaded, to avoid downloading them again?
+Error Corrupted Archives Detected AUTO mode=@MSG_CORRUPTED_AUTO@
-;*** LOCALIZE ME BABY ***
+Error Too Many CRC Failures=@MSG_TOO_MANY_CRC@
-Error Corrupted Archives Detected=Setup has detected that the following archives within this Setup are corrupted:%sYou will need to obtain another copy of the $ProductName$ Setup in order for installation to proceed.
+Error Too Many Network Errors=@MSG_TOO_MANY_NETWORK@
-;*** LOCALIZE ME BABY ***
+Message Verifying Archives=@MSG_VERIFYING@
-Error Corrupted Archives Detected AUTO mode=Setup has detected that at least one archive within this Setup is corrupt.  You will need to obtain another copy of the $ProductName$ Setup in order for installation to proceed.
+Error Undefined=@MSG_UNDEFINED@
-;*** LOCALIZE ME BABY ***
+Error Out Of Memory=@MSG_OOM@
-Error Too Many CRC Failures=Too many download failures.  Setup will cancel.  Any files already downloaded will not be deleted.  The next time Setup is run, these files will be taken into account during the download.
+Status Download=@MSG_STATUS_DL@
-;*** LOCALIZE ME BABY ***
+Status Retry=@MSG_STATUS_DL@
 Error Too Many Network Errors=Too many network errors trying to download %s.  Setup will now Pause.  Please click Resume to retry downloading the files.
 ;*** LOCALIZE ME BABY ***
 Message Verifying Archives=Verifying integrity of archives, please wait...
 ;*** LOCALIZE ME BABY ***
 Error Undefined=Error undefined
 ;*** LOCALIZE ME BABY ***
 Error Out Of Memory=Out of memory!
 ;*** LOCALIZE ME BABY ***
 Status Download=%s at %.2f KB/sec (%u KB of %u KB downloaded)
 ;*** LOCALIZE ME BABY ***
 Status Retry=%s at %.2f KB/sec (%u KB of %u KB downloaded)
 ;*** LOCALIZE ME BABY ***
 Status File Info=%s
 ;*** LOCALIZE ME BABY ***
 Status Percentage Completed=%d%%
-;*** LOCALIZE ME BABY ***
+Dialog Download Title Minimized=@MSG_COMPLETED@
-Dialog Download Title Minimized=%d%% completed
+STR Force Upgrade Required=@MSG_REQUIRED@
-;*** LOCALIZE ME BABY ***
+Message Cancel Setup AUTO mode=@MSG_CANCELING@
-STR Force Upgrade Required=(Required)
+Error File Uncompress=@MSG_ERROR_UNCOMPRESS@
-;*** LOCALIZE ME BABY ***
+UsageMsg Usage=@MSG_USAGE@
-Message Cancel Setup AUTO mode=Canceling Setup, please wait...
+IDC Use FTP=@MSG_USE_FTP@
-;*** LOCALIZE ME BABY ***
+IDC Use HTTP=@MSG_USE_HTTP@
-Error File Uncompress=Error uncompressing file %s: %d
+IDC Save Installer Files=@MSG_SAVE_LOCALLY@
 ;*** LOCALIZE ME BABY ***
 UsageMsg Usage=Usage: %s [options]\n	[options] can be any of the following combination:\n		-h: This help.\n		-a [path]: Alternate archive search path.\n		-app [app id]: ID of application which is launching the installer (shared installs)\n		-app_path [app]: Points to (full path) representative file of application (Shared installs)\n	*	-dd [path]: Suggested install destination directory. (Shared installs)\n	*	-greLocal: Forces GRE to be installed into the application dir.\n	*	-greShared: Forces GRE to be installed into a global, shared dir (normally)\n			c:\program files\common files\mozilla.org\GRE\n		-reg_path [path]: Where to make entries in the Windows registry. (Shared installs)\n		-f: Force install of GRE installer (Shared installs), though it'll work\n			for non GRE installers too.\n		-greForce: Force 'Component GRE' to be downloaded, run, and installed.  This\n			bypasses GRE's logic of determining when to install by running its\n			installer with a '-f' flag.\n		-n [filename]: Setup's parent process filename.\n	*	-ma: Run setup in Auto mode.\n	*	-ms: Run setup in Silent mode.\n		-ira: Ignore the [RunAppX] sections\n		-ispf: Ignore the [Program FolderX] sections that show\n			the Start Menu shortcut folder at the end of installation.\n	*	-showBanner: Show the banner image in the download and install progress dialogs\n	*	-hideBanner: Hide the banner image in the download and install progress dialogs\n	*	-cleanupOnUpgrade: Tells Setup to check to see if user is upgrading (installing on top\n		of previous version of product).  If user is upgrading:\n			* NORMAL mode: prompt user on how to proceed\n			* All other modes: assume user wants to cleanup.\n	*	-noCleanupOnUpgrade: Tells Setup to not check if user is upgrading (installing on top\n		of previous version of product).  This will disable the cleanup feature.\n\n	* means it will override config.ini
 ;*** LOCALIZE ME BABY ***
 IDC Use FTP=Use &FTP for downloading files
 ;*** LOCALIZE ME BABY ***
 IDC Use HTTP=Use &HTTP for downloading files
 ;*** LOCALIZE ME BABY ***
 IDC Save Installer Files=&Save installer files locally
 ;*** LOCALIZE ME BABY ***
 IDC Recapture Homepage=&Make Netscape.com my home page
 ;*** LOCALIZE ME BABY ***
 IDC Turbo Mode=&Use Quick Launch for faster startup times when possible
-;*** LOCALIZE ME BABY ***
+Message Download Paused=@MSG_DL_PAUSED@
-Message Download Paused=Setup has encountered a network problem and has paused the download.  If you have just lost your network connection, please click Resume once your network has been reestablished.
+Message NORMAL Restricted Access=@MSG_NOT_ADMIN@
-;*** LOCALIZE ME BABY ***
+Message AUTO Restricted Access=@MSG_NOT_ADMIN_AUTO@
 Message NORMAL Restricted Access=Setup has detected that you do not have the appropriate Administrator privileges to this system.  It is highly recommended that you do not continue with the installation of $ProductName$, or it may not function properly.  Would you still like to continue?
 ;*** LOCALIZE ME BABY ***
 Message AUTO Restricted Access=Setup has detected that you do not have the appropriate Administrator privileges to this system.  Setup cannot continue with the installation of $ProductName$.
 [Site Selector]
--- a/browser/installer/unix/help.jst
+++ b/browser/installer/unix/help.jst
@ -1,4 +1,4 @@
-var err = initInstall("$ProductName$ Help", "Help", "$Version$"); 
+var err = initInstall("$ProductName$ Help", "help", "$Version$"); 
 logComment("initInstall: " + err);
 addFile("$ProductName$ Help",
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@ -8,22 +8,16 @@
 ; ; file comment
 ;
 #filter substitution
 bin/.autoreg
-[langenus]
+[@AB_CD@]
-; en-US 
+bin/chrome/@AB_CD@.jar
-bin/chrome/en-US.jar
+bin/defaults/pref/firefox-l10n.js
-bin/chrome/en-unix.jar
+; If you add a new directory you must explicitly call addDirectory in ab-CD.jst
-
+bin/browserconfig.properties
 [regus]
 ; US
 ; If you add a new directory you must explicitly call addDirectory in regus.jst
 bin/chrome/US.jar
 bin/defaults/profile/US/*
 bin/searchplugins/*
 [deflenus]
 ; Default files for US
 bin/defaults/profile/bookmarks.html
 bin/defaults/profile/localstore.rdf
 bin/defaults/profile/prefs.js
@ -31,15 +25,14 @@ bin/defaults/profile/search.rdf
 bin/defaults/profile/mimeTypes.rdf
 bin/defaults/profile/extensions/Extensions.rdf
 bin/defaults/profile/extensions/installed-extensions.txt
 bin/defaults/profile/extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf
 bin/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 bin/defaults/profile/chrome/*
 [xpcom]
 bin/libmozjs.so
 bin/libplc4.so
 bin/libplds4.so
 bin/libxpcom.so
 bin/libxpcom_core.so
 bin/libxpistub.so
 bin/libnspr4.so
 bin/components/libxpinstall.so
@ -60,7 +53,6 @@ bin/xpicleanup
 bin/components/accessibility.xpt
 bin/components/accessibility-atk.xpt
 bin/components/appshell.xpt
 bin/components/appstartup.xpt
 bin/components/autocomplete.xpt
 bin/components/autoconfig.xpt
 bin/components/bookmarks.xpt
@ -89,10 +81,12 @@ bin/components/dom_views.xpt
 bin/components/dom_xbl.xpt
 bin/components/dom_xpath.xpt
 bin/components/dom_xul.xpt
 bin/components/dom_loadsave.xpt
 bin/components/downloads.xpt
 bin/components/editor.xpt
 bin/components/embed_base.xpt
 bin/components/exthandler.xpt
 bin/components/fastfind.xpt
 bin/components/filepicker.xpt
 bin/components/find.xpt
 bin/components/gfx.xpt
@ -124,6 +118,7 @@ bin/components/necko_dns.xpt
 bin/components/necko_file.xpt
 bin/components/necko_ftp.xpt
 bin/components/necko_http.xpt
 bin/components/necko_jar.xpt
 bin/components/necko_res.xpt
 bin/components/necko_socket.xpt
 bin/components/necko_strconv.xpt
@ -133,13 +128,11 @@ bin/components/oji.xpt
 bin/components/passwordmgr.xpt
 bin/components/plugin.xpt
 bin/components/prefetch.xpt
 bin/components/prefmigr.xpt
 bin/components/pref.xpt
 bin/components/profile.xpt
 bin/components/progressDlg.xpt
 bin/components/proxyObjInst.xpt
 bin/components/rdf.xpt
 bin/components/related.xpt
 bin/components/satchel.xpt
 bin/components/search.xpt
 bin/components/shistory.xpt
@ -147,8 +140,6 @@ bin/components/sidebar.xpt
 bin/components/toolkitprofile.xpt
 bin/components/txtsvc.xpt
 bin/components/txmgr.xpt
 bin/components/typeaheadfind.xpt
 bin/components/ucnative.xpt
 bin/components/uconv.xpt
 bin/components/unicharutil.xpt
 bin/components/uriloader.xpt
@ -226,6 +217,7 @@ bin/res/ua.css
 bin/res/html.css
 bin/res/quirk.css
 bin/res/forms.css
 bin/res/platform-forms.css
 bin/res/EditorOverride.css
 bin/res/table-add-column-after-active.gif
 bin/res/table-add-column-after-hover.gif
--- a/browser/installer/windows/Makefile.in
+++ b/browser/installer/windows/Makefile.in
@ -42,11 +42,53 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
-CONFIG_DIR=$(shell cygpath -a $(srcdir))
+include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 CONFIG_DIR=$(shell cygpath -a instgen)
 OBJ_DIR=$(shell cygpath -a $(DEPTH))
 SRC_DIR=$(shell cygpath -a $(topsrcdir))
-installer: firefox.manifest
+LOCALIZED_FILES = \
 	install.it \
 	$(NULL)
 PP_LOCALIZED_FILES = \
 	packages-static \
 	config.it \
 	uninstall.it \
 	installer.cfg \
 	$(NULL)
 INSTALLER_FILES = \
 	abe.jst \
 	adt.jst \
 	browser.jst \
 	chatzilla.jst \
 	editor.jst \
 	help.jst \
 	inspector.jst \
 	psm.jst \
 	talkback.jst \
 	venkman.jst \
 	xpcom.jst \
 	redirect.it \
 	app.tag \
 	7zip.bat \
 	$(NULL)
 DEFINES += -DAB_CD=$(AB_CD) -DPKG_BASENAME=$(PKG_BASENAME)
 include $(topsrcdir)/toolkit/locales/$(AB_CD)/installer/windows/charset.mk
 installer:
 	$(NSINSTALL) -D instgen
 	$(INSTALL) $(addprefix $(topsrcdir)/toolkit/locales/$(AB_CD)/installer/windows/,$(LOCALIZED_FILES)) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) instgen
 	iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) $(topsrcdir)/browser/locales/$(AB_CD)/installer/installer.inc > instgen/installer.inc
 	$(EXIT_ON_ERROR) \
 	for i in $(PP_LOCALIZED_FILES); do \
 	  $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -Iinstgen/installer.inc $(srcdir)/$$i > instgen/$$i; \
 	done
 	$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(topsrcdir)/browser/locales/$(AB_CD)/defines.inc $(srcdir)/ab-CD.jst > instgen/$(AB_CD).jst
 	cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)"
 include $(topsrcdir)/config/rules.mk
@ -58,8 +100,3 @@ ifndef MOZ_USE_OFFICIAL_BRANDING
 	cp $(srcdir)/Watermrk.bmp  $(DIST)/branding/Watermrk.bmp
 endif
 # Create a manifest for use with codesighs, by stripping "bin/" off of the
 # beginning of lines in the packages file.
 firefox.manifest: packages-static
 	grep "^bin\\\\" $^ | sed "s?^bin\\\\??" > $@
--- a/browser/installer/windows/browser.jst
+++ b/browser/installer/windows/browser.jst
@ -63,8 +63,8 @@ function createShortcuts()
  fileExe              = getFolder("file:///", fTemp);
  scExeDesc            = "$ProductName$";
  scFolderName         = "$ProductName$";
-  scSafeModeDesc       = "$ProductName$ (No Extensions)";
+  scSafeModeDesc       = "$ProductName$ (Safe Mode)";
-  scSafeModeParam      = "-no-extensions";
+  scSafeModeParam      = "-safe-mode";
  if (winreg) {
    // determine if the script is running under NT or not
@ -143,19 +143,12 @@ function createShortcuts()
      File.windowsShortcut(fileExe, fFolderPrograms, scExeDesc, fProgram, "", fileExe, 0);
      File.windowsShortcut(fileExe, fFolderPrograms,  scSafeModeDesc, fProgram, scSafeModeParam,  fileExe, 0);
    }
-    if (winreg.getValueNumber(subkey, "Create Quick Launch Shortcut") != 0 && folderQuickLaunchExists) {
+    if (winreg.getValueNumber(subkey, "Create Quick Launch Shortcut") != 0 && folderQuickLaunchExists)
      logComment("creating QuickLaunch in " + fFolderQuickLaunch);
      File.windowsShortcut(fileExe, fFolderQuickLaunch, scExeDesc, fProgram,  "", fileExe, 0);
    }
    // Always create the default shortcuts. 
    File.windowsShortcut(fileExe, fDefShortcuts,    scExeDesc,      fProgram, "",               fileExe, 0);
    File.windowsShortcut(fileExe, fDefShortcuts,    scSafeModeDesc, fProgram, scSafeModeParam,  fileExe, 0);
    // Clean up after ourselves
    winreg.deleteValue(subkey, "Create Desktop Shortcut");
    winreg.deleteValue(subkey, "Create Quick Launch Shortcut");
    winreg.deleteValue(subkey, "Create Start Menu Shortcut");
    if(!restrictedAccess) {
      winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
      registerProgramFolderKey(winreg, fFolderPrograms);
@ -338,6 +331,10 @@ function upgradeCleanup()
  deleteThisFile("Program",     "defaults/pref/xpinstall.js");
  deleteThisFolder("Program",   "defaults/profile/US");
  // These files are related to app patches and will interfere with the 
  // UA/app version strings if we do not remove them. 
  deleteThisFile("Program",	    "defaults/pref/bug259708.js");
  // Now clean up Uninstall entries that may be laying around in the
  // registry for older versions of the software that we're overwriting/
  // upgrading...
--- a/browser/installer/windows/config.it
+++ b/browser/installer/windows/config.it
@ -1,3 +1,5 @@
 #filter substitution
 [General]
 ; Run Mode values:
 ;   Normal - Shows all dialogs.  Requires user input.
@ -182,49 +184,33 @@ Verify Existence=
 [Dialog Welcome]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SETUP_TITLE@
-Title=$ProductShortName$ Setup
+MessageWelcome=@SETUP_WELCOME@
-;*** LOCALIZE ME BABY ***
+Message0=@SETUP_MESSAGE0@
-MessageWelcome=Welcome to %s.
+Message1=@SETUP_MESSAGE1@
-;*** LOCALIZE ME BABY ***
+Message2=@SETUP_MESSAGE2@
-Message0=You are about to install %s $Version$.
+Message3=@SETUP_MESSAGE3@
 ;*** LOCALIZE ME BABY ***
 Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
 ;*** LOCALIZE ME BABY ***
 Message2=Click Cancel to quit Setup and then close any programs you have running.  Click Next to continue the Setup program.
 ;*** LOCALIZE ME BABY ***
 Message3=Click Next to continue installing %s $Version$.
 [Dialog License]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@LICENSE_TITLE@
-Title=Software License Agreement
+Sub Title=@LICENSE_SUBTITLE@
 ;*** LOCALIZE ME BABY ***
 Sub Title=Terms and conditions for using this software.
 License File=license.txt
-;*** LOCALIZE ME BABY ***
+Message0=@LICENSE_MESSAGE0@
-Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement.
+RadioAccept=@LICENSE_ACCEPT@
-;*** LOCALIZE ME BABY ***
+RadioDecline=@LICENSE_DECLINE@
 RadioAccept=I Accept the terms of the License Agreement
 ;*** LOCALIZE ME BABY ***
 RadioDecline=I do NOT Accept the terms of the License Agreement
 [Dialog Setup Type]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SETUP_TYPE_TITLE@
-Title=Setup Type
+Sub Title=@SETUP_TYPE_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@SETUP_TYPE_MESSAGE0@
 Sub Title=Choose setup options.
 ;*** LOCALIZE ME BABY ***
 Message0=Choose the type of Setup you prefer, then click Next.
 ; at least one Setup Type needs to be set, and up to 4 can be
 ; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3).
 [Setup Type0]
-;*** LOCALIZE ME BABY ***
+Description Short=@TYPE_STANDARD@
-Description Short=&Standard
+Description Long=@TYPE_STANDARD_DESC@
 ;*** LOCALIZE ME BABY ***
 Description Long=Browser will be installed with the most common options.
 ; List of components to install/enable for this Setup Type.
 ; All other components not listed here will be disabled if
@ -232,128 +218,98 @@ Description Long=Browser will be installed with the most common options.
 C0=Component XPCOM
 C1=Component Browser
 C2=Component Uninstaller
-C3=Component US English Profile Defaults
+C3=Component Langpack
-C4=Component En US lang pack
+C4=Component Help
 C5=Component US region pack
 C6=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-; C7=Component QFA
+C5=Component QFA
 [Setup Type1]
-;*** LOCALIZE ME BABY ***
+Description Short=@TYPE_CUSTOM@
-Description Short=&Custom
+Description Long=@TYPE_CUSTOM_DESC@
 ;*** LOCALIZE ME BABY ***
 Description Long=You may choose individual options to be installed. Recommended for experienced users. 
 ; List of components to install/enable for this Setup Type.
 ; All other components not listed here will be disabled if
 ; this Setup Type is selected.
 C0=Component XPCOM
 C1=Component Browser
-C2=Component ABE
+C2=Component ADT
-C3=Component ADT
+C3=Component Uninstaller
-C4=Component Uninstaller
+C4=Component Langpack
-C5=Component US English Profile Defaults
+C5=Component Help
 C6=Component En US lang pack
 C7=Component US region pack
 C8=Component Help
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
-; C9=Component QFA
+C6=Component QFA
 [Dialog Select Components]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@SELECT_TITLE@
-Title=Select Components
+Sub Title=@SELECT_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@SELECT_MESSAGE0@
 Sub Title=Additional components that enhance $ProductShortName$.
 ;*** LOCALIZE ME BABY ***
 Message0=Choose additional components you want to install, then click Next.
 [Dialog Select Install Path]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@LOCATION_TITLE@
-Title=Install Folder
+Sub Title=@LOCATION_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@LOCATION_MESSAGE0@
 Sub Title=Where $ProductShortName$ will be installed.
 ;*** LOCALIZE ME BABY ***
 Message0=$ProductShortName$ will be installed into the following folder:
 [Dialog Upgrade]
 Show Dialog=FALSE
 Show In Easy Install=FALSE
-;*** LOCALIZE ME BABY ***
+Title=@UPGRADE_TITLE@
-Title=Upgrade
+Sub Title=@UPGRADE_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message Cleanup=@UPGRADE_CLEANUP@
 Sub Title=Upgrades an existing $ProductShortName$ installation.
 ;*** LOCALIZE ME BABY ***
 Message Cleanup=A previous $ProductNameInternal$ installation has been found in the chosen folder.
 ; XXXben - we need a strategy for uninstallation that obviates the need for "Safe Upgrade" which can doing nasty things if you have installed the app into a stupid location.
-;*** LOCALIZE ME BABY ***
+
 Checkbox Clean Install=@UPGRADE_CLEAN@
 Message Clean Install=@UPGRADE_CLEAN_MSG@
 Message Install Over=@UPGRADE_OVER@
 Message Install Over Windir=@UPGRADE_OVER_WINDIR@
 ;Checkbox Clean Install=Perform a Safe Upgrade
 Checkbox Clean Install=Perform a Clean Install
 ;*** LOCALIZE ME BABY ***
 ;Message Clean Install=A Safe Upgrade will completely remove the old installation. Any third party components you have installed will be lost. This is recommended as it may prevent incompatibilities.
 Message Clean Install=A Clean Install will COMPLETELY REMOVE the contents of the install folder! Any third party components you have installed will be lost. This is recommended as it may prevent incompatibilities. (XXXben) 
 ;*** LOCALIZE ME BABY ***
 ;Message Install Over=If you choose not to perform a Safe Upgrade, third party components will not be removed, which may cause unpredictable behavior. 
 Message Install Over=If you choose not to perform a Clean Install, third party components will not be removed, which may cause unpredictable behavior. 
 ;*** LOCALIZE ME BABY ***
 Message Install Over Windir=A Safe Upgrade of $ProductNameInternal$ cannot be performed because the program is installed within the Windows folder. It is recommended that you choose another folder to install $ProductNameInternal$ into. 
 [Dialog Select Additional Components]
 Show Dialog=FALSE
-;*** LOCALIZE ME BABY ***
+Title=@ADD_TITLE@
-Title=$ProductShortName$ Setup - Select Additional Components
+Message0=@ADD_MESSAGE0@
 ;*** LOCALIZE ME BABY ***
 Message0=Select or clear the additional components you want to install.
 [Dialog Windows Integration]
 ; Note - this dialog isn't actually used yet!
 Show Dialog=TRUE
 Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main
-;*** LOCALIZE ME BABY ***
+Title=@WININT_TITLE@
-Title=Set Up Shortcuts
+Sub Title=@WININT_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@WININT_MESSAGE0@
 Sub Title=Creates Program Icons
 ;*** LOCALIZE ME BABY ***
 Message0=Create icons for $ProductShortName$:
-; Only a maximum of 3 "Windows Integration-Item"s are allowded.  Each Item
+; Only a maximum of 3 "Windows Integration-Item"s are allowed.  Each Item
 ; shows up as a checkbox in the Windows Integration dialog.
 [Windows Integration-Item0]
-CheckBoxState=FALSE
+CheckBoxState=TRUE
-;*** LOCALIZE ME BABY ***
+Description=@WININT_DESKTOP@
 Description=On my Desktop
 Archive=
 [Windows Integration-Item1]
 CheckBoxState=TRUE 
-;*** LOCALIZE ME BABY ***
+Description=@WININT_START@
 Description=In my Start Menu Programs folder
 Archive=
 [Windows Integration-Item2]
 CheckBoxState=TRUE
-;*** LOCALIZE ME BABY ***
+Description=@WININT_QUICKL@
 Description=In my Quick Launch bar
 Archive=
 [Dialog Program Folder]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@WININT_PFOLDER_TITLE@
-Title=$ProductShortName$ Setup - Select Program Folder
+Message0=@WININT_PFOLDER_MESSAGE0@
 ;*** LOCALIZE ME BABY ***
 Message0=Setup will add program icons to the Program Folder listed below.  You may type a new folder name, or select one from the Existing Folders list.  Click Next to continue.
 [Dialog Additional Options]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@ADDL_OPTIONS_TITLE@
-Title=$ProductShortName$ Setup - Additional Options
+Message1=@ADDL_OPTIONS_MSG1@
 ;*** LOCALIZE ME BABY ***
 Message1=Select the following option if you wish to save downloaded Setup files on your own computer.  This allows you to re-run Setup without downloading the files again.  The Setup files will be saved to the path below.
 Save Installer=
 ; The following settings control whether the Recapture Homepage checkbox is displayed.
 ;    For this option to work the file nsResetPref.js must be installed into the 
@ -365,10 +321,8 @@ Recapture Homepage=FALSE
 [Dialog Advanced Settings]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@ADV_SETTINGS_TITLE@
-Title=$ProductShortName$ Setup - Advanced Settings
+Message0=@ADV_SETTINGS_MSG@
 ;*** LOCALIZE ME BABY ***
 Message0=If your Internet connection requires a proxy server, enter your server name and port information.  If your Internet connection doesn't require a proxy server, leave the fields blank.
 Proxy Server=
 Proxy Port=
 Proxy User=
@ -407,65 +361,45 @@ Turbo Mode Enabled=TRUE
 [Dialog Start Install]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@START_TITLE@
-Title=Summary
+Sub Title=@START_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Message Install=@START_INSTALL@
-Sub Title=Ready to start installing $ProductShortName$.
+Message Download=@START_DOWNLOAD@
-;*** LOCALIZE ME BABY ***
+Message0=@START_MESSAGE0@
 Message Install=Setup will now install the following components:
 ;*** LOCALIZE ME BABY ***
 Message Download=Setup will now download and install the following components:
 ;*** LOCALIZE ME BABY ***
 Message0=Click Next to continue.
 [Dialog Downloading]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@DL_TITLE@
-Title=Downloading
+Sub Title=@DL_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Blurb=@DL_BLURB@
-Sub Title=Downloading required components...
+File Name=@DL_FILENAME@
-;*** LOCALIZE ME BABY ***
+Time Remaining=@DL_TIMELEFT@
 Blurb=Setup is downloading the files required to install $ProductShortName$.
 ;*** LOCALIZE ME BABY ***
 File Name=Currently Downloading:
 ;*** LOCALIZE ME BABY ***
 Time Remaining=Time Remaining:
 [Dialog Installing]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@INSTALL_TITLE@
-Title=Installing
+Sub Title=@INSTALL_SUBTITLE@
-;*** LOCALIZE ME BABY ***
+Blurb=@INSTALL_BLURB@
-Sub Title=Installing $ProductShortName$...
+Status File=@INSTALL_STATUSFILE@
-;*** LOCALIZE ME BABY ***
+Status Component=@INSTALL_STATUSCOMP@
 Blurb=Setup is installing application files. 
 ;*** LOCALIZE ME BABY ***
 Status File=Preparing File:
 ;*** LOCALIZE ME BABY ***
 Status Component=Currently Installing:
 [Dialog Install Successful]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@COMPLETE_TITLE@
-Title=Install Complete
+MessageHeader=@COMPLETE_TITLE@
-;*** LOCALIZE ME BABY ***
+Message0=@COMPLETE_MESSAGE0@
-MessageHeader=Install Complete
+Message1=@COMPLETE_MESSAGE1@
-;*** LOCALIZE ME BABY ***
+Launch App=@COMPLETE_LAUNCH@
 Message0=%s $Version$ was successfully installed.
 ;*** LOCALIZE ME BABY ***
 Message1=Click Finish to complete Setup. 
 ;*** LOCALIZE ME BABY ***
 Launch App=Launch %s $Version$ now.
 Launch App Checked=TRUE
 Reset Homepage=@COMPLETE_RESET_HOMEPAGE@
 Reset Homepage Checked=TRUE
 Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$
 [Dialog Download]
 Show Dialog=TRUE
-;*** LOCALIZE ME BABY ***
+Title=@DL2_TITLE@
-Title=$ProductShortName$ Setup - Download
+Message Download0=@DL2_MESSAGE0@
-;*** LOCALIZE ME BABY ***
+Message Retry0=@DL2_RETRY@
 Message Download0=Setup is downloading the required files now.  This may take some time depending on your network connection speed.
 ;*** LOCALIZE ME BABY ***
 Message Retry0=Some files have failed the CRC check and are being downloaded again.  Only those files that have failed will be downloaded.
 [Dialog Reboot]
 ; Show Dialog values are:
@ -483,12 +417,9 @@ Class Name=FirefoxMessageWindow
 Window Name=
 Process Name=$MainExeFile$
 Pretty Name=$ProductNameInternal$
-;*** LOCALIZE ME BABY ***
+Message=@CLOSE_CHECK@
-Message=Download of $ProductShortName$ was successful. $ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation.
+Message Full Installer=@CLOSE_CHECK2@
-;*** LOCALIZE ME BABY ***
+Message wait=@CLOSE_WAIT@
 Message Full Installer=$ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation.
 ;*** LOCALIZE ME BABY ***
 Message wait=Shutting down $ProductNameInternal$.  Please wait...
 ; This key indicates whether or not to close all the windows associated with
 ; the process id of this app instance window found.
@ -596,9 +527,8 @@ Extra Cmd0 Parameter=-kill
 ;for it's xpinstall engine from the TEMP dir.  The files that
 ;this component has are already in Component GRE.
 [Component XPCOM]
-Description Short=Cross Platform COM
+Description Short=@XPCOM_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@XPCOM_SHORT@
 Description Long=Cross Platform COM
 Archive=xpcom.xpi
 $InstallSize$:xpcom
 $InstallSizeSystem$
@ -607,9 +537,8 @@ Attributes=SELECTED|INVISIBLE
 FileCount=$FileCount$
 [Component Browser]
-Description Short=$ProductShortName$ Browser
+Description Short=@BROWSER_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@BROWSER_SHORT@
 Description Long=The $ProductShortName$ Browser
 Archive=browser.xpi
 $InstallSize$:browser
 $InstallSizeSystem$
@ -618,20 +547,9 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE|MAIN_COMPONENT
 Force Upgrade File0=[SETUP PATH]\$MainExeFile$
 FileCount=$FileCount$
 [Component ABE]
 Description Short=Additional Browsing Enhancements
 ;*** LOCALIZE ME BABY ***
 Description Long=Additional tools including mouse-gesture navigation, a site navigation bar and other enhanced functionality. 
 Archive=abe.xpi
 $InstallSize$:abe
 $InstallSizeArchive$:abe.xpi
 Attributes=VISIBLE|DISABLED
 FileCount=$FileCount$
 [Component ADT]
-Description Short=Developer Tools
+Description Short=@ADT_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@ADT_LONG@
 Description Long=Tools for web developers including an error console, the Document Inspector and a JavaScript Debugger. 
 Archive=adt.xpi
 $InstallSize$:adt
 $InstallSizeArchive$:adt.xpi
@ -641,9 +559,8 @@ Force Upgrade File0=[SETUP PATH]\chrome\inspector.jar
 FileCount=$FileCount$
 [Component Help]
-Description Short=$ProductShortName$ Help
+Description Short=@HELP_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@HELP_SHORT@
 Description Long=Offline Help for learning about and using $ProductShortName$.
 Archive=help.xpi
 $InstallSize$:help
 $InstallSizeArchive$:help.xpi
@ -652,9 +569,8 @@ Force Upgrade File0=[SETUP PATH]\chrome\help.jar
 FileCount=$FileCount$
 [Component Uninstaller]
-Description Short=$CompanyName$ Uninstaller
+Description Short=@UNINSTALL_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@UNINSTALL_SHORT@
 Description Long=Uninstaller for $ProductShortName$
 Archive=$UninstallFileZip$
 $InstallSize$:$UninstallFileZip$
 $InstallSizeSystem$
@ -668,48 +584,20 @@ FileCount=$FileCount$
 [Component Uninstaller-Destination Path0]
 Path=[WINDIR]
-[Component US English Profile Defaults]
+[Component Langpack]
-Description Short=US English Defaults
+Description Short=@AB_CD@ @LANGPACK_TITLE@
-;*** LOCALIZE ME BABY ***
+Description Long=@AB_CD@ @LANGPACK_TITLE@
-Description Long=US English Default Profile Data
+Archive=@AB_CD@.xpi
-Archive=deflenus.xpi
+$InstallSize$:@AB_CD@
 $InstallSize$:deflenus
 $InstallSizeSystem$
-$InstallSizeArchive$:deflenus.xpi
+$InstallSizeArchive$:@AB_CD@.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
-Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html
+Force Upgrade File0=[SETUP PATH]\chrome\@AB_CD@.jar
 FileCount=$FileCount$
 [Component En US lang pack]
 ;*** LOCALIZE ME BABY ***
 Description Short=English (US) Language Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=English (US) Language Pack
 Archive=langenus.xpi
 $InstallSize$:langenus
 $InstallSizeSystem$
 $InstallSizeArchive$:langenus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar
 FileCount=$FileCount$
 [Component US region pack]
 ;*** LOCALIZE ME BABY ***
 Description Short=US Region Pack
 ;*** LOCALIZE ME BABY ***
 Description Long=Regional content for US users
 Archive=regus.xpi
 $InstallSize$:regus
 $InstallSizeSystem$
 $InstallSizeArchive$:regus.xpi
 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\chrome\US.jar
 FileCount=$FileCount$
 [Component QFA]
-Description Short=Quality Feedback Agent
+Description Short=@QFA_SHORT@
-;*** LOCALIZE ME BABY ***
+Description Long=@QFA_LONG@
 Description Long=for reporting $ProductShortName$ crash information
 Archive=talkback.xpi
 Install Size=870
 Install Size System=1
@ -722,15 +610,14 @@ FileCount=$FileCount$
 ; This particular value will set the checkbox checked [number]% of the time.
 ; This logic is done only during the initialization of setup, not in any
 ; particular dialog.
-Random Install Percentage=100
+Random Install Percentage=20
 [Core]
 Source=[XPI PATH]\xpcom.xpi
 Destination=[WIZTEMP]\xpcom.ns
 $InstallSize$:xpcom
 Cleanup=TRUE
-;*** LOCALIZE ME BABY ***
+Message=@CORE_PREPARING@
 Message=Preparing Install, please wait...
 ; Status= values: Disabled, Enabled
 ; If nothing is set, default value is Enabled.  If set to Disabled,
 ; it will then use GRE as the xpinstall engine, in which case, there
@ -777,8 +664,7 @@ Message=
 Timing=post smartupdate
 Source=[XPI PATH]\$UninstallFileZip$
 Destination=[WINDIR]
-;*** LOCALIZE ME BABY ***
+Message=@INST_UNINST@
 Message=Installing the uninstaller, please wait...
 Only If Exists=FALSE
@ -896,7 +782,6 @@ Condition=RecaptureHPChecked
 [Windows Registry0]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$
 Name=
 Name Value=
@ -910,7 +795,6 @@ Timing=pre smartupdate
 [Windows Registry1]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$
 Name=
 Name Value=
@ -924,7 +808,6 @@ Timing=pre smartupdate
 [Windows Registry2]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$
 Name=
 Name Value=
@ -938,7 +821,6 @@ Timing=pre smartupdate
 [Windows Registry3]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main
 Name=Program Folder Path
 Name Value=[Default Folder]
@ -952,7 +834,6 @@ Timing=pre smartupdate
 [Windows Registry4]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall
 Name=Description
 Name Value=$ProductName$ ($UserAgentShort$)
@ -966,7 +847,6 @@ Timing=pre smartupdate
 [Windows Registry5]
 Root Key=HKEY_LOCAL_MACHINE
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall
 Name=Uninstall Log Folder
 Name Value=[SETUP PATH]\uninstall
@ -980,7 +860,6 @@ Timing=pre smartupdate
 [Windows Registry6]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$
 Name=
 Name Value=
@ -994,7 +873,6 @@ Timing=pre smartupdate
 [Windows Registry7]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$
 Name=
 Name Value=
@ -1008,7 +886,6 @@ Timing=pre smartupdate
 [Windows Registry8]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$
 Name=
 Name Value=
@ -1022,7 +899,6 @@ Timing=pre smartupdate
 [Windows Registry9]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main
 Name=Program Folder Path
 Name Value=[Default Folder]
@ -1036,7 +912,6 @@ Timing=pre smartupdate
 [Windows Registry10]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall
 Name=Description
 Name Value=$ProductName$ ($UserAgentShort$)
@ -1050,7 +925,6 @@ Timing=pre smartupdate
 [Windows Registry11]
 Root Key=HKEY_CURRENT_USER
 ;*** LOCALIZE ME BABY ***
 Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall
 Name=Uninstall Log Folder
 Name Value=[SETUP PATH]\uninstall
@ -1079,7 +953,6 @@ Timing=post smartupdate
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=UninstallString
 ;*** LOCALIZE ME BABY ***
 Name Value=[WINDIR]\$UninstallFile$ /ua "$UserAgent$"
 Type=REG_SZ
 Decrypt Key=FALSE
@ -1089,9 +962,126 @@ Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry14]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=DisplayIcon
 Name Value=[SETUP PATH]\$MainExeFile$,0
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry15]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=DisplayVersion
 Name Value=$UserAgent$
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry16]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=Comment
 Name Value=$ProductName$
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry17]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=InstallLocation
 Name Value=[SETUP PATH]
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry18]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=NoModify
 Name Value=0x00000001
 Type=REG_DWORD
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=FALSE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry19]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=NoRepair
 Name Value=0x00000001
 Type=REG_DWORD
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=FALSE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry20]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=Publisher
 Name Value=$CompanyName$
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry21]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=URLInfoAbout
 Name Value=http://www.mozilla.org/
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 [Windows Registry22]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$)
 Name=URLUpdateInfo
 Name Value=http://www.mozilla.org/products/firefox/
 Type=REG_SZ
 Decrypt Key=FALSE
 Decrypt Name=FALSE
 Decrypt Name Value=TRUE
 Overwrite Key=TRUE
 Overwrite Name=TRUE
 Timing=post smartupdate
 ; The following keys are to help JRE's installer locate where mozilla gets
 ; installed to.  It has not been updated to look for the new keys.
-[Windows Registry14]
+[Windows Registry23]
 Root Key=HKEY_LOCAL_MACHINE
 Key=Software\Mozilla
 Name=
@ -1116,58 +1106,34 @@ Product Reg Key1=Software\Mozilla.org\Mozilla
 Current Version1=$UserAgent$
 [Strings]
-;*** LOCALIZE ME BABY ***
+Message Unfinished Download Restart=@MSG_UNFINISHED_DL@
-Message Unfinished Download Restart=A previous session of Setup did not finish downloading all the necessary files.  Would you like to use the files previously downloaded, to avoid downloading them again?
+Message Unfinished Install Xpi Restart=@MSG_UNFINISHED_INSTALL@
-;*** LOCALIZE ME BABY ***
+Error Corrupted Archives Detected=@MSG_CORRUPTED@
-Message Unfinished Install Xpi Restart=A previous session of Setup did not finish with installation of all the necessary files.  Would you like to use the files previously downloaded, to avoid downloading them again?
+Error Corrupted Archives Detected AUTO mode=@MSG_CORRUPTED_AUTO@
-;*** LOCALIZE ME BABY ***
+Error Too Many CRC Failures=@MSG_TOO_MANY_CRC@
-Error Corrupted Archives Detected=Setup has detected that the following archives within this Setup are corrupted:%sYou will need to obtain another copy of the $ProductShortName$ Setup in order for installation to proceed.
+Error Too Many Network Errors=@MSG_TOO_MANY_NETWORK@
-;*** LOCALIZE ME BABY ***
+Message Verifying Archives=@MSG_VERIFYING@
-Error Corrupted Archives Detected AUTO mode=Setup has detected that at least one archive within this Setup is corrupt.  You will need to obtain another copy of the $ProductShortName$ Setup in order for installation to proceed.
+Error Undefined=@MSG_UNDEFINED@
-;*** LOCALIZE ME BABY ***
+Error Out Of Memory=@MSG_OOM@
-Error Too Many CRC Failures=Too many download failures.  Setup will cancel.  Any files already downloaded will not be deleted.  The next time Setup is run, these files will be taken into account during the download.
+Status Download=@MSG_STATUS_DL@
-;*** LOCALIZE ME BABY ***
+Status Retry=@MSG_STATUS_DL@
 Error Too Many Network Errors=Too many network errors trying to download %s.  Setup will now Pause.  Please click Resume to retry downloading the files.
 ;*** LOCALIZE ME BABY ***
 Message Verifying Archives=Verifying integrity of archives, please wait...
 ;*** LOCALIZE ME BABY ***
 Error Undefined=Error undefined
 ;*** LOCALIZE ME BABY ***
 Error Out Of Memory=Out of memory!
 ;*** LOCALIZE ME BABY ***
 Status Download=%s at %.2f KB/sec (%u KB of %u KB downloaded)
 ;*** LOCALIZE ME BABY ***
 Status Retry=%s at %.2f KB/sec (%u KB of %u KB downloaded)
 ;*** LOCALIZE ME BABY ***
 Status File Info=%s
 ;*** LOCALIZE ME BABY ***
 Status Percentage Completed=%d%%
-;*** LOCALIZE ME BABY ***
+Dialog Download Title Minimized=@MSG_COMPLETED@
-Dialog Download Title Minimized=%d%% completed
+STR Force Upgrade Required=@MSG_REQUIRED@
-;*** LOCALIZE ME BABY ***
+Message Cancel Setup AUTO mode=@MSG_CANCELING@
-STR Force Upgrade Required=(Required)
+Error File Uncompress=@MSG_ERROR_UNCOMPRESS@
-;*** LOCALIZE ME BABY ***
+UsageMsg Usage=@MSG_USAGE@
-Message Cancel Setup AUTO mode=Canceling Setup, please wait...
+IDC Use FTP=@MSG_USE_FTP@
-;*** LOCALIZE ME BABY ***
+IDC Use HTTP=@MSG_USE_HTTP@
-Error File Uncompress=Error uncompressing file %s: %d
+IDC Save Installer Files=@MSG_SAVE_LOCALLY@
 ;*** LOCALIZE ME BABY ***
 UsageMsg Usage=Usage: %s [options]\n	[options] can be any of the following combination:\n		-h: This help.\n		-a [path]: Alternate archive search path.\n		-app [app id]: ID of application which is launching the installer (shared installs)\n		-app_path [app]: Points to (full path) representative file of application (Shared installs)\n	*	-dd [path]: Suggested install destination directory. (Shared installs)\n	*	-greLocal: Forces GRE to be installed into the application dir.\n	*	-greShared: Forces GRE to be installed into a global, shared dir (normally)\n			c:\program files\common files\mozilla.org\GRE\n		-reg_path [path]: Where to make entries in the Windows registry. (Shared installs)\n		-f: Force install of GRE installer (Shared installs), though it'll work\n			for non GRE installers too.\n		-greForce: Force 'Component GRE' to be downloaded, run, and installed.  This\n			bypasses GRE's logic of determining when to install by running its\n			installer with a '-f' flag.\n		-n [filename]: Setup's parent process filename.\n	*	-ma: Run setup in Auto mode.\n	*	-ms: Run setup in Silent mode.\n		-ira: Ignore the [RunAppX] sections\n		-ispf: Ignore the [Program FolderX] sections that show\n			the Start Menu shortcut folder at the end of installation.\n	*	-showBanner: Show the banner image in the download and install progress dialogs\n	*	-hideBanner: Hide the banner image in the download and install progress dialogs\n	*	-cleanupOnUpgrade: Tells Setup to check to see if user is upgrading (installing on top\n		of previous version of product).  If user is upgrading:\n			* NORMAL mode: prompt user on how to proceed\n			* All other modes: assume user wants to cleanup.\n	*	-noCleanupOnUpgrade: Tells Setup to not check if user is upgrading (installing on top\n		of previous version of product).  This will disable the cleanup feature.\n\n	* means it will override config.ini
 ;*** LOCALIZE ME BABY ***
 IDC Use FTP=Use &FTP for downloading files
 ;*** LOCALIZE ME BABY ***
 IDC Use HTTP=Use &HTTP for downloading files
 ;*** LOCALIZE ME BABY ***
 IDC Save Installer Files=&Save installer files locally
 ;*** LOCALIZE ME BABY ***
 IDC Recapture Homepage=&Make Netscape.com my home page
 ;*** LOCALIZE ME BABY ***
 IDC Turbo Mode=&Use Quick Launch for faster startup times when possible
-;*** LOCALIZE ME BABY ***
+Message Download Paused=@MSG_DL_PAUSED@
-Message Download Paused=Setup has encountered a network problem and has paused the download.  If you have just lost your network connection, please click Resume once your network has been reestablished.
+Message NORMAL Restricted Access=@MSG_NOT_ADMIN@
-;*** LOCALIZE ME BABY ***
+Message AUTO Restricted Access=@MSG_NOT_ADMIN_AUTO@
 Message NORMAL Restricted Access=Setup has detected that you do not have the appropriate Administrator privileges to this system.  It is highly recommended that you do not continue with the installation of $ProductShortName$, or it may not function properly.  Would you still like to continue?
 ;*** LOCALIZE ME BABY ***
 Message AUTO Restricted Access=Setup has detected that you do not have the appropriate Administrator privileges to this system.  Setup cannot continue with the installation of $ProductShortName$.
 [Site Selector]
--- a/browser/installer/windows/installer.cfg
+++ b/browser/installer/windows/installer.cfg
@ -1,15 +1,16 @@
-VersionLanguage           = en
+#filter substitution
 VersionLanguage           = @AB_CD@
 NameCompany               = Mozilla
 NameProduct               = Mozilla Firefox
 NameProductInternal       = Mozilla Firefox
 ShortNameProduct          = Firefox
-VersionProduct            = 1.0PR+
+VersionProduct            = 1.0
-FileInstallerEXE          = FirefoxSetup.exe
+FileInstallerEXE          = @PKG_BASENAME@.installer.exe
 FileMainEXE               = firefox.exe
 FileUninstall             = UninstallFirefox.exe
 FileUninstallZIP          = UninstallFirefox.zip
-FileInstallerNETRoot      = FirefoxNetSetup
+FileInstallerNETRoot      = @PKG_BASENAME@.net-installer
-ComponentList             = xpcom,browser,deflenus,langenus,regus,abe,adt,help
+ComponentList             = xpcom,browser,talkback,@AB_CD@,adt,help
-LicenseFile               = browser/LICENSE
+LicenseFile               = browser/EULA
 7ZipSFXModule             = other-licenses/7zstub/firefox/7zSD.sfx
-GREVersion                = 1.8
+GREVersion                = 1.7.5
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@ -8,22 +8,15 @@
 ; ; file comment
 ;
 #filter substitution
 bin/.autoreg
-[langenus]
+[@AB_CD@]
-; en-US 
+bin\chrome\@AB_CD@.jar
-bin\chrome\en-US.jar
+bin\defaults\pref\firefox-l10n.js
-bin\chrome\en-win.jar
+bin\browserconfig.properties
 [regus]
 ; US
 ; If you add a new directory you must explicitly call addDirectory in regus.jst
 bin\chrome\US.jar
 bin\defaults\profile\US\*
 bin\searchplugins\*
 [deflenus]
 ; Default files for US
 bin\defaults\profile\bookmarks.html
 bin\defaults\profile\localstore.rdf
 bin\defaults\profile\prefs.js
@ -33,6 +26,7 @@ bin\defaults\profile\extensions\Extensions.rdf
 bin\defaults\profile\extensions\installed-extensions.txt
 bin\defaults\profile\extensions\{641d8d09-7dda-4850-8228-ac0ab65e2ac9}\install.rdf
 bin\defaults\profile\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 bin\defaults\profile\chrome\*
 [xpcom]
 bin\js3250.dll
@ -44,7 +38,6 @@ bin\nspr4.dll
 bin\components\xpinstal.dll
 bin\components\jar50.dll
 bin\xpcom_compat.dll
 bin\xpcom_core.dll
 [browser]
 ; [Base Browser Files]
@ -60,7 +53,6 @@ bin\components\alerts.xpt
 bin\components\accessibility.xpt
 bin\components\accessibility-msaa.xpt
 bin\components\appshell.xpt
 bin\components\appstartup.xpt
 bin\components\autocomplete.xpt
 bin\components\autoconfig.xpt
 bin\components\bookmarks.xpt
@ -90,10 +82,12 @@ bin\components\dom_views.xpt
 bin\components\dom_xbl.xpt
 bin\components\dom_xpath.xpt
 bin\components\dom_xul.xpt
 bin\components\dom_loadsave.xpt
 bin\components\downloads.xpt
 bin\components\editor.xpt
 bin\components\embed_base.xpt
 bin\components\exthandler.xpt
 bin\components\fastfind.xpt
 bin\components\find.xpt
 bin\components\gfx.xpt
 bin\components\helperAppDlg.xpt
@ -128,6 +122,7 @@ bin\components\necko_dns.xpt
 bin\components\necko_file.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
 bin\components\necko_jar.xpt
 bin\components\necko_res.xpt
 bin\components\necko_viewsource.xpt
 bin\components\oji.xpt
@ -136,6 +131,7 @@ bin\components\plugin.xpt
 bin\components\pref.xpt
 bin\components\prefetch.xpt
 bin\components\prefmigr.xpt
 bin\components\profile.xpt
 bin\components\progressDlg.xpt
 bin\components\proxyObject.xpt
 bin\components\rdf.xpt
@ -148,7 +144,6 @@ bin\components\signonviewer.xpt
 bin\components\toolkitprofile.xpt
 bin\components\txtsvc.xpt
 bin\components\txmgr.xpt
 bin\components\typeaheadfind.xpt
 bin\components\ucnative.xpt
 bin\components\uconv.xpt
 bin\components\unicharutil.xpt
@ -212,6 +207,7 @@ bin\res\ua.css
 bin\res\html.css
 bin\res\quirk.css
 bin\res\forms.css
 bin\res\platform-forms.css
 bin\res\EditorOverride.css
 bin\res\table-add-column-after-active.gif
 bin\res\table-add-column-after-hover.gif
@ -284,3 +280,13 @@ bin\chrome\help.jar
 ; [Additional Browsing Enhancements]
 [abe]
 [talkback]
 bin\components\qfaservices.dll
 bin\components\qfaservices.xpt
 bin\components\BrandRes.dll
 bin\components\fullsoft.dll
 bin\components\master.ini
 bin\components\talkback-l10n.ini
 bin\components\talkback.cnt
 bin\components\talkback.exe
 bin\components\talkback.hlp
--- a/browser/installer/windows/talkback.jst
+++ b/browser/installer/windows/talkback.jst
@ -1,9 +1,45 @@
 function upgradeCleanup()
 {
  // Obsolete files from previous Netscape installation which
  // need to be cleaned up.
  deleteThisFile("Components", "l10n.ini");
 }
 // main
-
+var srDest;
 var err;
 var communicatorFolder;
-err = initInstall("Quality Feedback Agent", "Quality Feedback Agent", "6.5.0.2001012623"); 
+srDest = $SpaceRequired$;
-logComment("Talkback place holder .xpi for the real thing.");
+err    = initInstall("Quality Feedback Utility", "Quality Feedback Utility", "$Version$"); 
-cancelInstall(err);
+logComment("initInstall: " + err);
 communicatorFolder = getFolder("Communicator");
 logComment("communicatorFolder: " + communicatorFolder);
 if(verifyDiskSpace(communicatorFolder, srDest))
 {
  setPackageFolder(communicatorFolder);
  upgradeCleanup();
  err = addDirectory("",
                     "$Version$",
                     "bin",              // dir name in jar to extract 
                     communicatorFolder, // Where to put this file (Returned from getFolder) 
                     "",                 // subdir name to create relative to communicatorFolder
                     true );             // Force Flag 
  logComment("addDirectory() returned: " + err);
  // check return value
  if(!err)
  {
    err = performInstall(); 
    logComment("performInstall() returned: " + err);
  }
  else
    cancelInstall(err);
 }
 else
  cancelInstall(INSUFFICIENT_DISK_SPACE);
 // end main
--- a/browser/installer/windows/uninstall.it
+++ b/browser/installer/windows/uninstall.it
@ -1,3 +1,5 @@
 #filter substitution
 [General]
 ; Run Mode values:
 ;   Normal - Shows all dialogs.  Requires user input.
@ -57,14 +59,12 @@ Decrypt Key=TRUE
 Uninstall Filename=$UninstallFile$
 [Check Instance0]
-Class Name=MozillaMessageWindow
+Class Name=FirefoxMessageWindow
 Window Name=
 Process Name=$MainExeFile$
 Pretty Name=$ProductNameInternal$
-;*** LOCALIZE ME BABY ***
+Message=@UNINST_RUNNING@
-Message=$ProductNameInternal$ is detected to be currently running.  Please quit $ProductNameInternal$ before continuing.  Click OK to exit $ProductNameInternal$ automatically and proceed with uninstallation.
+Message wait=@UNINST_SHUTDOWN@
 ;*** LOCALIZE ME BABY ***
 Message wait=Shutting down $ProductNameInternal$.  Please wait...
 ; This key indicates whether or not to close all the windows associated with
 ; the process id of this app instance window found.
@ -106,31 +106,22 @@ Extra Cmd1 Parameter=-kill
 [Dialog Uninstall]
-FONTNAME=MS Sans Serif
+FONTNAME=@UNINST_FONT@
-FONTSIZE=8
+FONTSIZE=@UNINST_FONTSIZE@
-CHARSET=0
+CHARSET=@UNINST_CHARSET@
 ;Here is a partial list CHAR_SETS
 ;  ANSI_CHARSET = 0
 ;  DEFAULT_CHARSET = 1
 ;  SYMBOL_CHARSET = 2
 ;  SHIFTJIS_CHARSET = 128
 ;  GB2312_CHARSET = 134
 ;  HANGEUL_CHARSET = 129
 ;  CHINESEBIG5_CHARSET = 136
 ;  OEM_CHARSET 255
 Show Dialog=TRUE
-Title=$ProductName$ Uninstaller
+Title=@UNINST_TITLE@
-Message0=Are you sure you want to completely remove %s and all of its components?
+Message0=@UNINST_MESSAGE0@
-Uninstall=&Uninstall
+Uninstall=@BTN_UNINST@
-Cancel=&Cancel
+Cancel=@BTN_CANCEL@
-Message1=Uninstall has detected that the following shared file is no longer used by any programs.  If any programs still require the shared file and it is removed, those programs may no longer function.  Are you sure you want to remove this shared file?
+Message1=@BTN_MESSAGE1@
-Message2=Leaving this file will not harm your system.  If you are not sure, it is recommended that the shared file be not removed from the system.
+Message2=@BTN_MESSAGE2@
-FileName=File name:
+FileName=@BTN_FILENAME@
-No=&No
+No=@BTN_NO@
-NoToAll=N&o to all
+NoToAll=@BTN_NOTOALL@
-Yes=&Yes
+Yes=@BTN_YES@
-YesToAll=Y&es to all
+YesToAll=@BTN_YESTOALL@
 ; This section attempts to restore/undo the desktop integration performed by the browser/mail
 [Restore Desktop Integration]
@ -141,26 +132,26 @@ Enabled=TRUE
 Enabled=TRUE
 [Messages]
-ERROR_DLL_LOAD=Could not load %s
+ERROR_DLL_LOAD=@ERROR_DLL_LOAD@
-ERROR_STRING_LOAD=Could not load string resource ID %d
+ERROR_STRING_LOAD=@ERROR_STRING_LOAD@
-ERROR_STRING_NULL=Null pointer encountered.
+ERROR_STRING_NULL=@ERROR_STRING_NULL@
-ERROR_GLOBALALLOC=Memory allocation error.
+ERROR_GLOBALALLOC=@ERROR_GLOBALALLOC@
-ERROR_FAILED=%s failed.
+ERROR_FAILED=@ERROR_FAILED@
-ERROR_DIALOG_CREATE=Could not create %s dialog.
+ERROR_DIALOG_CREATE=@ERROR_DIALOG_CREATE@
-DLGQUITTITLE=Question
+DLGQUITTITLE=@DLGQUITTITLE@
-DLGQUITMSG=Are you sure you want to cancel?
+DLGQUITMSG=@DLGQUITMSG@
-ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed.
+ERROR_GET_SYSTEM_DIRECTORY_FAILED=@ERROR_GET_SYSTEM_DIRECTORY_FAILED@
-ERROR_GET_WINDOWS_DIRECTORY_FAILED=GetWindowsDirectory() failed.
+ERROR_GET_WINDOWS_DIRECTORY_FAILED=@ERROR_GET_WINDOWS_DIRECTORY_FAILED@
-ERROR_CREATE_TEMP_DIR=Uninstall was not able to create the TEMP directory: %s
+ERROR_CREATE_TEMP_DIR=@ERROR_CREATE_TEMP_DIR@
-ERROR_SETUP_REQUIREMENT=Windows95 or greater Operating System is required!  Exiting Uninstall...
+ERROR_SETUP_REQUIREMENT=@ERROR_SETUP_REQUIREMENT@
-MB_WARNING_STR=Warning
+MB_WARNING_STR=@MB_WARNING_STR@
-ERROR_UNINSTALL_LOG_FOLDER=Uninstall log folder not found:%s
+ERROR_UNINSTALL_LOG_FOLDER=@ERROR_UNINSTALL_LOG_FOLDER@
-MB_MESSAGE_STR=Message
+MB_MESSAGE_STR=@MB_MESSAGE_STR@
-DLG_REMOVE_FILE_TITLE=Remove File?
+DLG_REMOVE_FILE_TITLE=@DLG_REMOVE_FILE_TITLE@
-ERROR_GETVERSION=GetVersionEx() failed!
+ERROR_GETVERSION=@ERROR_GETVERSION@
-MB_ATTENTION_STR=Attention
+MB_ATTENTION_STR=@MB_ATTENTION_STR@
-MSG_FORCE_QUIT_PROCESS=Uninstall has detected that %s (%s) is still running.  Click OK to quit %s and proceed with uninstallation. Alternatively, use the Windows Task Manager to quit %s, and then click OK to continue with uninstallation.
+MSG_FORCE_QUIT_PROCESS=@MSG_FORCE_QUIT_PROCESS@
-MSG_FORCE_QUIT_PROCESS_FAILED=Uninstall will now exit.  Uninstall could not continue because %s (%s) is still running. Try manually quitting %s using Windows Task Manager, and then run Uninstall again.
+MSG_FORCE_QUIT_PROCESS_FAILED=@MSG_FORCE_QUIT_PROCESS_FAILED@
-MSG_DELETE_INSTALLATION_PATH=Not all files were uninstalled from the installation directory:\n\n  %s\n\nDo you want to completely delete this directory?
+MSG_DELETE_INSTALLATION_PATH=@MSG_DELETE_INSTALLATION_PATH@
-MSG_INSTALLATION_PATH_WITHIN_WINDIR=Uninstall has detected that the installation path of $ProductNameInternal$ is installed to a folder within your Windows folder.  Uninstall will not attempt to delete this installation due to the potential removal of critical system files.
+MSG_INSTALLATION_PATH_WITHIN_WINDIR=@MSG_INSTALLATION_PATH_WITHIN_WINDIR@