31154, 50517 - consistency in terminology in profile manager dialogs.

patch by henrik gemal, sr=ben@netscape.com, r=hewitt@netscape.com

profile/resources/locale/en-US/confirmMigration.dtd

@@ -1,7 +0,0 @@
-<!ENTITY window.title "Confirm Migration">
-
-<!-- LOCALIZATION NOTE (confirmMigrationPart1.label): Don't translate "&brandShortName" -->
-<!ENTITY confirmMigrationPart1.label "You are about to create a &brandShortName; profile based on your Netscape 4 profile.">
-<!ENTITY confirmMigrationPart2.label "This will copy and convert some of your Netscape 4 files to work with &brandShortName;. Your Netscape 4 profile data will not be modified.">
-<!ENTITY confirmMigrationPart3.label "Click OK if you want to proceed with this conversion."> 
-<!ENTITY confirmMigrationPart4.label "(If you click Cancel, you can always do it later.)">

profile/resources/locale/en-US/profileManager.properties

@@ -1,6 +1,10 @@
 # LOCALIZATION NOTE: Do not translate <html:br/> 
-migratebeforerename=The profile you selected was created with a previous version of Netscape and must be copied and converted to a %brandShortName% profile before it can be renamed.<html:br/><html:br/> Do you want to convert this profile?<html:br/><html:br/>
-migratebeforestart=The profile you selected was created with a previous version of Netscape and must be copied and converted before you can use it with %brandShortName%.<html:br/><html:br/> Your original 4.x profile will not be altered. <html:br/><html:br/> Do you want to copy and convert this profile?
+migratebeforestart=The profile you selected was created with a previous version of Netscape and must be copied and converted before you can use it with %brandShortName%.<html:br/><html:br/> Your original Netscape profile will not be altered. <html:br/><html:br/> Do you want to copy and convert this profile?
+migratebeforerename=The profile you selected was created with a previous version of Netscape and must be copied and converted to a %brandShortName% profile before it can be renamed.<html:br/><html:br/> Your original Netscape profile will not be altered. <html:br/><html:br/> Do you want to convert this profile?<html:br/><html:br/>
+migratebeforedelete=The profile you selected was created with a previous version of Netscape. %brandShortName% can remove this profile from the list of profiles that it maintains but you must remove it from your system using the version of Netscape that created it, or by hand.<html:br/><html:br/> Your original Netscape profile will not be altered. <html:br/><html:br/> Do you want to remove this profile from the list of profiles?<html:br/><html:br/> migratebeforestart=The profile you selected was created with a previous version of Netscape and must be copied and converted before you can use it with %brandShortName%.<html:br/><html:br/> Your original Netscape profile will not be altered. <html:br/><html:br/> Do you want to copy and convert this profile?
+
+
+
 migratetitle=Migrate Profile
 migrateallprofilestitle=Migrate All Profiles
 renameProfilePrompt=Rename the profile "%oldProfileName%" to:

profile/resources/locale/en-US/profileSelection.dtd

@@ -54,7 +54,8 @@
 <!-- manager entities -->
 <!ENTITY            pmTextA.label         "&brandShortName; stores information about your settings, preferences, bookmarks, stored messages and other user items in your user profile.">
 <!ENTITY            pmTextC.label         "You must select a profile, or create a new profile, the first time you start &brandShortName;.">
-<!ENTITY            pmTextB.label         "Indicates a profile created with a previous version of Communicator. These profiles must be converted before they can be loaded with &brandShortName;. This is an automated process.">
+<!ENTITY            pmTextB.label         "Indicates a profile created with a previous version of Netscape. These profiles must be copied and converted before they can be loaded with &brandShortName;. This is an automated process.">
+
 
 <!ENTITY            offlineState.label    "Work Offline">
 <!ENTITY            offlineState.accesskey "o">