fix for 32255, remove placeholder text in migrate before-delete dialog, and updated code to reflect correct behaviour.

profile/resources/content/profileManager.js

@@ -121,10 +121,12 @@ function ConfirmDelete()
     var lString = bundle.GetStringFromName("migratebeforedelete");
     lString = lString.replace(/\s*<html:br\/>/g,"\n");
     var title = bundle.GetStringFromName("deletetitle");
-    if (commonDialogService.Confirm(window, title, lString))
-      profile.migrateProfile( profilename, true );
-    else
-      return false;
+    if (commonDialogService.Confirm(window, title, lString)) {
+      profile.deleteProfile( name, false );
+      var profileKids = document.getElementById( "profilekids" )
+      profileKids.removeChild( selected );
+    }
+    return;
   }
 
   var win = window.openDialog('chrome://communicator/content/profile/deleteProfile.xul', 'Deleter', 'chrome,modal=yes');
@@ -145,9 +147,6 @@ function DeleteProfile( deleteFiles )
       profileKids.removeChild( selected );
     }
     catch (ex) {
-      var lString = bundle.GetStringFromName("deletefailed");
-      lString = lString.replace(/\s*<html:br\/>/g,"\n");
-      alert( lString );
     }
     if( firstAdjacent )
       profileTree.selectItem( firstAdjacent );

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

@@ -1,15 +1,13 @@
 
 migratebeforerename=The profile you selected was created with a previous version of Communicator and must be copied and converted to a Mozilla profile before it can be renamed. <html:br/><html:br/> Do you want to convert this profile now?<html:br/><html:br/>
-migratebeforedelete=The profile you selected was created with a previous version of Communicator and must be copied and converted to a Mozilla profile before it can be deleted. <html:br/><html:br/> Do you want to convert this profile now?<html:br/><html:br/>
+migratebeforedelete=The profile you selected was created with a previous version of Communicator. Mozilla can remove this profile from the list of profiles that it maintains but you must remove it from your system using the version of Communicator that created it, or by hand.<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 Communicator and must be copied and converted before you can use it with Mozilla.<html:br/><html:br/>Your original 4.x profile will not be altered.<html:br/><html:br/>Choose OK to copy and convert the profile.
 migratetitle=Migrate Profile
 migrateallprofilestitle=Migrate All Profiles
-renamefailed=Sorry, Mozilla has failed to rename the profile you have selected.<html:br/><html:br/>Resolution:<html:br/>1) Restart Mozilla and try again. <html:br/>2) Close other applications or restart your computer.<html:br/>3) Check to ensure the profile files are not damaged.<html:br/><html:br/>
 renameprofilepromptA=Rename the profile "
 renameprofilepromptB=" to:
 renameprofiletitle=Rename Profile
 
-deletefailed=Sorry, Mozilla has failed to delete the profile you have selected.<html:br/><html:br/>Resolution:<html:br/>1) Restart Mozilla and try again. <html:br/>2) Close other applications or restart your computer.<html:br/>3) Check to ensure the profile files are not damaged.<html:br/><html:br/>
 deletetitle=Delete Profile
 
 pm_title=Manage User Profiles