fixing bug 80238 - title should be Mozilla Setup - (5.0.trunk.20010509) and not Mozilla 5.0.trunk.20010509 Setup. Checking Gemal's patch. mo=ssu, rs=mscott

xpinstall/packager/windows/config.it

@@ -125,9 +125,9 @@ Verify Existence=
 [Dialog Welcome]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Welcome
+Title=$ProductName$ Setup - Welcome
 ;*** LOCALIZE ME BABY ***
-Message0=Welcome to %s Setup.
+Message0=Welcome to %s Setup.  You are about to install %s version $Version$.
 ;*** LOCALIZE ME BABY ***
 Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
 ;*** LOCALIZE ME BABY ***
@@ -136,7 +136,7 @@ Message2=Click Cancel to quit Setup and then close any programs you have running
 [Dialog License]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Software License Agreement
+Title=$ProductName$ Setup - Software License Agreement
 License File=license.txt
 ;*** LOCALIZE ME BABY ***
 Message0=Please read the following license agreement.  Use the scroll bar to view the rest of this agreement.
@@ -146,7 +146,7 @@ Message1=Click Accept if you accept the terms of the preceeding license agreemen
 [Dialog Setup Type]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Setup Type
+Title=$ProductName$ Setup - Setup Type
 ;*** LOCALIZE ME BABY ***
 Message0=Click the type of setup you prefer, then click Next.
 Readme Filename=readme.txt
@@ -225,14 +225,14 @@ C9=Component QFA
 [Dialog Select Components]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Select Components
+Title=$ProductName$ Setup - Select Components
 ;*** LOCALIZE ME BABY ***
 Message0=The browser is always installed.  Select or clear the additional components you want to install.
 
 [Dialog Select Additional Components]
 Show Dialog=FALSE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Select Additional Components
+Title=$ProductName$ Setup - Select Additional Components
 ;*** LOCALIZE ME BABY ***
 Message0=Select or clear the additional components you want to install.
 
@@ -240,7 +240,7 @@ Message0=Select or clear the additional components you want to install.
 ; do not localize this part because it is not currently being used
 [Dialog Windows Integration]
 Show Dialog=FALSE
-Title=$ProductName$ ($Version$) Setup - Windows Integration
+Title=$ProductName$ Setup - Windows Integration
 Message0=Check the Mozilla Preference options you would like Setup to perform.
 Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla Communicator and Microsoft Internet Explorer.
 
@@ -265,14 +265,14 @@ Archive=
 [Dialog Program Folder]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Select Program Folder
+Title=$ProductName$ Setup - Select Program Folder
 ;*** 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 Download Options]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Download Options
+Title=$ProductName$ Setup - Download Options
 ;*** LOCALIZE ME BABY ***
 Message0=Select the region you wish to download from, or leave on Default to download from the nearest geographic location.
 ;*** LOCALIZE ME BABY ***
@@ -282,7 +282,7 @@ Save Installer=
 [Dialog Advanced Settings]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Advanced Settings
+Title=$ProductName$ Setup - Advanced Settings
 ;*** 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=
@@ -305,7 +305,7 @@ Show Protocols=TRUE
 [Dialog Start Install]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Start Install
+Title=$ProductName$ Setup - Start Install
 ;*** LOCALIZE ME BABY ***
 Message Install=Setup has enough information to start copying the program files.  If you want to review or change settings, click Back.  If you are satisfied with the current settings, click Install to begin copying files.
 ;*** LOCALIZE ME BABY ***
@@ -322,7 +322,7 @@ Turbo Mode Enabled=TRUE
 [Dialog Download]
 Show Dialog=TRUE
 ;*** LOCALIZE ME BABY ***
-Title=$ProductName$ ($Version$) Setup - Download
+Title=$ProductName$ Setup - Download
 ;*** LOCALIZE ME BABY ***
 Message Download0=Setup is downloading the required files now.  This may take some time depending on your network connection speed.
 ;*** LOCALIZE ME BABY ***

xpinstall/wizard/windows/setup/dialogs.c

@@ -90,7 +90,7 @@ LRESULT CALLBACK DlgProcWelcome(HWND hDlg, UINT msg, WPARAM wParam, LONG lParam)
       DisableSystemMenuItems(hDlg, FALSE);
       SetWindowText(hDlg, diWelcome.szTitle);
 
-      wsprintf(szBuf, diWelcome.szMessage0, sgProduct.szProductName);
+      wsprintf(szBuf, diWelcome.szMessage0, sgProduct.szProductName, sgProduct.szProductName);
       SetDlgItemText(hDlg, IDC_STATIC0, szBuf);
       SetDlgItemText(hDlg, IDC_STATIC1, diWelcome.szMessage1);
       SetDlgItemText(hDlg, IDC_STATIC2, diWelcome.szMessage2);