From c8f2c1e859f5ab992641a8cf74d49cafd2822e59 Mon Sep 17 00:00:00 2001
From: "robinf%netscape.com" <robinf%netscape.com>
Date: Sat, 18 Sep 1999 00:41:44 +0000
Subject: [PATCH] checking in updates to UI and text that fix my M11 and M12
 bugs.

---
 cck/cckwiz/iniFiles/AccountSetup.ini    | 43 +++++++++++----
 cck/cckwiz/iniFiles/Branding_page2.ini  | 48 ++++++++++++-----
 cck/cckwiz/iniFiles/Branding_page3.ini  | 61 ++++++++++++---------
 cck/cckwiz/iniFiles/Branding_page4.ini  | 72 +++++++++++++------------
 cck/cckwiz/iniFiles/CheckList.ini       | 56 +++++++++----------
 cck/cckwiz/iniFiles/Customize_page1.ini | 28 +++++++---
 cck/cckwiz/iniFiles/Customize_page3.ini | 29 ++++++++--
 cck/cckwiz/iniFiles/Info.ini            | 30 ++---------
 cck/cckwiz/iniFiles/build_page1.ini     | 10 ++--
 9 files changed, 220 insertions(+), 157 deletions(-)

diff --git a/cck/cckwiz/iniFiles/AccountSetup.ini b/cck/cckwiz/iniFiles/AccountSetup.ini
index 3b1cdbc2166..aa670dbe558 100644
--- a/cck/cckwiz/iniFiles/AccountSetup.ini
+++ b/cck/cckwiz/iniFiles/AccountSetup.ini
@@ -38,7 +38,7 @@
 
 Name=AccountSetup
 
-Title=Customizing Internet Setup - Points of Presence (PoP)
+Title=Client Customization Kit - Page 8 of 10
 
 Caption=1st level node
 
@@ -168,7 +168,7 @@ Type=RadioButton
 
 Name=SortByName
 
-Title=Alphabetically by description
+Title=Alphabetically by city
 
 Group=radioGroup
 
@@ -228,11 +228,11 @@ Type=Button
 
 Name=CreateNCIButton
 
-Value=Create
+Value=Create...
 
 Start_x=135
 
-Start_y=99
+Start_y=89
 
 Width=51
 
@@ -254,11 +254,11 @@ Type=Button
 
 Name=EditNCIButton
 
-Value=Edit
+Value=Edit...
 
 Start_x=135
 
-Start_y=115
+Start_y=105
 
 Width=51
 
@@ -284,7 +284,7 @@ Value=Delete
 
 Start_x=135
 
-Start_y=131
+Start_y=121
 
 Width=51
 
@@ -298,6 +298,27 @@ parameters=cmd.exe /c del %NCIFileList%
 
 Target=NCIFileList
 
+
+[Widget 1543]
+
+Type=Button
+
+Name=Button2641
+
+Value=Import...
+
+Start_x=135
+
+Start_y=138
+
+Width=51
+
+Height=14
+
+dll=NULL
+
+function=
+
 
 
 [Widget 9]
@@ -306,7 +327,7 @@ Type=Text
 
 Name=Text92
 
