diff --git a/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini b/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
index b34cc7229d0..6eb18dcb100 100644
--- a/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
+++ b/mozilla/cck/cckwiz/iniFiles/AccountSetup.ini
@@ -1,261 +1,517 @@
-;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
-; 
-;  The contents of this file are subject to the Netscape Public License
-;  Version 1.0 (the "NPL"); you may not use this file except in
-;  compliance with the NPL.  You may obtain a copy of the NPL at
-;  http://www.mozilla.org/NPL/
-; 
-;  Software distributed under the NPL is distributed on an "AS IS" basis,
-;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-;  for the specific language governing rights and limitations under the
-;  NPL.
-; 
-;  The Initial Developer of this code under the NPL is Netscape
-;  Communications Corporation.  Portions created by Netscape are
-;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-;  Reserved.
-;
-
-[Local Variables]
-Name=AccountSetup
-Title=CCK Wizard
-Caption=1st level node
-
-[Navigation Controls]
-onNext=
-Help=AccountSetup.txt
-
-[Image 1]
-Type=Image
-Name=netscape.bmp
-Value=
-Start_x=7
-Start_y=7
-Width=64
-Height=56
-
-
-[Widget 1]
-Type=Text
-Name=Text90
-Value=Set up local dial-up access phone numbers (POPs) so that when users use Account Setup to create an Internet account, they can choose the phone number that's closest to their location. If you're not using Account Setup, skip this screen by clicking Next.
-Start_x=58
-Start_y=45
-Width=300
-Height=30
-
-
-[Widget 2]
-Type=ListBox
-Name=NCIFileList
-Value=
-Start_x=8
-Start_y=105
-Width=106
-Height=44
-dll=NULL
-function=GenerateFileList
-parameters=cckwiz\ase\NCIFiles\*.NCI
-
-
-[Widget 21]
-Type=RadioGroup
-Name=radioGroup
-Value=2
-Options=SortByName,SortByPhone
-
-
-[Widget 3]
-Type=RadioButton
-Name=SortByName
-Title=List access locations by name
-Group=radioGroup
-Start_x=12
-Start_y=157
-Width=119
-Height=9
-
-
-[Widget 4]
-Type=RadioButton
-Name=SortByPhone
-Title=List access locations by access phone number
-Group=radioGroup
-Start_x=12
-Start_y=167
-Width=165
-Height=14
-
-[Widget 5]
-Type=Text
-Name=Text91
-Value=Include These Access Locations (POPs) in Account Setup:
-Start_x=9
-Start_y=84
-Width=125
-Height=19
-
-[Widget 6]
-Type=Button
-Name=CreateNCIButton
-Value=Create
-Start_x=145
-Start_y=99
-Width=51
-Height=14
-dll=NULL
-function=command
-parameters=ConfigDialog;copy NCItemplate %newEntry%;%NCIFileEditor% %newEntry%;inform
-Target=NCIFileList
-
-[Widget 7]
-Type=Button
-Name=EditNCIButton
-Value=Edit
-Start_x=145
-Start_y=115
-Width=51
-Height=14
-dll=NULL
-function=command
-parameters=%NCIFileEditor% %NCIFileList%
-Target=NCIFileList
-
-[Widget 8]
-Type=Button
-Name=DeleteNCIButton
-Value=Delete
-Start_x=145
-Start_y=133
-Width=51
-Height=14
-dll=NULL
-function=command
-parameters=del %NCIFileList%
-Target=NCIFileList
-
-[Widget 9]
-Type=Text
-Name=Text92
-Value=To create a new access location file, click Create, and name the file based on its phone number  (e.g., San Diego). Then edit the file, replacing the default values with the ones you want. Save the file to add it to the list of access locations.
-Start_x=210
-Start_y=95
-Width=195
-Height=52
-
-
-[Widget 10]
-Type=Text
-Name=Text93
-Value=To edit an existing file, select it from the list and click Edit to open it in the text editor you've chosen.
-Start_x=210
-Start_y=130
-Width=200
-Height=40
-
-
-[Widget 11]
-Type=Text
-Name=Text94
-Value=To change text editors, locate the text editor you want to use. Notepad is used by default.
-Start_x=10
-Start_y=195
-Width=323
-Height=13
-
-
-[Widget 12]
-Type=GroupBox
-Name=GroupBox14
-Value=Change Text Editor
-Start_x=5
-Start_y=184
-Width=397
-Height=60
-
-
-[Widget 13]
-Type=Text
-Name=Text95
-Value=Path to text editor you want to use:
-Start_x=11
-Start_y=208
-Width=178
-Height=8
-
-
-[Widget 14]
-Type=EditBox
-Name=NCIFileEditor
-Value=notepad
-Start_x=11
-Start_y=218
-Width=181
-Height=14
-
-[Widget 15]
-Type=Button
-Name=Button21
-Value=Browse
-Start_x=202
-Start_y=218
-Width=50
-Height=14
-dll=NULL
-function=BrowseFile
-
-[Widget 16]
-Type=Text
-Name=Text96
-Value=Page 1 of 1
-Description=Current Page
-Start_x=272
-Start_y=16
-Width=38
-Height=8
-
-
-[Widget 17]
-Type=Text
-Name=Text97
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 18]
-Type=Text
-Name=Text98
-Value=Account Setup
-Description=Current Page
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 19]
-Type=Text
-Name=Text99
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 20]
-Type=Text
-Name=Text100
-Value=Brand
-Description=Navigation Status
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
-
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+
+; 
+
+;  The contents of this file are subject to the Netscape Public License
+
+;  Version 1.0 (the "NPL"); you may not use this file except in
+
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+
+;  http://www.mozilla.org/NPL/
+
+; 
+
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+
+;  for the specific language governing rights and limitations under the
+
+;  NPL.
+
+; 
+
+;  The Initial Developer of this code under the NPL is Netscape
+
+;  Communications Corporation.  Portions created by Netscape are
+
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+;  Reserved.
+
+;
+
+
+
+[Local Variables]
+
+Name=AccountSetup
+
+Title=CCK Wizard
+
+Caption=1st level node
+
+
+
+[Navigation Controls]
+
+onNext=
+
+Help=AccountSetup.txt
+
+
+
+[Image 1]
+
+Type=Image
+
+Name=netscape.bmp
+
+Value=
+
+Start_x=7
+
+Start_y=7
+
+Width=64
+
+Height=56
+
+
+
+
+
+[Widget 1]
+
+Type=Text
+
+Name=Text90
+
+Value=Set up local dial-up access phone numbers (POPs) so that when users use Account Setup to create an Internet account, they can choose the phone number that's closest to their location. If you're not using Account Setup, skip this screen by clicking Next.
+
+Start_x=58
+
+Start_y=45
+
+Width=300
+
+Height=30
+
+
+
+
+
+[Widget 2]
+
+Type=ListBox
+
+Name=NCIFileList
+
+Value=
+
+Start_x=8
+
+Start_y=105
+
+Width=106
+
+Height=44
+
+dll=NULL
+
+function=GenerateFileList
+
+parameters=cckwiz\ase\NCIFiles\*.NCI
+
+
+
+
+
+[Widget 21]
+
+Type=RadioGroup
+
+Name=radioGroup
+
+Value=2
+
+Options=SortByName,SortByPhone
+
+
+
+
+
+[Widget 3]
+
+Type=RadioButton
+
+Name=SortByName
+
+Title=List access locations by name
+
+Group=radioGroup
+
+Start_x=12
+
+Start_y=157
+
+Width=119
+
+Height=9
+
+
+
+
+
+[Widget 4]
+
+Type=RadioButton
+
+Name=SortByPhone
+
+Title=List access locations by access phone number
+
+Group=radioGroup
+
+Start_x=12
+
+Start_y=167
+
+Width=165
+
+Height=14
+
+
+
+[Widget 5]
+
+Type=Text
+
+Name=Text91
+
+Value=Include These Access Locations (POPs) in Account Setup:
+
+Start_x=9
+
+Start_y=84
+
+Width=125
+
+Height=19
+
+
+
+[Widget 6]
+
+Type=Button
+
+Name=CreateNCIButton
+
+Value=Create
+
+Start_x=145
+
+Start_y=99
+
+Width=51
+
+Height=14
+
+dll=NULL
+
+function=command
+
+parameters=ConfigDialog;copy NCItemplate %newEntry%;%NCIFileEditor% %newEntry%;inform
+
+Target=NCIFileList
+
+
+
+[Widget 7]
+
+Type=Button
+
+Name=EditNCIButton
+
+Value=Edit
+
+Start_x=145
+
+Start_y=115
+
+Width=51
+
+Height=14
+
+dll=NULL
+
+function=command
+
+parameters=%NCIFileEditor% %NCIFileList%
+
+Target=NCIFileList
+
+
+
+[Widget 8]
+
+Type=Button
+
+Name=DeleteNCIButton
+
+Value=Delete
+
+Start_x=145
+
+Start_y=133
+
+Width=51
+
+Height=14
+
+dll=NULL
+
+function=command
+
+parameters=del %NCIFileList%
+
+Target=NCIFileList
+
+
+
+[Widget 9]
+
+Type=Text
+
+Name=Text92
+
+Value=To create a new access location file, click Create, and name the file based on its phone number  (e.g., San Diego). Then edit the file, replacing the default values with the ones you want. Save the file to add it to the list of access locations.
+
+Start_x=210
+
+Start_y=95
+
+Width=195
+
+Height=52
+
+
+
+
+
+[Widget 10]
+
+Type=Text
+
+Name=Text93
+
+Value=To edit an existing file, select it from the list and click Edit to open it in the text editor you've chosen.
+
+Start_x=210
+
+Start_y=130
+
+Width=200
+
+Height=40
+
+
+
+
+
+[Widget 11]
+
+Type=Text
+
+Name=Text94
+
+Value=To change text editors, locate the text editor you want to use. Notepad is used by default.
+
+Start_x=10
+
+Start_y=195
+
+Width=323
+
+Height=13
+
+
+
+
+
+[Widget 12]
+
+Type=GroupBox
+
+Name=GroupBox14
+
+Value=Change Text Editor
+
+Start_x=5
+
+Start_y=184
+
+Width=397
+
+Height=60
+
+
+
+
+
+[Widget 13]
+
+Type=Text
+
+Name=Text95
+
+Value=Path to text editor you want to use:
+
+Start_x=11
+
+Start_y=208
+
+Width=178
+
+Height=8
+
+
+
+
+
+[Widget 14]
+
+Type=EditBox
+
+Name=NCIFileEditor
+
+Value=notepad
+
+Start_x=11
+
+Start_y=218
+
+Width=181
+
+Height=14
+
+
+
+[Widget 15]
+
+Type=Button
+
+Name=Button21
+
+Value=Browse
+
+Start_x=202
+
+Start_y=218
+
+Width=50
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+[Widget 16]
+
+Type=Text
+
+Name=Text96
+
+Value=Page 1 of 1
+
+Description=Current Page
+
+Start_x=272
+
+Start_y=16
+
+Width=38
+
+Height=8
+
+
+
+
+
+[Widget 17]
+
+Type=Text
+
+Name=Text97
+
+Value=Customize
+
+Description=Navigation Status
+
+Start_x=210
+
+Start_y=7
+
+Width=44
+
+Height=9
+
+
+
+
+
+[Widget 18]
+
+Type=Text
+
+Name=Text98
+
+Value=Account Setup
+
+Description=Current Page
+
+Start_x=267
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 19]
+
+Type=Text
+
+Name=Text99
+
+Value=Build Installer(s)
+
+Description=Navigation Status
+
+Start_x=338
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 20]
+
+Type=Text
+
+Name=Text500
+
+Value=Brand
+
+Description=Navigation Status
+
+Start_x=161
+
+Start_y=7
+
+Width=27
+
+Height=9
\ No newline at end of file
diff --git a/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini b/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
index 302483de396..90f0469c3cc 100644
--- a/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Branding_page4.ini
@@ -1,218 +1,436 @@
-;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
-; 
-;  The contents of this file are subject to the Netscape Public License
-;  Version 1.0 (the "NPL"); you may not use this file except in
-;  compliance with the NPL.  You may obtain a copy of the NPL at
-;  http://www.mozilla.org/NPL/
-; 
-;  Software distributed under the NPL is distributed on an "AS IS" basis,
-;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-;  for the specific language governing rights and limitations under the
-;  NPL.
-; 
-;  The Initial Developer of this code under the NPL is Netscape
-;  Communications Corporation.  Portions created by Netscape are
-;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-;  Reserved.
-;
-
-[Local Variables]
-Name=Branding_page4
-Title=CCK Wizard
-Caption=2nd level node
-
-[Navigation Controls]
-onNext=
-Help=Branding.txt
-
-[Image 1]
-Type=Image
-Name=netscape.bmp
-Value=
-Start_x=7
-Start_y=7
-Width=64
-Height=56
-
-
-[Widget 1]
-Type=Text
-Name=Text23
-Value=Customize the installer splash screen and installer screen text.
-Start_x=57
-Start_y=41
-Width=294
-Height=12
-
-[Widget 10]
-Type=GroupBox
-Name=GroupBox6
-Value=Installer Splash Screen
-Start_x=3
-Start_y=60
-Width=402
-Height=85
-
-[Widget 300]
-Type=Text
-Name=Text55
-Value=The Installer splash screen appears when the user starts the Communicator installer (setup.exe).
-Start_x=13
-Start_y=75
-Width=200
-Height=25
-
-[Widget 7]
-Type=Text
-Name=Text25
-Value=Enter the path to your custom bitmap (setup.bmp) for the Installer splash screen:
-Start_x=13
-Start_y=95
-Width=178
-Height=20
-
-[Widget 8]
-Type=EditBox
-Name=InstallerCustomBitmapPath
-Value=
-Start_x=11
-Start_y=117
-Width=179
-Height=14
-
-[Widget 9]
-Type=Button
-Name=Button7
-Value=Browse
-Start_x=197
-Start_y=117
-Width=40
-Height=14
-dll=NULL
-function=BrowseFile
-
-
-[Widget 6]
-Type=GroupBox
-Name=GroupBox5
-Value=Installer Screen Text
-Start_x=4
-Start_y=150
-Width=399
-Height=87
-
-[Widget 3]
-Type=Text
-Name=Text24
-Value=Text That Appears on All Installation Screens:
-Start_x=13
-Start_y=166
-Width=164
-Height=8
-
-[Widget 2]
-Type=EditBox
-Name=InstallerScreenText1
-Value=
-Start_x=10
-Start_y=175
-Width=217
-Height=14
-
-[Widget 4]
-Type=EditBox
-Name=InstallerScreenText2
-Value=
-Start_x=10
-Start_y=188
-Width=217
-Height=14
-
-[Widget 5]
-Type=EditBox
-Name=InstallerScreenText3
-Value=
-Start_x=10
-Start_y=201
-Width=217
-Height=14
-
-[Widget 16]
-Type=Button
-Name=Button133
-Value=Show Example
-Start_x=272
-Start_y=188
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=inst.ini
-
-[Widget 200]
-Type=Button
-Name=Button116
-Value=Show Example
-Start_x=252
-Start_y=117
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=splash.ini
-
-
-[Widget 11]
-Type=Text
-Name=Text26
-Value=Page 4 of 4
-Description=Current Page
-Start_x=152
-Start_y=16
-Width=40
-Height=8
-
-
-[Widget 12]
-Type=Text
-Name=Text27
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 13]
-Type=Text
-Name=Text28
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 14]
-Type=Text
-Name=Text29
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 15]
-Type=Text
-Name=Text30
-Value=Brand
-Description=Current Page
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+
+; 
+
+;  The contents of this file are subject to the Netscape Public License
+
+;  Version 1.0 (the "NPL"); you may not use this file except in
+
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+
+;  http://www.mozilla.org/NPL/
+
+; 
+
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+
+;  for the specific language governing rights and limitations under the
+
+;  NPL.
+
+; 
+
+;  The Initial Developer of this code under the NPL is Netscape
+
+;  Communications Corporation.  Portions created by Netscape are
+
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+;  Reserved.
+
+;
+
+
+
+[Local Variables]
+
+Name=Branding_page4
+
+Title=CCK Wizard
+
+Caption=2nd level node
+
+
+
+[Navigation Controls]
+
+onNext=
+
+Help=Branding.txt
+
+
+
+[Image 1]
+
+Type=Image
+
+Name=netscape.bmp
+
+Value=
+
+Start_x=7
+
+Start_y=7
+
+Width=64
+
+Height=56
+
+
+
+
+
+[Widget 1]
+
+Type=Text
+
+Name=Text23
+
+Value=Customize the installer splash screen and installer screen text.
+
+Start_x=57
+
+Start_y=41
+
+Width=294
+
+Height=12
+
+
+
+[Widget 10]
+
+Type=GroupBox
+
+Name=GroupBox6
+
+Value=Installer Splash Screen
+
+Start_x=3
+
+Start_y=60
+
+Width=402
+
+Height=85
+
+
+
+[Widget 300]
+
+Type=Text
+
+Name=Text355
+
+Value=The Installer splash screen appears when the user starts the Communicator installer (setup.exe).
+
+Start_x=13
+
+Start_y=75
+
+Width=200
+
+Height=25
+
+
+
+[Widget 7]
+
+Type=Text
+
+Name=Text25
+
+Value=Enter the path to your custom bitmap (setup.bmp) for the Installer splash screen:
+
+Start_x=13
+
+Start_y=95
+
+Width=178
+
+Height=20
+
+
+
+[Widget 8]
+
+Type=EditBox
+
+Name=InstallerCustomBitmapPath
+
+Value=
+
+Start_x=11
+
+Start_y=117
+
+Width=179
+
+Height=14
+
+
+
+[Widget 9]
+
+Type=Button
+
+Name=Button7
+
+Value=Browse
+
+Start_x=197
+
+Start_y=117
+
+Width=40
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+
+
+[Widget 6]
+
+Type=GroupBox
+
+Name=GroupBox5
+
+Value=Installer Screen Text
+
+Start_x=4
+
+Start_y=150
+
+Width=399
+
+Height=87
+
+
+
+[Widget 3]
+
+Type=Text
+
+Name=Text24
+
+Value=Text That Appears on All Installation Screens:
+
+Start_x=13
+
+Start_y=166
+
+Width=164
+
+Height=8
+
+
+
+[Widget 2]
+
+Type=EditBox
+
+Name=InstallerScreenText1
+
+Value=
+
+Start_x=10
+
+Start_y=175
+
+Width=217
+
+Height=14
+
+
+
+[Widget 4]
+
+Type=EditBox
+
+Name=InstallerScreenText2
+
+Value=
+
+Start_x=10
+
+Start_y=188
+
+Width=217
+
+Height=14
+
+
+
+[Widget 5]
+
+Type=EditBox
+
+Name=InstallerScreenText3
+
+Value=
+
+Start_x=10
+
+Start_y=201
+
+Width=217
+
+Height=14
+
+
+
+[Widget 16]
+
+Type=Button
+
+Name=Button133
+
+Value=Show Example
+
+Start_x=272
+
+Start_y=188
+
+Width=60
+
+Height=14
+
+dll=NULL
+
+function=DisplayImage
+
+parameters=inst.ini
+
+
+
+[Widget 200]
+
+Type=Button
+
+Name=Button116
+
+Value=Show Example
+
+Start_x=252
+
+Start_y=117
+
+Width=60
+
+Height=14
+
+dll=NULL
+
+function=DisplayImage
+
+parameters=splash.ini
+
+
+
+
+
+[Widget 11]
+
+Type=Text
+
+Name=Text26
+
+Value=Page 4 of 4
+
+Description=Current Page
+
+Start_x=152
+
+Start_y=16
+
+Width=40
+
+Height=8
+
+
+
+
+
+[Widget 12]
+
+Type=Text
+
+Name=Text27
+
+Value=Customize
+
+Description=Navigation Status
+
+Start_x=210
+
+Start_y=7
+
+Width=44
+
+Height=9
+
+
+
+
+
+[Widget 13]
+
+Type=Text
+
+Name=Text28
+
+Value=Account Setup
+
+Description=Navigation Status
+
+Start_x=267
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 14]
+
+Type=Text
+
+Name=Text29
+
+Value=Build Installer(s)
+
+Description=Navigation Status
+
+Start_x=338
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 15]
+
+Type=Text
+
+Name=Text30
+
+Value=Brand
+
+Description=Current Page
+
+Start_x=161
+
+Start_y=7
+
+Width=27
+
+Height=9
+
+
+
diff --git a/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini b/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
index 9b8807c7d25..bb01f8f668c 100644
--- a/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Customize_page3.ini
@@ -1,234 +1,465 @@
-;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
-; 
-;  The contents of this file are subject to the Netscape Public License
-;  Version 1.0 (the "NPL"); you may not use this file except in
-;  compliance with the NPL.  You may obtain a copy of the NPL at
-;  http://www.mozilla.org/NPL/
-; 
-;  Software distributed under the NPL is distributed on an "AS IS" basis,
-;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-;  for the specific language governing rights and limitations under the
-;  NPL.
-; 
-;  The Initial Developer of this code under the NPL is Netscape
-;  Communications Corporation.  Portions created by Netscape are
-;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-;  Reserved.
-;
-
-[Local Variables]
-Name=Customize_page3
-Title=CCK Wizard
-Caption=2nd level node
-
-[Navigation Controls]
-onNext=
-Help=customize.txt
-
-[Image 1]
-Type=Image
-Name=netscape.bmp
-Value=
-Start_x=7
-Start_y=7
-Width=64
-Height=56
-
-
-[Widget 1]
-Type=Text
-Name=Text1
-Value=Specify the Start Menu settings and the paths to your custom Read Me and License Agreement files.
-Start_x=59
-Start_y=36
-Width=322
-Height=13
-
-
-[Widget 2]
-Type=EditBox
-Name=ProgramFolderName
-Value=
-Start_x=7
-Start_y=85
-Width=224
-Height=14
-
-[Widget 3]
-Type=Text
-Name=Text2
-Value=Enter the program folder name that will appear in the Start Menu:
-Start_x=8
-Start_y=73
-Width=250
-Height=20
-
-
-[Widget 4]
-Type=CheckBox
-Name=CreateReadmeIcon
-Value=
-Title=Create Readme icon in Start menu
-Start_x=8
-Start_y=105
-Width=143
-Height=10
-
-
-[Widget 5]
-Type=CheckBox
-Name=CreateLicenseIcon
-Value=
-Title=Create License icon in Start menu
-Start_x=8
-Start_y=118
-Width=143
-Height=10
-
-
-[Widget 6]
-Type=GroupBox
-Name=GroupBox1
-Value=Start Menu Settings
-Start_x=3
-Start_y=57
-Width=400
-Height=186
-
-
-
-[Widget 10]
-Type=EditBox
-Name=ReadMeFile
-Value=
-Start_x=8
-Start_y=186
-Width=168
-Height=14
-
-[Widget 11]
-Type=Button
-Name=Button2
-Value=Browse
-Start_x=179
-Start_y=186
-Width=35
-Height=14
-dll=NULL
-function=BrowseFile
-
-[Widget 9]
-Type=Text
-Name=Text3
-Value=Path to Read Me file (readme.txt):
-Start_x=8
-Start_y=172
-Width=150
-Height=8
-
-[Widget 7]
-Type=EditBox
-Name=LicenseFile
-Value=
-Start_x=8
-Start_y=218
-Width=168
-Height=14
-
-[Widget 8]
-Type=Button
-Name=Button1
-Value=Browse
-Start_x=179
-Start_y=218
-Width=35
-Height=14
-dll=NULL
-function=BrowseFile
-
-[Widget 19]
-Type=Button
-Name=Button121
-Value=Show Example
-Start_x=190
-Start_y=110
-Width=60
-Height=14
-dll=NULL
-function=DisplayImage
-parameters=start.ini
-
-[Widget 12]
-Type=Text
-Name=Text4
-Value=Path to License Agreement (license.txt):
-Start_x=8
-Start_y=207
-Width=150
-Height=8
-
-
-[Widget 13]
-Type=Text
-Name=Text5
-Value=Enter the paths to your custom Read Me and License Agreement files. If you don't choose to provide these customized files, your builds will include the default files.
-Start_x=10
-Start_y=150
-Width=300
-Height=26
-
-
-[Widget 14]
-Type=Text
-Name=Text6
-Value=Page 3 of 3
-Description=Current Page
-Start_x=207
-Start_y=16
-Width=38
-Height=8
-
-
-[Widget 15]
-Type=Text
-Name=Text7
-Value=Customize
-Description=Current Page
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 16]
-Type=Text
-Name=Text8
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 17]
-Type=Text
-Name=Text9
-Value=Build Installer(s)
-Description=Navigation Status
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 18]
-Type=Text
-Name=Text10
-Value=Brand
-Description=Navigation Status
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+
+; 
+
+;  The contents of this file are subject to the Netscape Public License
+
+;  Version 1.0 (the "NPL"); you may not use this file except in
+
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+
+;  http://www.mozilla.org/NPL/
+
+; 
+
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+
+;  for the specific language governing rights and limitations under the
+
+;  NPL.
+
+; 
+
+;  The Initial Developer of this code under the NPL is Netscape
+
+;  Communications Corporation.  Portions created by Netscape are
+
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+;  Reserved.
+
+;
+
+
+
+[Local Variables]
+
+Name=Customize_page3
+
+Title=CCK Wizard
+
+Caption=2nd level node
+
+
+
+[Navigation Controls]
+
+onNext=
+
+Help=customize.txt
+
+
+
+[Image 1]
+
+Type=Image
+
+Name=netscape.bmp
+
+Value=
+
+Start_x=7
+
+Start_y=7
+
+Width=64
+
+Height=56
+
+
+
+
+
+[Widget 1]
+
+Type=Text
+
+Name=Text1
+
+Value=Specify the Start Menu settings and the paths to your custom Read Me and License Agreement files.
+
+Start_x=59
+
+Start_y=36
+
+Width=322
+
+Height=13
+
+
+
+
+
+[Widget 2]
+
+Type=EditBox
+
+Name=ProgramFolderName
+
+Value=
+
+Start_x=7
+
+Start_y=85
+
+Width=224
+
+Height=14
+
+
+
+[Widget 3]
+
+Type=Text
+
+Name=Text2
+
+Value=Enter the program folder name that will appear in the Start Menu:
+
+Start_x=8
+
+Start_y=73
+
+Width=250
+
+Height=12
+
+
+
+
+
+[Widget 4]
+
+Type=CheckBox
+
+Name=CreateReadmeIcon
+
+Value=
+
+Title=Create Readme icon in Start menu
+
+Start_x=8
+
+Start_y=105
+
+Width=143
+
+Height=10
+
+
+
+
+
+[Widget 5]
+
+Type=CheckBox
+
+Name=CreateLicenseIcon
+
+Value=
+
+Title=Create License icon in Start menu
+
+Start_x=8
+
+Start_y=118
+
+Width=143
+
+Height=10
+
+
+
+
+
+[Widget 6]
+
+Type=GroupBox
+
+Name=GroupBox1
+
+Value=Start Menu Settings
+
+Start_x=3
+
+Start_y=57
+
+Width=400
+
+Height=186
+
+
+
+
+
+
+
+[Widget 10]
+
+Type=EditBox
+
+Name=ReadMeFile
+
+Value=
+
+Start_x=8
+
+Start_y=186
+
+Width=168
+
+Height=14
+
+
+
+[Widget 11]
+
+Type=Button
+
+Name=Button2
+
+Value=Browse
+
+Start_x=179
+
+Start_y=186
+
+Width=35
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+[Widget 9]
+
+Type=Text
+
+Name=Text3
+
+Value=Path to Read Me file (readme.txt):
+
+Start_x=8
+
+Start_y=172
+
+Width=150
+
+Height=8
+
+
+
+[Widget 7]
+
+Type=EditBox
+
+Name=LicenseFile
+
+Value=
+
+Start_x=8
+
+Start_y=218
+
+Width=168
+
+Height=14
+
+
+
+[Widget 8]
+
+Type=Button
+
+Name=Button1
+
+Value=Browse
+
+Start_x=179
+
+Start_y=218
+
+Width=35
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+[Widget 19]
+
+Type=Button
+
+Name=Button121
+
+Value=Show Example
+
+Start_x=190
+
+Start_y=110
+
+Width=60
+
+Height=14
+
+dll=NULL
+
+function=DisplayImage
+
+parameters=start.ini
+
+
+
+[Widget 12]
+
+Type=Text
+
+Name=Text4
+
+Value=Path to License Agreement (license.txt):
+
+Start_x=8
+
+Start_y=207
+
+Width=150
+
+Height=8
+
+
+
+
+
+[Widget 13]
+
+Type=Text
+
+Name=Text5
+
+Value=Enter the paths to your custom Read Me and License Agreement files. If you don't choose to provide these customized files, your builds will include the default files.
+
+Start_x=10
+
+Start_y=150
+
+Width=300
+
+Height=22
+
+
+
+
+
+[Widget 14]
+
+Type=Text
+
+Name=Text6
+
+Value=Page 3 of 3
+
+Description=Current Page
+
+Start_x=207
+
+Start_y=16
+
+Width=38
+
+Height=8
+
+
+
+
+
+[Widget 15]
+
+Type=Text
+
+Name=Text7
+
+Value=Customize
+
+Description=Current Page
+
+Start_x=210
+
+Start_y=7
+
+Width=44
+
+Height=9
+
+
+
+
+
+[Widget 16]
+
+Type=Text
+
+Name=Text8
+
+Value=Account Setup
+
+Description=Navigation Status
+
+Start_x=267
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 17]
+
+Type=Text
+
+Name=Text9
+
+Value=Build Installer(s)
+
+Description=Navigation Status
+
+Start_x=338
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 18]
+
+Type=Text
+
+Name=Text10
+
+Value=Brand
+
+Description=Navigation Status
+
+Start_x=161
+
+Start_y=7
+
+Width=27
+
+Height=9
diff --git a/mozilla/cck/cckwiz/iniFiles/Installer.ini b/mozilla/cck/cckwiz/iniFiles/Installer.ini
index 792fc7e9fd7..5c984e08c7c 100644
--- a/mozilla/cck/cckwiz/iniFiles/Installer.ini
+++ b/mozilla/cck/cckwiz/iniFiles/Installer.ini
@@ -1,309 +1,627 @@
-;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
-; 
-;  The contents of this file are subject to the Netscape Public License
-;  Version 1.0 (the "NPL"); you may not use this file except in
-;  compliance with the NPL.  You may obtain a copy of the NPL at
-;  http://www.mozilla.org/NPL/
-; 
-;  Software distributed under the NPL is distributed on an "AS IS" basis,
-;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-;  for the specific language governing rights and limitations under the
-;  NPL.
-; 
-;  The Initial Developer of this code under the NPL is Netscape
-;  Communications Corporation.  Portions created by Netscape are
-;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-;  Reserved.
-;
-
-[Local Variables]
-Name=Installer
-Title=CCK Wizard
-Caption=1st level node
-Function=BuildInstallers
-
-[Navigation Controls]
-onNext=
-Help=Installer.txt
-
-[Image 1]
-Type=Image
-Name=netscape.bmp
-Value=
-Start_x=7
-Start_y=7
-Width=64
-Height=56
-
-
-[Widget 1]
-Type=ListBox
-Name=SelectedComponents
-Value=
-Start_x=17
-Start_y=77
-Width=90
-Height=70
-subsection=Options for ListBox1
-[Options for ListBox1]
-opt1=Internet Setup
-opt2=Real Audio
-opt3=Multimedia
-opt4=AIM
-
-[Widget 2]
-Type=Text
-Name=Text11
-Value=Standard Components:
-Start_x=21
-Start_y=64
-Width=80
-Height=13
-
-
-[Widget 3]
-Type=Text
-Name=Text12
-Value=Select the components you want to include in your installer. The CCK wizard will automatically add the Communicator component.
-Start_x=3
-Start_y=32
-Width=345
-Height=18
-
-
-[Widget 4]
-Type=Text
-Name=Text13
-Value=Additional installers: You can add installers for two other products below.  Each must be in a single executable file and will be run after the main installation completes.
-Start_x=121
-Start_y=69
-Width=270
-Height=17
-
-
-[Widget 5]
-Type=EditBox
-Name=CustomComponent1
-Value=
-Start_x=121
-Start_y=110
-Width=162
-Height=14
-
-[Widget 6]
-Type=Button
-Name=Button3
-Value=Browse
-Start_x=287
-Start_y=110
-Width=36
-Height=14
-dll=NULL
-function=BrowseFile
-
-[Widget 8]
-Type=EditBox
-Name=CustomComponent2
-Value=
-Start_x=121
-Start_y=138
-Width=162
-Height=14
-
-[Widget 7]
-Type=Button
-Name=Button4
-Value=Browse
-Start_x=287
-Start_y=138
-Width=36
-Height=14
-dll=NULL
-function=BrowseFile
-
-[Widget 9]
-Type=Text
-Name=Text14
-Value=Specify the path to the executable (.exe) file of your custom component(s):
-Start_x=121
-Start_y=90
-Width=240
-Height=11
-
-
-[Widget 10]
-Type=Text
-Name=Text15
-Value=Custom component path:
-Start_x=123
-Start_y=127
-Width=75
-Height=8
-
-
-[Widget 11]
-Type=Text
-Name=Text16
-Value=Custom component path:
-Start_x=123
-Start_y=100
-Width=75
-Height=8
-
-
-[Widget 12]
-Type=Text
-Name=Text17
-Value=Page 1 of 1
-Description=Current Page
-Start_x=342
-Start_y=16
-Width=38
-Height=8
-
-
-[Widget 13]
-Type=GroupBox
-Name=GroupBox2
-Value=Choose installers to create
-Start_x=4
-Start_y=205
-Width=398
-Height=39
-
-
-[Widget 14]
-Type=CheckBox
-Name=CreateCDImage
-Value=
-Title=Create CD image
-Start_x=12
-Start_y=215
-Width=111
-Height=13
-
-
-[Widget 15]
-Type=CheckBox
-Name=CreateNetworkDownloadable
-Value=
-Title=Create Network-downloadable file
-Start_x=12
-Start_y=228
-Width=140
-Height=12
-
-
-[Widget 16]
-Type=GroupBox
-Name=GroupBox3
-Value=Install Components
-Start_x=3
-Start_y=50
-Width=399
-Height=105
-
-
-;[Widget 17]
-;Type=Button
-;Name=Button5
-;Value=Review All Customizations...
-;Start_x=165
-;Start_y=219
-;Width=101
-;Height=15
-;Type=ProgressBar
-;Name=myProgBar
-;Value=Review All Customizations...
-;Start_x=165
-;Start_y=219
-;Width=101
-;Height=15
-
-
-[Widget 18]
-Type=GroupBox
-Name=GroupBox4
-Value=Netcenter dialog
-Start_x=3
-Start_y=158
-Width=399
-Height=45
-
-
-[Widget 19]
-Type=CheckBox
-Name=DisplayNetcenterDialog
-Value=
-Title=Display Netcenter dialog during installation
-Start_x=8
-Start_y=189
-Width=157
-Height=9
-
-
-[Widget 20]
-Type=Text
-Name=Text18
-Value=If displayed during installation, the Netcenter dialog gives users the option of making Netcenter (home.netscape.com) their default home page.
-Start_x=7
-Start_y=169
-Width=394
-Height=19
-
-
-[Widget 21]
-Type=Text
-Name=Text19
-Value=Customize
-Description=Navigation Status
-Start_x=210
-Start_y=7
-Width=44
-Height=9
-
-
-[Widget 22]
-Type=Text
-Name=Text20
-Value=Account Setup
-Description=Navigation Status
-Start_x=267
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 23]
-Type=Text
-Name=Text21
-Value=Build Installer(s)
-Description=Current Page
-Start_x=338
-Start_y=7
-Width=52
-Height=9
-
-
-[Widget 24]
-Type=Text
-Name=Text22
-Value=Brand
-Description=Navigation Status
-Start_x=161
-Start_y=7
-Width=27
-Height=9
-
-
-;[Widget 25]
-;Type=Button
-;Name=Button6
-;Value=Build Installers
-;Start_x=272
-;Start_y=219
-;Width=85
-;Height=15
-;dll=IBEngine.dll
-;function=BrowseFile
-
+;  Mode: INI; tab-width: 8; indent-tabs-mode: nil -*-
+
+; 
+
+;  The contents of this file are subject to the Netscape Public License
+
+;  Version 1.0 (the "NPL"); you may not use this file except in
+
+;  compliance with the NPL.  You may obtain a copy of the NPL at
+
+;  http://www.mozilla.org/NPL/
+
+; 
+
+;  Software distributed under the NPL is distributed on an "AS IS" basis,
+
+;  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+
+;  for the specific language governing rights and limitations under the
+
+;  NPL.
+
+; 
+
+;  The Initial Developer of this code under the NPL is Netscape
+
+;  Communications Corporation.  Portions created by Netscape are
+
+;  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+;  Reserved.
+
+;
+
+
+
+[Local Variables]
+
+Name=Installer
+
+Title=CCK Wizard
+
+Caption=1st level node
+
+Function=BuildInstallers
+
+
+
+[Navigation Controls]
+
+onNext=
+
+Help=Installer.txt
+
+
+
+[Image 1]
+
+Type=Image
+
+Name=netscape.bmp
+
+Value=
+
+Start_x=7
+
+Start_y=7
+
+Width=64
+
+Height=56
+
+
+
+
+
+[Widget 1]
+
+Type=ListBox
+
+Name=SelectedComponents
+
+Value=
+
+Start_x=17
+
+Start_y=77
+
+Width=90
+
+Height=70
+
+subsection=Options for ListBox1
+
+[Options for ListBox1]
+
+opt1=Address Book sync tool
+
+opt2=AIM
+
+opt3=Audio/Video Playback
+
+opt4=Beatnik Stub Plug-in
+
+opt5=Calendar
+
+opt6=CalendarLink sync tool
+
+opt7=Import Utility
+
+opt8=Internet Setup
+
+opt9=RealPlayer 5.0
+
+
+[Widget 2]
+
+Type=Text
+
+Name=Text11
+
+Value=Standard Components:
+
+Start_x=21
+
+Start_y=64
+
+Width=80
+
+Height=13
+
+
+
+
+
+[Widget 3]
+
+Type=Text
+
+Name=Text12
+
+Value=Select the components you want to include in your installer. The CCK wizard will automatically add the Communicator component.
+
+Start_x=3
+
+Start_y=32
+
+Width=345
+
+Height=18
+
+
+
+
+
+[Widget 4]
+
+Type=Text
+
+Name=Text13
+
+Value=Additional installers: You can add installers for two other products below.  Each must be in a single executable file and will be run after the main installation completes.
+
+Start_x=121
+
+Start_y=69
+
+Width=270
+
+Height=17
+
+
+
+
+
+[Widget 5]
+
+Type=EditBox
+
+Name=CustomComponent1
+
+Value=
+
+Start_x=121
+
+Start_y=110
+
+Width=162
+
+Height=14
+
+
+
+[Widget 6]
+
+Type=Button
+
+Name=Button3
+
+Value=Browse
+
+Start_x=287
+
+Start_y=110
+
+Width=36
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+[Widget 8]
+
+Type=EditBox
+
+Name=CustomComponent2
+
+Value=
+
+Start_x=121
+
+Start_y=138
+
+Width=162
+
+Height=14
+
+
+
+[Widget 7]
+
+Type=Button
+
+Name=Button4
+
+Value=Browse
+
+Start_x=287
+
+Start_y=138
+
+Width=36
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+
+
+[Widget 9]
+
+Type=Text
+
+Name=Text14
+
+Value=Specify the path to the executable (.exe) file of your custom component(s):
+
+Start_x=121
+
+Start_y=90
+
+Width=240
+
+Height=11
+
+
+
+
+
+[Widget 10]
+
+Type=Text
+
+Name=Text15
+
+Value=Custom component path:
+
+Start_x=123
+
+Start_y=127
+
+Width=75
+
+Height=8
+
+
+
+
+
+[Widget 11]
+
+Type=Text
+
+Name=Text16
+
+Value=Custom component path:
+
+Start_x=123
+
+Start_y=100
+
+Width=75
+
+Height=8
+
+
+
+
+
+[Widget 12]
+
+Type=Text
+
+Name=Text17
+
+Value=Page 1 of 1
+
+Description=Current Page
+
+Start_x=342
+
+Start_y=16
+
+Width=38
+
+Height=8
+
+
+
+
+
+[Widget 13]
+
+Type=GroupBox
+
+Name=GroupBox2
+
+Value=Choose installers to create
+
+Start_x=4
+
+Start_y=205
+
+Width=398
+
+Height=39
+
+
+
+
+
+[Widget 14]
+
+Type=CheckBox
+
+Name=CreateCDImage
+
+Value=
+
+Title=Create CD image
+
+Start_x=12
+
+Start_y=215
+
+Width=111
+
+Height=13
+
+
+
+
+
+[Widget 15]
+
+Type=CheckBox
+
+Name=CreateNetworkDownloadable
+
+Value=
+
+Title=Create Network-downloadable file
+
+Start_x=12
+
+Start_y=228
+
+Width=140
+
+Height=12
+
+
+
+
+
+[Widget 16]
+
+Type=GroupBox
+
+Name=GroupBox3
+
+Value=Install Components
+
+Start_x=3
+
+Start_y=50
+
+Width=399
+
+Height=105
+
+
+
+
+
+;[Widget 17]
+
+;Type=Button
+
+;Name=Button5
+
+;Value=Review All Customizations...
+
+;Start_x=165
+
+;Start_y=219
+
+;Width=101
+
+;Height=15
+
+;Type=ProgressBar
+
+;Name=myProgBar
+
+;Value=Review All Customizations...
+
+;Start_x=165
+
+;Start_y=219
+
+;Width=101
+
+;Height=15
+
+
+
+
+
+[Widget 18]
+
+Type=GroupBox
+
+Name=GroupBox4
+
+Value=Netcenter dialog
+
+Start_x=3
+
+Start_y=158
+
+Width=399
+
+Height=45
+
+
+
+
+
+[Widget 19]
+
+Type=CheckBox
+
+Name=DisplayNetcenterDialog
+
+Value=
+
+Title=Display Netcenter dialog during installation
+
+Start_x=8
+
+Start_y=189
+
+Width=157
+
+Height=9
+
+
+
+
+
+[Widget 20]
+
+Type=Text
+
+Name=Text18
+
+Value=If displayed during installation, the Netcenter dialog gives users the option of making Netcenter (home.netscape.com) their default home page.
+
+Start_x=7
+
+Start_y=169
+
+Width=394
+
+Height=19
+
+
+
+
+
+[Widget 21]
+
+Type=Text
+
+Name=Text19
+
+Value=Customize
+
+Description=Navigation Status
+
+Start_x=210
+
+Start_y=7
+
+Width=44
+
+Height=9
+
+
+
+
+
+[Widget 22]
+
+Type=Text
+
+Name=Text20
+
+Value=Account Setup
+
+Description=Navigation Status
+
+Start_x=267
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 23]
+
+Type=Text
+
+Name=Text21
+
+Value=Build Installer(s)
+
+Description=Current Page
+
+Start_x=338
+
+Start_y=7
+
+Width=52
+
+Height=9
+
+
+
+
+
+[Widget 24]
+
+Type=Text
+
+Name=Text22
+
+Value=Brand
+
+Description=Navigation Status
+
+Start_x=161
+
+Start_y=7
+
+Width=27
+
+Height=9
+
+
+
+
+
+;[Widget 25]
+
+;Type=Button
+
+;Name=Button6
+
+;Value=Build Installers
+
+;Start_x=272
+
+;Start_y=219
+
+;Width=85
+
+;Height=15
+
+;dll=IBEngine.dll
+
+;function=BrowseFile
+
+
+