Cleaning up function/method/variable names in the Account Manager to reflect their labels in the .dtds. r=bhuvan@netscape.com, sr=sspitzer@netscape.com. Bug 81043.

mailnews/base/prefs/resources/content/AccountManager.js

@@ -60,8 +60,8 @@ var nsPrefBranch;
 
 // widgets
 var duplicateButton;
-var deleteButton;
-var newAccountButton;
+var removeButton;
+var addAccountButton;
 var setDefaultButton;
 
 // This sets an attribute in a xul element so that we can later
@@ -119,9 +119,9 @@ function onLoad() {
 
   doSetOKCancel(onOk, 0);
 
-  newAccountButton = document.getElementById("newAccountButton");
+  addAccountButton = document.getElementById("addAccountButton");
   duplicateButton = document.getElementById("duplicateButton");
-  deleteButton = document.getElementById("deleteButton");
+  removeButton = document.getElementById("removeButton");
   setDefaultButton = document.getElementById("setDefaultButton");
 
   sortAccountList(accounttree);
@@ -328,7 +328,7 @@ function onSave() {
   }
 }
 
-function onNewAccount() {
+function onAddAccount() {
   MsgAccountWizard();
 }
 
@@ -376,8 +376,8 @@ function onSetDefault(event) {
   accountManager.defaultAccount = account;
 }
 
-function onDeleteAccount(event) {
-    //dump("onDeleteAccount\n");
+function onRemoveAccount(event) {
+    //dump("onRemoveAccount\n");
 
     if (event.target.getAttribute("disabled") == "true") return;
 
@@ -397,9 +397,9 @@ function onDeleteAccount(event) {
     }
     if (!canDelete) return;
 
-    var confirmDeleteAccount =
-      gPrefsBundle.getString("confirmDeleteAccount");
-    if (!window.confirm(confirmDeleteAccount)) return;
+    var confirmRemoveAccount =
+      gPrefsBundle.getString("confirmRemoveAccount");
+    if (!window.confirm(confirmRemoveAccount)) return;
 
     try {
       // clear cached data out of the account array
@@ -411,8 +411,8 @@ function onDeleteAccount(event) {
       selectServer(null);
     }
     catch (ex) {
-      dump("failure to delete account: " + ex + "\n");
-      var alertText = gPrefsBundle.getString("failedDeleteAccount");
+      dump("failure to remove account: " + ex + "\n");
+      var alertText = gPrefsBundle.getString("failedRemoveAccount");
       window.alert(alertText);
     }
 }
@@ -536,19 +536,19 @@ function updateButtons(tree,serverId) {
   // check for disabled preferences on the account buttons.  
   //  Not currently handled by WSM or the main loop yet since these buttons aren't
   //  under the IFRAME
-  if (nsPrefBranch.prefIsLocked(newAccountButton.getAttribute("prefstring")))
+  if (nsPrefBranch.prefIsLocked(addAccountButton.getAttribute("prefstring")))
     canCreate = false;
   //if (nsPrefBranch.prefIsLocked(duplicateButton.getAttribute("prefstring")))
   //  canDuplicate = false;
   if (nsPrefBranch.prefIsLocked(setDefaultButton.getAttribute("prefstring")))
     canSetDefault = false;
-  if (nsPrefBranch.prefIsLocked(deleteButton.getAttribute("prefstring")))
+  if (nsPrefBranch.prefIsLocked(removeButton.getAttribute("prefstring")))
     canDelete = false;
 
-  setEnabled(newAccountButton, canCreate);
+  setEnabled(addAccountButton, canCreate);
   setEnabled(duplicateButton, canDuplicate);
   setEnabled(setDefaultButton, canSetDefault);
-  setEnabled(deleteButton, canDelete);
+  setEnabled(removeButton, canDelete);
 
 }
 

mailnews/base/prefs/resources/content/AccountManager.xul

@@ -49,7 +49,7 @@
           </rule>
         </template>
       </tree>
-      <button label="&newAccountButton.label;" oncommand="onNewAccount(event);" id="newAccountButton"
+      <button label="&addAccountButton.label;" oncommand="onAddAccount(event);" id="addAccountButton"
               prefstring="mail.accountmanager.accounts"/>
       <button label="&setDefaultButton.label;" oncommand="onSetDefault(event);" disabled="true" id="setDefaultButton"
               prefstring="mail.disable_button.set_default_account"/>
@@ -57,7 +57,7 @@
         <!-- taking out for PR2
           <button disabled="true" label="&duplicateButton.label;" id="duplicateButton" oncommand="onDuplicateAccount();"/>
         -->
-        <button disabled="true" label="&deleteButton.label;" oncommand="onDeleteAccount(event);" id="deleteButton"
+        <button disabled="true" label="&removeButton.label;" oncommand="onRemoveAccount(event);" id="removeButton"
                 prefstring="mail.disable_button.delete_account"/>
     </vbox>
   

mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd

@@ -2,10 +2,10 @@
 
 <!ENTITY accountManagerTitle.label "Mail &amp; Newsgroups Account Settings">
 
-<!ENTITY newAccountButton.label "Add Account...">
+<!ENTITY addAccountButton.label "Add Account...">
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY duplicateButton.label "Duplicate">
-<!ENTITY deleteButton.label "Remove Account">
+<!ENTITY removeButton.label "Remove Account">
 
 <!ENTITY nameCol.label "Name">
 <!ENTITY duplicate.label "Duplicate">

mailnews/base/prefs/resources/locale/en-US/prefs.properties

@@ -41,9 +41,9 @@ WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
 enterValidEmailPrefix=Please enter a valid email address.
 enterValidHostname=Please enter a valid hostname.
-failedDeleteAccount=Failed to delete this account.
+failedRemoveAccount=Failed to remove this account.
 failedDuplicateAccount=Failed to duplicate this account.
-confirmDeleteAccount=Are you sure you want to remove this account?
+confirmRemoveAccount=Are you sure you want to remove this account?
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S