Bug 90263 - Change error message in account wizard from "hostname" to "server name"
authoraceman <acelists@atlas.sk>
Tue, 21 Feb 2012 14:43:35 +0000
changeset 10888 59710ebe215a546ee3372172b920c534afa3f7f9
parent 10887 6ecb91c6405aa1db9a41f4d9b117673ee713d9b0
child 10889 d7c6f47e41e1cf714de9161355ff48e90d1799db
push id463
push userbugzilla@standard8.plus.com
push dateTue, 24 Apr 2012 17:34:51 +0000
treeherdercomm-beta@e53588e8f7b0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs90263
Bug 90263 - Change error message in account wizard from "hostname" to "server name"
mail/locales/en-US/chrome/messenger/prefs.properties
mailnews/base/prefs/content/AccountManager.js
mailnews/base/prefs/content/SmtpServerEdit.js
suite/locales/en-US/chrome/mailnews/pref/prefs.properties
--- a/mail/locales/en-US/chrome/messenger/prefs.properties
+++ b/mail/locales/en-US/chrome/messenger/prefs.properties
@@ -8,17 +8,17 @@ serverNameChanged=The server name settin
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
-enterValidHostname=Please enter a valid hostname.
+enterValidServerName=Please enter a valid server name.
 failedRemoveAccount=Failed to remove this account.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
 confirmRemoveAccount=Are you sure you want to remove the account "%S"?
 confirmRemoveAccountTitle=Remove Account
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=If you store this account's new mail in a different account's Inbox, you will no longer be able to access already downloaded e-mail for this account. If you have mail in this account, please copy it to another account first. If you have filters that filter mail into this account, you should disable them or change the destination folder. If any accounts have special folders in this account (Sent, Drafts, Templates), you should change them to be in another account. Do you still want to store this account's e-mail in a different account?
--- a/mailnews/base/prefs/content/AccountManager.js
+++ b/mailnews/base/prefs/content/AccountManager.js
@@ -250,17 +250,17 @@ function checkUserServerChanges(showAler
   const Ci = Components.interfaces;
   if (smtpService.defaultServer) {
     try {
       var smtpHostName = top.frames["contentFrame"].document.getElementById("smtp.hostname");
       if (smtpHostName && hostnameIsIllegal(smtpHostName.value)) {
         var alertTitle = document.getElementById("bundle_brand")
                                  .getString("brandShortName");
         var alertMsg = document.getElementById("bundle_prefs")
-                               .getString("enterValidHostname");
+                               .getString("enterValidServerName");
 
         Cc["@mozilla.org/embedcomp/prompt-service;1"]
           .getService(Ci.nsIPromptService).alert(window, alertTitle, alertMsg);
         gSmtpHostNameIsIllegal = true;
       }
     }
     catch (ex) {}
   }
--- a/mailnews/base/prefs/content/SmtpServerEdit.js
+++ b/mailnews/base/prefs/content/SmtpServerEdit.js
@@ -61,17 +61,17 @@ function initializeDialog(server)
 }
 
 function onAccept()
 {
     if (hostnameIsIllegal(gSmtpHostname.value)) {
       var prefsBundle = document.getElementById("bundle_prefs");
       var brandBundle = document.getElementById("bundle_brand");
       var alertTitle = brandBundle.getString("brandShortName");
-      var alertMsg = prefsBundle.getString("enterValidHostname");
+      var alertMsg = prefsBundle.getString("enterValidServerName");
       var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
       promptService.alert(window, alertTitle, alertMsg);
 
       window.arguments[0].result = false;
       return false;
     }
 
     // if we didn't have an SMTP server to initialize with,
--- a/suite/locales/en-US/chrome/mailnews/pref/prefs.properties
+++ b/suite/locales/en-US/chrome/mailnews/pref/prefs.properties
@@ -47,17 +47,17 @@ serverNameChanged=The server name settin
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)
-enterValidHostname=Please enter a valid hostname.
+enterValidServerName=Please enter a valid server name.
 failedRemoveAccount=Failed to remove this account.
 #LOCALIZATION NOTE: confirmRemoveAccount: %S is the account pretty name
 confirmRemoveAccount=Are you sure you want to remove the account "%S"?
 confirmRemoveAccountTitle=Remove Account
 #LOCALIZATION NOTE: accountName: %1$S is server name, %2$S is user name
 accountName=%1$S - %2$S
 
 confirmDeferAccount=If you store this account's new mail in a different account's Inbox, you will no longer be able to access already downloaded e-mail for this account. If you have mail in this account, please copy it to another account first. If you have filters that filter mail into this account, you should disable them or change the destination folder. If any accounts have special folders in this account (Sent, Drafts, Templates), you should change them to be in another account. Do you still want to store this account's e-mail in a different account?