Wording inconsistencies in Account Manager and Account Wizard (NNTP/SMTP). Bug 70241 r=nbaca/robinf/jglick sr=sspitzer a/rs=rchen (localization)

mailnews/base/prefs/resources/locale/en-US/am-server-top.dtd

@@ -6,7 +6,7 @@
 <!-- LOCALIZATION NOTE (imapServer.label) : do not translate "IMAP" in below line -->
 <!ENTITY imapServer.label "IMAP Mail Server">
 <!-- LOCALIZATION NOTE (newsServer.label) : do not translate "NNTP" in below line -->
-<!ENTITY newsServer.label "News (NNTP) Server">
+<!ENTITY newsServer.label "News Server (NNTP)">
 <!ENTITY webmail.label "WebMail account">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">

mailnews/base/prefs/resources/locale/en-US/aw-done.dtd

@@ -5,8 +5,8 @@
 <!ENTITY emailPrefix.label "Email Address:">
 <!ENTITY serverTypePrefix.label "Incoming Server Type:">
 <!ENTITY serverNamePrefix.label "Incoming Server Name:">
-<!ENTITY smtpServerNamePrefix.label "Outgoing Server Name:">
-<!ENTITY newsServerNamePrefix.label "News Server Name:">
+<!ENTITY smtpServerNamePrefix.label "Outgoing Server Name (SMTP):">
+<!ENTITY newsServerNamePrefix.label "News Server Name (NNTP):">
 <!ENTITY accountNamePrefix.label "Account Name:">
 <!ENTITY setupAnother.label "Click Set up Another to save these settings and set up another account.">
 <!ENTITY clickFinish.label "Click Finish to save these settings and exit the Account Wizard.">

mailnews/base/prefs/resources/locale/en-US/aw-server.dtd

@@ -8,11 +8,11 @@
 <!ENTITY incomingServerNameDesc.label "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
 <!ENTITY incomingServerLabel.label "Server Name:">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
-<!ENTITY newsServerNameDesc.label "Enter the name of your news (NNTP) server (for example, &quot;news.example.net&quot;).">
+<!ENTITY newsServerNameDesc.label "Enter the name of your news server (NNTP) (for example, &quot;news.example.net&quot;).">
 <!-- LOCALIZATION NOTE (smtpServerTitle.label) : Do not translate "SMTP" in below line -->
-<!ENTITY smtpServerTitle.label "Outgoing (SMTP) Server">
+<!ENTITY smtpServerTitle.label "Outgoing Server (SMTP)">
 <!-- LOCALIZATION NOTE (smtpServerDesc.label) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
-<!ENTITY smtpServerDesc.label "Enter the name of your outgoing (SMTP) server (for example, &quot;smtp.example.net&quot;).">
+<!ENTITY smtpServerDesc.label "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
 <!ENTITY smtpServerLabel.label "Server Name:">
 <!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
 <!ENTITY imapType.label "IMAP">

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

@@ -71,7 +71,7 @@ defaultServerTag=(Default)
 useDefaultServer=Use default server
 
 # LOCALIZATION NOTES(serverType-nntp): Do not translate "NNTP" in the line below
-serverType-nntp=Newsgroup server (NNTP)
+serverType-nntp=News Server (NNTP)
 # LOCALIZATION NOTES(serverType-pop3): Do not translate "POP" in the line below
 serverType-pop3=POP Mail Server
 # LOCALIZATION NOTES(serverType-imap): Do not translate "IMAP" in the line below