-Value=To create a new PoP file, click Create, and name the file based on the local calling area it serves (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 PoP files.
+Value=To create a new PoP file, click Create, and name the file based on the city or local calling area it serves (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 PoP files.
 
 Start_x=5
 
@@ -386,7 +407,7 @@ Type=Text
 
 Name=Text95
 
-Value=Location of text editor:
+Value=Path to text editor:
 
 Start_x=11
 
@@ -424,13 +445,13 @@ Type=Button
 
 Name=Button21
 
-Value=Browse
+Value=Choose Editor...
 
 Start_x=202
 
 Start_y=223
 
-Width=50
+Width=60
 
 Height=14
 
diff --git a/cck/cckwiz/iniFiles/Branding_page2.ini b/cck/cckwiz/iniFiles/Branding_page2.ini
index 4b7666af76b..bd846ac5adf 100644
--- a/cck/cckwiz/iniFiles/Branding_page2.ini
+++ b/cck/cckwiz/iniFiles/Branding_page2.ini
@@ -18,7 +18,7 @@
 
 [Local Variables]
 Name=Branding_page2
-Title=Customizing the CD Autorun Screen
+Title=Netscape Client Customization Kit - Page 6 of 10
 Caption=2nd level node
 
 [Navigation Controls]
@@ -38,7 +38,7 @@ Height=56
 [Widget 1]
 Type=Text
 Name=Text59
-Value=The CD Autorun screen appears when the user inserts a Communicator CD into their computer's CD-ROM drive. You can customize the background bitmap image that appears on the CD Autorun screen, as well as the text and installation instructions.
+Value=The CD Autorun screen appears when the user inserts a Netscape 2000 CD into their computer's CD-ROM drive. You can customize the background bitmap image that appears on the CD Autorun screen, as well as the text and installation instructions.
 Start_x=5
 Start_y=28
 Width=400
@@ -68,7 +68,7 @@ Height=50
 [Widget 10]
 Type=Text
 Name=Text62
-Value=Location of background bitmap file (640 x 480 pixels):
+Value=Path to background bitmap file (640 x 480 pixels):
 Start_x=12
 Start_y=70
 Width=210
@@ -80,19 +80,31 @@ Name=ShellBgBitmap
 Value=
 Start_x=12
 Start_y=83
-Width=155
+Width=200
 Height=14
 
 [Widget 7]
 Type=Button
 Name=Button13
-Value=Browse
-Start_x=171
+Value=Choose File...
+Start_x=275
+Start_y=83
+Width=50
+Height=14
+dll=NULL
+function=BrowseFile
+
+[Widget 768]
+Type=Button
+Name=Button1353
+Value=View File...
+Start_x=230
 Start_y=83
 Width=40
 Height=14
 dll=NULL
-function=BrowseFile
+function=
+
 
 [Widget 21]
 Type=Button
@@ -180,7 +192,7 @@ Height=16
 [Widget 14]
 Type=Text
 Name=Text65
-Value=Location of installation text file (install.txt):
+Value=Path to installation text file (install.txt):
 Start_x=12
 Start_y=212
 Width=148
@@ -193,16 +205,28 @@ Name=ShellInstallTextFile
 Value=
 Start_x=12
 Start_y=223
-Width=155
+Width=200
 Height=14
 
+[Widget 728]
+Type=Button
+Name=Button1383
+Value=View File...
+Start_x=230
+Start_y=223
+Width=40
+Height=14
+dll=NULL
+function=
+
+
 [Widget 16]
 Type=Button
 Name=Button14
-Value=Browse
-Start_x=171
+Value=Choose File...
+Start_x=275
 Start_y=223
-Width=40
+Width=50
 Height=14
 dll=NULL
 function=BrowseFile
diff --git a/cck/cckwiz/iniFiles/Branding_page3.ini b/cck/cckwiz/iniFiles/Branding_page3.ini
index 8cf56fb9c3b..2a554e11ab9 100644
--- a/cck/cckwiz/iniFiles/Branding_page3.ini
+++ b/cck/cckwiz/iniFiles/Branding_page3.ini
@@ -18,7 +18,7 @@
 
 [Local Variables]
 Name=Branding_page3
-Title=Customizing Internet Setup
+Title=Netscape Client Customization Kit - Page 7 of 10
 Caption=2nd level node
 
 [Navigation Controls]
@@ -34,13 +34,23 @@ Start_y=0
 Width=425
 Height=56
 
+[Widget 1931]
+Type=Text
+Name=Text7053
+Value=Internet Setup lets users easily create new Internet accounts or set up Netscape 2000 to connect to an existing account that they've already established with you.
+Start_x=7
+Start_y=25
+Width=400
+Height=20
+
+
 
 [Widget 1]
 Type=Text
 Name=Text70
-Value=The logo graphic appears on all Internet Setup screens.
+Value=Internet Setup can display your logo graphic.
 Start_x=7
-Start_y=53
+Start_y=58
 Width=360
 Height=13
 
@@ -50,17 +60,29 @@ Type=EditBox
 Name=AcctSetupBgBitmap
 Value=
 Start_x=7
-Start_y=81
-Width=155
+Start_y=86
+Width=200
 Height=14
 
+[Widget 362]
+Type=Button
+Name=Button169
+Value=View File...
+Start_x=226
+Start_y=86
+Width=50
+Height=14
+dll=NULL
+function=
+
+
 [Widget 3]
 Type=Button
 Name=Button16
-Value=Browse
-Start_x=170
-Start_y=81
-Width=40
+Value=Choose File...
+Start_x=280
+Start_y=86
+Width=50
 Height=14
 dll=NULL
 function=BrowseFile
@@ -70,7 +92,7 @@ Type=Button
 Name=Button128
 Value=Show Example
 Start_x=334
-Start_y=81
+Start_y=86
 Width=60
 Height=14
 dll=NULL
@@ -81,7 +103,7 @@ parameters=accnt1.ini
 [Widget 4]
 Type=Text
 Name=Text71
-Value=Your Company Name appears on all Internet Setup screens.
+Value=Internet Setup can display your company name.
 Start_x=10
 Start_y=128
 Width=266
@@ -119,21 +141,12 @@ dll=NULL
 function=DisplayImage
 parameters=accnt3.ini
 
-;[Widget 6]
-;Type=Text
-;Name=Text72
-;Value=You can specify a custom logo, company name, and technical support ;phone number to be displayed in Internet Setup.
-;Start_y=27
-;Width=380
-;Height=12
-;start_X=5
-
 [Widget 689]
 Type=Text
 Name=Text721
-Value=Location of logo graphic (.gif) file (need dimensions in pixels):
+Value=Path to logo graphic (.gif) file (need dimensions in pixels):
 Start_x=7
-Start_y=66
+Start_y=71
 Width=366
 Height=17
 
@@ -141,7 +154,7 @@ Height=17
 [Widget 9]
 Type=Text
 Name=Text75
-Value=Your Technical Support Phone Number appears on all Internet Setup screens.
+Value=Internet Setup can display your technical support phone number.
 Start_x=12
 Start_y=193
 Width=300
@@ -189,7 +202,7 @@ Value=Logo Graphic
 
 Start_x=3
 
-Start_y=40
+Start_y=45
 
 Width=402
 
diff --git a/cck/cckwiz/iniFiles/Branding_page4.ini b/cck/cckwiz/iniFiles/Branding_page4.ini
index a57310eda17..db650c139ac 100644
--- a/cck/cckwiz/iniFiles/Branding_page4.ini
+++ b/cck/cckwiz/iniFiles/Branding_page4.ini
@@ -38,7 +38,7 @@
 
 Name=Branding_page4
 
-Title=Customizing the Installer
+Title=Netscape Client Customization Kit - Page 9 of 10
 
 Caption=2nd level node
 
@@ -66,28 +66,7 @@ Start_y=0
 
 Width=425
 
-Height=56
-
-
-
-
-
-;[Widget 1]
-
-;Type=Text
-
-;Name=Text23
-
-;Value=You can customize the Splash Screen and text that appear during ;installation.
-
-;Start_x=3
-;
-;Start_y=31
-
-;Width=294
-
-;Height=12
-
+Height=56
 
 
 [Widget 10]
@@ -114,13 +93,13 @@ Type=Text
 
 Name=Text355
 
-Value=The Installer splash screen appears when the user starts the Communicator installer (setup.exe).
+Value=The Installer splash screen appears when the user starts the Netscape 2000 installer (setup.exe).
 
 Start_x=13
 
 Start_y=65
 
-Width=300
+Width=340
 
 Height=25
 
@@ -132,13 +111,13 @@ Type=Text
 
 Name=Text25
 
-Value=Location of your custom splash screen bitmap (setup.bmp) file (390 pixels x 261 pixels):
+Value=Path to your custom splash screen bitmap (setup.bmp) file (390 pixels x 261 pixels):
 
 Start_x=13
 
-Start_y=85
+Start_y=83
 
-Width=300
+Width=325
 
 Height=20
 
@@ -156,7 +135,7 @@ Start_x=11
 
 Start_y=97
 
-Width=179
+Width=200
 
 Height=14
 
@@ -168,9 +147,9 @@ Type=Button
 
 Name=Button7
 
-Value=Browse
+Value=View File...
 
-Start_x=195
+Start_x=233
 
 Start_y=97
 
@@ -180,7 +159,7 @@ Height=14
 
 dll=NULL
 
-function=BrowseFile
+function=
 
 
 
@@ -284,7 +263,7 @@ Name=Button133
 
 Value=Show Example
 
-Start_x=330
+Start_x=335
 
 Start_y=180
 
@@ -298,6 +277,28 @@ function=DisplayImage
 
 parameters=inst.ini
 
+
+[Widget 507]
+
+Type=Button
+
+Name=Button1163
+
+Value=Choose File...
+
+Start_x=280
+
+Start_y=97
+
+Width=50
+
+Height=14
+
+dll=NULL
+
+function=BrowseFile
+
+parameters=
 
 
 [Widget 200]
@@ -308,9 +309,9 @@ Name=Button116
 
 Value=Show Example
 
-Start_x=330
+Start_x=335
 
-Start_y=108
+Start_y=97
 
 Width=60
 
@@ -322,3 +323,4 @@ function=DisplayImage
 
 parameters=splash.ini
 
+
diff --git a/cck/cckwiz/iniFiles/CheckList.ini b/cck/cckwiz/iniFiles/CheckList.ini
index 4515d72a41d..75b08710ebf 100644
--- a/cck/cckwiz/iniFiles/CheckList.ini
+++ b/cck/cckwiz/iniFiles/CheckList.ini
@@ -18,7 +18,7 @@
 
 [Local Variables]
 Name=CheckList
-Title=Welcome
+Title=Netscape Client Customization Kit - Page 1 of 10
 Caption=1st level node
 
 [Navigation Controls]
@@ -37,9 +37,9 @@ Height=56
 [Widget 19]
 Type=Button
 Name=Button142
-Value=New
-Start_x=300
-Start_y=208
+Value=New Configuration...
+Start_x=210
+Start_y=218
 Width=77
 Height=17
 dll=NULL
@@ -49,7 +49,7 @@ target=CustomizationList
 [Widget 1]
 Type=Text
 Name=Text31
-Value=This wizard helps you create customized Netscape Communicator installers that you can distribute to your users.
+Value=This tool helps you create customized Netscape 2000 installers that you can distribute to your users.
 Start_x=7
 Start_y=24
 Width=350
@@ -70,7 +70,7 @@ Height=20
 Type=ComboBox
 Name=CustomizationList
 Value=
-Start_x=98
+Start_x=7
 Start_y=220
 Width=185
 Height=99
@@ -84,19 +84,19 @@ parameters=customizations\*.*
 [Widget 5]
 Type=Text
 Name=Text34
-Value=Select a configuration to edit, or click "New" to create a new installer configuration. To copy an existing configuration, select it from the drop down list below and then click "Create a Copy".
+Value=Select a configuration to edit, or click "New Configuration" to create a new installer configuration and workspace in which to store your custom files. To edit an existing configuration without overwriting the original configuration, select it from the drop down list and click "Create a Copy".
 Start_x=7
 Start_y=188
 Width=400
-Height=20
+Height=25
 
 
 [Widget 6]
 Type=Text
 Name=Text35
-Value=* Bookmarks file
+Value=* Bookmarks (bookmarks.html) file
 Start_x=20
-Start_y=103
+Start_y=97
 Width=123
 Height=9
 
@@ -106,7 +106,7 @@ Type=Text
 Name=Text36
 Value=* Read Me file
 Start_x=20
-Start_y=122
+Start_y=119
 Width=200
 Height=9
 
@@ -116,7 +116,7 @@ Type=Text
 Name=Text37
 Value=* Small and large custom animation files
 Start_x=20
-Start_y=113
+Start_y=108
 Width=200
 Height=9
 
@@ -126,7 +126,7 @@ Type=Text
 Name=Text38
 Value=* Background bitmap for CD Autorun screen (for CD-based installers)
 Start_x=20
-Start_y=141
+Start_y=140
 Width=300
 Height=11
 
@@ -134,9 +134,9 @@ Height=11
 [Widget 10]
 Type=Text
 Name=Text39
-Value=* Splash screen for the Communicator installer
+Value=* Splash screen for the Netscape 2000 installer
 Start_x=20
-Start_y=132
+Start_y=129
 Width=200
 Height=9
 
@@ -144,7 +144,7 @@ Height=9
 [Widget 11]
 Type=Text
 Name=Text40
-Value=* Custom logo bitmap for Internet Setup
+Value=* Custom logo for Internet Setup
 Start_x=20
 Start_y=151
 Width=300
@@ -174,7 +174,7 @@ Height=30
 [Widget 16]
 Type=Text
 Name=Text45
-Value=* Third-party installers (.exe files)
+Value=* Third-party installers (up to two .exe files)
 Start_x=20
 Start_y=161
 Width=200
@@ -184,38 +184,30 @@ Height=11
 [Widget 17]
 Type=Text
 Name=Text46
-Value=* CD-based installer or network-downloadable installer?  (you can create one or both during the same wizard session)
+Value=* CD-based installer or network-downloadable installer?  (you can create one or both at the same time)
 Start_x=20
 Start_y=62
 Width=370
 Height=10
 
-[Widget 13]
-Type=Text
-Name=Text42
-Value=* Set up users's Internet connection settings?  (configures Communicator and users's dialer software so that users who've already established accounts with you can connect to your network using a standard modem and phone line)
-Start_x=20
-Start_y=72
-Width=375
-Height=20
 
 [Widget 14]
 Type=Text
 Name=Text43
-Value=2. Decide which customizations you want to make and create the customized files that you want to use, such as:
+Value=2. Decide which customizations you want to make and create the customized files that you want to include in your custom build, such as:
 Start_x=7
-Start_y=92
-Width=400
-Height=10
+Start_y=74
+Width=370
+Height=20
 
 
 
 [Widget 18]
 Type=Button
 Name=Button8
-Value=Create a Copy
+Value=Create a Copy...
 Start_x=300
-Start_y=228
+Start_y=218
 Width=77
 Height=17
 dll=NULL
diff --git a/cck/cckwiz/iniFiles/Customize_page1.ini b/cck/cckwiz/iniFiles/Customize_page1.ini
index 1db5219e1ce..5b501978060 100644
--- a/cck/cckwiz/iniFiles/Customize_page1.ini
+++ b/cck/cckwiz/iniFiles/Customize_page1.ini
@@ -18,7 +18,7 @@
 
 [Local Variables]
 Name=Customize_page1
-Title=Customizing the Netscape Browser - Part Two
+Title=Netscape Client Customization Kit - Page 4 of 10
 Caption=2nd level node
 
 [Navigation Controls]
@@ -175,7 +175,7 @@ Height=10
 [Widget 10]
 Type=Text
 Name=Text83
-Value=Location of Bookmarks (bookmark.htm) File:
+Value=Path to Bookmarks (bookmarks.html) File:
 Start_x=12
 Start_y=128
 Width=150
@@ -187,17 +187,29 @@ Type=EditBox
 Name=CustomBookmarkFile
 Value=
 Start_x=11
-Start_y=138
-Width=155
+Start_y=137
+Width=223
 Height=14
 
+[Widget 1285]
+Type=Button
+Name=Button1759
+Value=View File...
+Start_x=240
+Start_y=137
+Width=40
+Height=14
+dll=NULL
+function=
+
+
 [Widget 12]
 Type=Button
 Name=Button17
-Value=Browse
-Start_x=180
-Start_y=138
-Width=40
+Value=Choose File...
+Start_x=285
+Start_y=137
+Width=50
 Height=14
 dll=NULL
 function=BrowseFile
diff --git a/cck/cckwiz/iniFiles/Customize_page3.ini b/cck/cckwiz/iniFiles/Customize_page3.ini
index fdbb1460555..106c148905c 100644
--- a/cck/cckwiz/iniFiles/Customize_page3.ini
+++ b/cck/cckwiz/iniFiles/Customize_page3.ini
@@ -38,7 +38,7 @@
 
 Name=Customize_page3
 
-Title=Customizing the Netscape Browser - Part Three
+Title=Netscape Client Customization Kit - Page 5 of 10
 
 Caption=2nd level node
 
@@ -233,7 +233,7 @@ Start_x=8
 
 Start_y=190
 
-Width=224
+Width=219
 
 Height=14
 
@@ -245,13 +245,13 @@ Type=Button
 
 Name=Button2
 
-Value=Browse
+Value=Choose File...
 
-Start_x=240
+Start_x=280
 
 Start_y=189
 
-Width=35
+Width=50
 
 Height=14
 
@@ -345,5 +345,24 @@ function=DisplayImage
 parameters=readme.ini
 
 
+[Widget 118]
+
+Type=Button
+
+Name=Button28
+
+Value=View File...
+
+Start_x=235
+
+Start_y=189
+
+Width=40
+
+Height=14
+
+dll=NULL
+
+function=
 
 
diff --git a/cck/cckwiz/iniFiles/Info.ini b/cck/cckwiz/iniFiles/Info.ini
index 7b120c8a4c7..75d6916aa85 100644
--- a/cck/cckwiz/iniFiles/Info.ini
+++ b/cck/cckwiz/iniFiles/Info.ini
@@ -18,7 +18,7 @@
 
 [Local Variables]
 Name=Customize_page2
-Title=Gathering Information
+Title=Netscape Client Customization Kit - Page 2 of 10
 Caption=2nd level node
 
 [Navigation Controls]
@@ -48,42 +48,22 @@ Height=100
 Type=CheckBox 
 Name=CD image 
 Value=
-Title=CD-ready installer (for distributing Communicator on CD). You'll be able to customize the CD Autorun screen.
+Title=CD-ready installer (for distributing Netscape 2000 on CD). You'll be able to customize the CD Autorun screen.
 Start_x=6
 Start_y=55
-Width=350
+Width=360
 Height=13
 
 [Widget 1895] 
 Type=CheckBox 
 Name=Network 
 Value=
-Title=Network-ready installer (for distributing Communicator by having users download it from your FTP site)
+Title=Network-ready installer (for distributing Netscape 2000 by letting users download it from your FTP site)
 Start_x=6
 Start_y=71
 Width=330
 Height=13
 
-;[Widget 1896]
-;Type=Text
-;Name=Text8302
-;Value=Internet Setup is an application that lets users easily create new Internet accounts or set up Communicator to connect to an existing account that they've already established with you. Internet Setup also configures users's dialer software so that they can connect to their accounts using a modem and phone line. Internet Setup does not support ISDN, DSL, or T1 connections.
-;Start_x=6
-;Start_y=116
-;Width=400
-;Height=45
-
-;[Widget 1897] 
-;Type=CheckBox 
-;Name=Include Internet Setup
-;Value=
-;Title=Include Internet Setup in your installer
-;Start_x=6
-;Start_y=143
-;Width=144
-;Height=13
-
-
 
 [Widget 3]
 Type=GroupBox
@@ -169,7 +149,7 @@ Height=12
 [Widget 7]
 Type=Text
 Name=Text105
-Value=The Company Identifier is included as part of Navigator's user agent string. For example, if your company name is Net Advantage, you can enter NETADVANTA as your company identifier. The resulting user agent string would be: Mozilla/4.5[en]{C-UDP;NETADVANTA} (Win95;I).
+Value=The Company Identifier is included as part of the browser's user agent string. For example, if your company name is Net Advantage, you can enter NETADVANTA as your company identifier. The resulting user agent string would be: Mozilla/5.0[en]{C-UDP;NETADVANTA} (Win95;I).
 Start_x=10
 Start_y=158
 Width=380
diff --git a/cck/cckwiz/iniFiles/build_page1.ini b/cck/cckwiz/iniFiles/build_page1.ini
index 6dd3f15b570..8807bed3066 100644
--- a/cck/cckwiz/iniFiles/build_page1.ini
+++ b/cck/cckwiz/iniFiles/build_page1.ini
@@ -38,7 +38,7 @@
 
 Name=Installer
 
-Title=Building the Installer(s)
+Title=Netscape Client Customization Kit - Page 10 of 10
 
 Caption=1st level node
 
@@ -215,13 +215,13 @@ Type=Button
 
 Name=Button3
 
-Value=Browse
+Value=Choose File...
 
 Start_x=330
 
 Start_y=108
 
-Width=36
+Width=50
 
 Height=14
 
@@ -342,13 +342,13 @@ Type=Button
 
 Name=Button386
 
-Value=Browse
+Value=Choose File...
 
 Start_x=331
 
 Start_y=185
 
-Width=36
+Width=50
 
 Height=14