Bug 1412651 - Update en-GB for Gecko 57 - SeaMonkey part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 01 Nov 2017 06:14:49 +0000
changeset 740 ebed7a0da3727c7063c6927dc23f8941687469d4
parent 739 d468844d7c0a28b44c897ab3195474014df5012c
child 741 440d6fbf0938fb765c7e17b4ab4e7d580285942c
push id135
push userfrancesco.lodolo@mozillaitalia.org
push dateWed, 01 Nov 2017 07:12:07 +0000
reviewersme
bugs1412651
Bug 1412651 - Update en-GB for Gecko 57 - SeaMonkey part r=me
suite/chrome/browser/webDeveloper.dtd
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/developer_tools.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/pref/pref-http.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/news.properties
suite/chrome/mailnews/newsError.dtd
--- a/suite/chrome/browser/webDeveloper.dtd
+++ b/suite/chrome/browser/webDeveloper.dtd
@@ -14,17 +14,16 @@
 <!ENTITY devtoolsConnect.accesskey       "e">
 
 <!ENTITY browserConsoleCmd.label         "Browser Console">
 <!ENTITY browserConsoleCmd.commandkey    "Ζ">
 <!ENTITY browserConsoleCmd.accesskey     "B">
 
 <!ENTITY responsiveDesignTool.label      "Responsive Design View">
 <!ENTITY responsiveDesignTool.accesskey  "R">
-<!ENTITY responsiveDesignTool.commandkey "M">
 
 <!ENTITY eyedropper.label                "Eyedropper">
 <!ENTITY eyedropper.accesskey            "y">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -481,28 +481,22 @@
 <p>The HTTP Networking preferences panel is used to configure HTTP-based
   networking:</p>
 
 <ul>
   <li><strong>Direct Connection Options, Proxy Connection Options</strong>:
     Choose the HTTP version and options for direct and proxy connections.
     <ul>
       <li><strong>Use HTTP 1.0</strong>: Choose this to use the original
-        version of HTTP, standardised in 1996.</li>
-      <li><strong>Use HTTP 1.1</strong>: Choose this to use the new version of
-        HTTP, which offers performance enhancements, including more efficient
-        use of HTTP connections, better support for client-side caching,
-        multiple HTTP requests (pipelining), and more refined control over
-        cache expiration and replacement policies.</li>
-      <li><strong>Enable Pipelining</strong>: Select this to
-        enable pipelining, which allows for more than one HTTP request to be
-        sent to the server at once, reducing delays loading web pages.
-
-        <p><strong>Note</strong>: Pipelining is only available with 
-          HTTP 1.1.</p></li>
+        version of HTTP, standardised in 1996. This setting is mostly intended
+        for compatibility reasons with proxy or older web servers.</li>
+      <li><strong>Use HTTP 1.1</strong>: Choose this to use the current version
+        of HTTP, which offers performance enhancements, including more efficient
+        use of HTTP connections, better support for client-side caching, and
+        more refined control over cache expiration and replacement policies.</li>
     </ul>
   </li>
   <li><strong>User Agent String</strong>:
     The identifier sent by &brandShortName; to all web sites is used for
     statistics about web site usage but also sometimes to expose certain
     features only to known browsers (a practice known as "sniffing").
     Consequently, unticking any of these boxes may result in web sites or remote
     calendar services not working properly.
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -97,17 +97,17 @@
 <p>The Content preferences panel allows you to change settings that influence
   how web site and message content appears in &brandShortName;.</p>
 
 <ul>
   <li>Web Site Icons:
     <ul>
       <li><strong>Show web site icons</strong>: Select this if you want see
         site-specific icons, if available, in place of the bookmark icon
-        <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+        <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
         alt="Bookmark item icon"/>. Web site icons are shown to the left of the
         Location Bar and Browser tabs.</li>
       <li><strong>Aggressively look for web site icons when the page does not
         define one</strong>: If the page itself does not define a web site
         icon, turning on this setting makes &brandShortName; look for a
         &quot;favicon&quot; on the server and use that instead.</li>
       <li>Display web site icons in bookmarks menu and toolbar:
         <ul>
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -596,27 +596,27 @@
 
 <p>You can add buttons for your favourite bookmarks, or folders containing
   groups of bookmarks. To create a new bookmark to add to the Personal
   Toolbar:</p>
   
 <ol>
   <li>Open a web page you want to bookmark.</li>
   <li>Drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
     alt="image of bookmark icon"/>(located to the left of URL in the
     Location Bar) to a desired place on the Personal Toolbar. You can drag the
     icon directly to the Personal Toolbar, or to a folder on the Personal
     Toolbar. For more information, see
     <a href="#adding_bookmark_folders_to_the_personal_toolbar">Adding Bookmark
     Folders to the Personal Toolbar</a>.</li>
 </ol>
 
 <p><strong>Note</strong>: The bookmark icon
-  <img src="chrome://communicator/skin/bookmarks/bookmark-item.png" alt="image
+  <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg" alt="image
   of bookmark icon"/> may appear as another page-specific icon if you have
   ticked Show Web Site Icons in preferences. See
   <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences -
   Appearance</a> for more information on changing this preferences.</p>
 
 <p>Each item in the Personal Toolbar folder appears as a toolbar button. You
   may need to enlarge the browser window to see them all.</p>
 
@@ -818,17 +818,17 @@
     </ol>
   
     <p><strong>Tip</strong>: If you have multiple browser tabs open in a
       window, you can select <q>Bookmark this groups of tabs</q> to add a
       single bookmark that will open all of the open tabs in the current
       window.</p>
   </li>
   <li>To add a bookmark to the Personal Toolbar, drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
     alt="image of bookmark icon"/> next to the Location Bar to a place on
     the Personal Toolbar. You can drag a bookmark to the following places:
     <ul>
       <li>In the Bookmarks folder on the Personal Toolbar.</li>
       <li>In a bookmarks folder you&apos;ve created on the Personal
         Toolbar.</li>
       <li>To the Personal Toolbar itself, on the right side of all bookmarks
         folders.
@@ -847,26 +847,26 @@
   <tr>
     <td><strong>Personal Toolbar</strong></td>
   </tr>
 </table>
 
 <ul>
   <li>To add a bookmark to the Bookmarks tab in Sidebar, open Sidebar, select
     the Bookmarks tab, and drag the bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
     alt="image of bookmark icon"/> next to the Location Bar to a place on
     the bookmark list in the Bookmarks tab.
   </li>
 </ul>
 
 <p><strong>Notes</strong>:</p>
 <ul>
   <li>The bookmark icon
-    <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+    <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
     alt="image of bookmark icon"/> may appear as another page-specific
     icon if you have ticked Show Web Site Icons in preferences. See
     <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences -
     Appearance</a> for more information on changing this preferences.</li>
   <li>After adding a bookmark using any of the methods listed above, it can be
     accessed using the Sidebar Bookmarks tab, the Manage Bookmarks window, and
     the Bookmarks menu.</li>
 </ul>
@@ -1488,17 +1488,17 @@
         browser window your home page.</li>
       <li>Click Choose File to select a file from your computer&apos;s hard
         drive.</li>
    </ul>
  </li>
 </ol>
 
 <p><strong>Tip</strong>: To specify your home page quickly, drag the bookmark
-  icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.png"
+  icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.svg"
   alt="image of bookmark icon"/> from the Location Bar to the Home Page
   button on the Personal Toolbar.</p>
 
 <p>[<a href="#specifying_how_mozilla_starts_up">Return to beginning of
   section</a>]</p>
 
 <h3 id="specifying_which_components_open_at_launch">Specifying Which Components
   Open at Launch</h3>
--- a/suite/chrome/common/help/developer_tools.xhtml
+++ b/suite/chrome/common/help/developer_tools.xhtml
@@ -54,12 +54,21 @@
     developer tools that can be docked to the bottom of a browser window or
     used in a separate window. The <strong>Toggle Tools</strong> command in
     the Web Development menu can be used to open and close the Developer Tools.
 
     The Developer Tools are shared with Firefox. To learn more about the
     Developer Tools, visit the <a href="https://developer.mozilla.org/docs/Tools">
     Firefox Developer Tools site</a>.
   </li>
+  <li id="webide">
+    <strong>WebIDE</strong>: &brandShortName; includes Developer Tools WebIDE,
+      which can be used to debug other web sites or Gecko-based applications
+      running on the same computer, or on another device (such as a smartphone)
+      through a USB or network connection. To learn more, visit the
+      <a href="https://developer.mozilla.org/docs/Tools/Remote_Debugging">Remote
+      Debugging</a> page at MDN. Note that you may not be able to debug
+      applications that are newer than the included version of WebIDE.
+  </li>
 </ul>
 
 </body>
 </html>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -2211,16 +2211,21 @@
 
 <rdf:Description about="help-indexAZ.rdf#w">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="web_pages"
          nc:name="web pages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="WebIDE"
+         nc:name="WebIDE"
+         nc:link="developer_tools.xhtml#webide"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Working_Offline"
          nc:name="Working Offline"
          nc:link="mailnews_offline.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#web_pages">
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -1152,16 +1152,17 @@
 <!-- TOOLS AND DEVELOPMENT CONTENT STARTS -->
  
 <rdf:Description about="#tools">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="tools-js_console" nc:name="Error Console" nc:link="developer_tools.xhtml#js_console"/> </rdf:li>
         <rdf:li><rdf:Description ID="tools-inspector" nc:name="DOM Inspector" nc:link="developer_tools.xhtml#inspector"/> </rdf:li>
         <rdf:li><rdf:Description ID="tools-devtools" nc:name="Developer Tools" nc:link="developer_tools.xhtml#devtools"/> </rdf:li>
+        <rdf:li><rdf:Description ID="tools-webide" nc:name="WebIDE" nc:link="developer_tools.xhtml#webide"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
 </rdf:Description>
 
 <!-- KEYBOARD SHORTCUTS CONTENT STARTS -->
 <rdf:Description about="#shortcuts">
     <nc:subheadings>
       <rdf:Seq>
--- a/suite/chrome/common/pref/pref-http.dtd
+++ b/suite/chrome/common/pref/pref-http.dtd
@@ -8,19 +8,15 @@
 <!ENTITY prefDirect.label                    "Direct Connection Options">
 <!ENTITY prefProxy.label                     "Proxy Connection Options">
 <!ENTITY prefEnableHTTP10.label              "Use HTTP 1.0">
 <!ENTITY prefEnableHTTP10.accesskey          "U">
 <!ENTITY prefEnableHTTP10Proxy.accesskey     "S">
 <!ENTITY prefEnableHTTP11.label              "Use HTTP 1.1">
 <!ENTITY prefEnableHTTP11.accesskey          "E">
 <!ENTITY prefEnableHTTP11Proxy.accesskey     "T">
-<!ENTITY prefEnablePipelining.label          "Enable Pipelining">
-<!ENTITY prefEnablePipelining.accesskey      "P">
-<!ENTITY prefEnablePipeliningProxy.accesskey "N">
 <!ENTITY prefPara                            "HTTP connections may be fine-tuned using these options to enhance either performance or compatibility. Some proxy servers, for example, are known to require HTTP/1.0 (see the release notes for details).">
-<!ENTITY prefPipeWarning                     "WARNING: pipelining is an experimental feature, designed to improve page-load performance, that is unfortunately not well supported by some web servers and proxies.">
 <!ENTITY prefUseragent.label                 "User Agent String">
 <!ENTITY prefFirefoxCompat.label             "Advertise Firefox compatibility">
 <!ENTITY prefFirefoxCompat.accesskey         "F">
 <!ENTITY prefLightningShow.label             "Advertise Lightning installation">
 <!ENTITY prefLightningShow.accesskey         "L">
 <!ENTITY prefCompatWarning                   "WARNING: disabling these settings may result in web sites or services not working properly.">
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -56,24 +56,16 @@ propertyFax=Fax
 propertyCellular=Mobile
 propertyPager=Pager
 propertyBirthday=Birthday
 propertyCustom1=Custom 1
 propertyCustom2=Custom 2
 propertyCustom3=Custom 3
 propertyCustom4=Custom 4
 
-## LOCALIZATION NOTE (dateformat)
-## Only used if the year isn't present and should be in the format used by Date.toLocaleFormat
-## see http://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/Date/toLocaleFormat
-## %B is the month's localized name and %d is the day of the month [1-31].
-## Don't go using %e here, since it breaks things on Windows!
-## Separators (a space, dash, etc.) can be used
-dateFormatMonthDay=%d %B
-
 ## LOCALIZATION NOTE (cityAndStateAndZip): 
 ## %1$S is city, %2$S is state, %3$S is zip
 cityAndStateAndZip=%1$S, %2$S %3$S
 ## LOCALIZATION NOTE (cityAndStateNoZip): 
 ## %1$S is city, %2$S is state
 cityAndStateNoZip=%1$S, %2$S
 ## LOCALIZATION NOTE (cityOrStateAndZip): 
 ## %1$S is city or state, %2$S is zip
@@ -157,16 +149,23 @@ headingOther=Other
 headingPhone=Phone
 headingDescription=Description
 headingAddresses=Addresses
 
 # For address books
 addressBookTitleNew=New Address Book
 ## LOCALIZATION NOTE (addressBookTitleEdit): %S will be replaced by the the Address Book's name
 addressBookTitleEdit=%S Properties
+duplicateNameTitle=Duplicate Address Book Name
+# LOCALIZATION NOTE (duplicateNameText):
+# Don't localize "\n• %S" unless your local layout comes out wrong.
+# %S is the name of the existing address book.
+# Example: An address book with this name already exists:
+#          • My Custom AB
+duplicateNameText=An address book with this name already exists:\n• %S
 
 # For corrupt .mab files
 corruptMabFileTitle=Corrupt Address Book File
 corruptMabFileAlert=One of your address book files (%1$S file) could not be read. A new %2$S file will be created and a backup of the old file, called %3$S, will be created in the same directory.
 
 # For locked .mab files
 lockedMabFileTitle=Unable to Load Address Book File
 lockedMabFileAlert=Unable to load address book file %S. It may be read-only, or locked by another application. Please try again later.
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -107,18 +107,21 @@ smtpAuthMechNotSupported=The Outgoing se
 # LOCALIZATION NOTE (smtpAuthenticationNotSupported): %S is the server hostname
 smtpAuthenticationNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in 'Account Settings | Outgoing server (SMTP)' or contact your email service provider for instructions.
 
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.
 
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
-## LOCALIZATION NOTE (SaveDlogMessages): %1$S is folder name
-saveDlogMessages=Message has not been sent. Do you want to save the message in your drafts folder (%1$S)?
+
+## LOCALIZATION NOTE (saveDlogMessages2): Do not translate the words %1$S and \n.
+## %1$S is replaced by the folder name configured for saving drafts (typically the "Drafts" folder).
+## Translate "Compose" to match the translation of item "windowTitlePrefix" below.
+saveDlogMessages2=Message has not been sent or saved in your drafts folder (%1$S).\n"Save" copies the message to your drafts folder (%1$S) and closes the Compose window.\n"Don't Save" closes the Compose window without saving a draft.\n"Cancel" allows you continue writing without saving a draft.
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
 
 ##
 windowTitlePrefix=Compose:
 
@@ -233,12 +236,50 @@ renameAttachmentMessage=New attachment n
 smtpEnterPasswordPrompt=Enter your password for %S:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
 ## words %1$S and %2$S. Place the word %1$S where the host name should appear,
 ## and %2$S where the user name should appear.
 smtpEnterPasswordPromptWithUsername=Enter your password for %2$S on %1$S:
 smtpEnterPasswordPromptTitle=SMTP Server Password Required
 
-## LOCALIZATION NOTE(errorSavingMsg): Do not translate the word %S. It
-## will be replaced with the name of the folder the message is being saved to.
-errorSavingMsg=There was an error saving the message to %S. Retry?
+## LOCALIZATION NOTE(promptToSaveSentLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved sent messages (typically the "Sent" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+## Translate "Compose" to match the translation of item "windowTitlePrefix" above.
+promptToSaveSentLocally=Your message was sent but not saved to your sent folder (%1$S) probably because of network errors.\n"Retry" attempts the save again.\n"Save" copies the message to %3$S/%1$S-%2$S and closes the Compose window if it is present.\n"Cancel" does not save the sent message and closes the Compose window if it is present.
 errorFilteringMsg=Your message has been sent and saved, but there was an error while running message filters on it.
+## LOCALIZATION NOTE(promptToSaveDraftLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved draft messages (typically the "Drafts" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveDraftLocally=Your draft message was not saved to your drafts folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your draft.
+buttonLabelRetry=Retry
+
+## LOCALIZATION NOTE(promptToSaveTemplateLocally): Do not translate the stings %1$S, %2$S, %3$S and \n.
+## %2$S will be replaced with the account name. $1$S will be replaced by the folder name
+## configured to contain saved templates (typically the "Templates" folder).
+## %3$S will be replaced with the local folders account name (typically "Local Folders").
+promptToSaveTemplateLocally=Your template was not saved to your templates folder (%1$S) probably because of network errors.\n"Retry" attempts to save again.\n"Save" copies the message to %3$S/%1$S-%2$S and you can continue writing.\n"Cancel" allows you to continue writing without saving your template.
+
+## LOCALIZATION NOTE(saveToLocalFoldersFailed): Message appears after normal
+## save fails (e.g., to Sent) and save to Local Folders also fails. This could
+## occur if network is down and filesystem problems are present such as disk
+## full, permission issues or hardware failure.
+saveToLocalFoldersFailed=Unable to save your message to local folders. Possibly out of file storage space.
+
+## LOCALIZATION NOTE(blockedAllowResource): %S is the URL to load.
+blockedAllowResource=Unblock %S
+## LOCALIZATION NOTE (blockedContentMessage): Semi-colon list of plural forms.
+## See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## %S will be replaced by brandShortName.
+## Files must be unblocked individually, therefore the plural form reads:
+## Unblocking a file (one of several) will include it (that one file) in your sent message.
+## In other words:
+## Unblocking one/several file(s) will include it/them in your message.
+blockedContentMessage=%S has blocked a file from loading into this message. Unblocking the file will include it in your sent message.;%S has blocked some files from loading into this message. Unblocking a file will include it in your sent message.
+
+## LOCALIZATION NOTE (blockedContentPrefLabel, blockedContentPrefAccesskey):
+## Same content as (blockedContentPrefLabel, blockedContentPrefAccesskey)
+## in mail directory. SeaMonkey does only use Options and not Preferences.
+blockedContentPrefLabel=Options
+blockedContentPrefAccesskey=O
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -137,16 +137,17 @@ imapEnterServerPasswordPrompt=Enter your
 imapServerNotImap4=Mail server %S is not an IMAP4 mail server.
 
 # This is intentionally left blank.
 imapDone=
 
 imapEnterPasswordPromptTitle=Mail Server Password Required
 
 imapUnknownHostError=Failed to connect to server %S.
+imapOAuth2Error=Authentication failure while connecting to server %S.
 
 imapConnectionRefusedError=Could not connect to mail server %S; the connection was refused.
 
 imapNetTimeoutError=Connection to server %S timed out.
 
 # Status - no messages to download 
 imapNoNewMessages=There are no new messages on the server.
 
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -1,17 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The following are used by the messenger application
 
-#LOCALIZATION NOTE(statusMessage): Do not translate the words
-# $1S and $2S below. Place the word $1S where account name should appear and $2S
-# where the status message should appear.
+# LOCALIZATION NOTE(statusMessage):
+# Do not translate the words %1$S and %2$S below. Place the word %1$S where the
+# account name should appear and %2$S where the status message should appear.
+# EXAMPLE: Jim's Account: Downloading messages...
 statusMessage=%1$S: %2$S
 
 renameFolder=Rename Folder…
 compactFolder=Compact This Folder
 removeAccount=Delete Account…
 removeFolder=Delete Folder
 newFolderMenuItem=Folder…
 newSubfolderMenuItem=Subfolder…
@@ -323,16 +324,20 @@ attachmentsPrintHeader=Attachments:
 
 # Connection Error Messages
 # LOCALIZATION NOTE(unknownHostError): %S is the server name
 unknownHostError=Failed to connect to server %S.
 # LOCALIZATION NOTE(connectionRefusedError): %S is the server name
 connectionRefusedError=Could not connect to server %S; the connection was refused.
 # LOCALIZATION NOTE(netTimeoutError): %S is the server name
 netTimeoutError=Connection to server %S timed out.
+# LOCALIZATION NOTE(netResetError): %S is the server name
+netResetError=Connection to server %S was reset.
+# LOCALIZATION NOTE(netInterruptError): %S is the server name
+netInterruptError=Connection to server %S was interrupted.
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages  
 biffNotification_message=has %1$S new message
 biffNotification_messages=has %1$S new messages
 
 # LOCALIZATION NOTE(macBiffNotification is Mac only):
 #  %1$S is the number of new messages
 #  %2$S is a list of names and/or email addresses separated by biffNotification_separator
--- a/suite/chrome/mailnews/news.properties
+++ b/suite/chrome/mailnews/news.properties
@@ -1,19 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 downloadHeadersTitlePrefix=Download Headers
 downloadHeadersInfoText=There are %S new message headers to download for this newsgroup.
-htmlNewsErrorTitle=Error!
-# LOCALIZATION NOTE ( htmlNewsError ): In the following item, translate only "Error!" and "newsgroup server responded:"
-htmlNewsError=<H1>Error!</H1>newsgroup server responded: 
-# LOCALIZATION NOTE ( articleExpired ): In the following item, translate only "Perhaps the article has expired"
-articleExpired=<B><P>Perhaps the article has expired</P></B>
-removeExpiredArtLinkText=Click here to remove all expired articles
 cancelDisallowed=This message does not appear to be from you.  You may only cancel your own posts, not those made by others.
 cancelConfirm=Are you sure you want to cancel this message?
 messageCancelled=Message cancelled.
 enterUserPassTitle=News Server Username and Password Required
 # LOCALIZATION NOTE (enterUserPassServer): %S is the server being accessed
 enterUserPassServer=Please enter a username and password for %S:
 # LOCALIZATION NOTE (enterUserPassGroup): %1$S is a specific newsgroup to set
 # the password for; %2$S is the server from which the newsgroup is accessed
new file mode 100644
--- /dev/null
+++ b/suite/chrome/mailnews/newsError.dtd
@@ -0,0 +1,31 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE (newsError.title): The title of the news error page.
+     Not generally visible. -->
+<!ENTITY newsError.title "Problem Loading Article">
+
+<!-- LOCALIZATION NOTE (articleNotFound.title): The main heading for the news
+     error page. -->
+<!ENTITY articleNotFound.title "Article not found">
+
+<!-- LOCALIZATION NOTE (articleNotFound.desc): A longer description for the news
+     error page. -->
+<!ENTITY articleNotFound.desc "The newsgroup server reports that it can't find the article.">
+
+<!-- LOCALIZATION NOTE (serverResponded.title): A string preceding the text
+     response from the newsgroup server describing the error. -->
+<!ENTITY serverResponded.title "Newsgroup server responded:">
+
+<!-- LOCALIZATION NOTE (articleExpired.title): A string explaining that the
+     article may have expired. -->
+<!ENTITY articleExpired.title "Perhaps the article has expired?">
+
+<!-- LOCALIZATION NOTE (trySearching.title): A string preceding the message's
+     ID. -->
+<!ENTITY trySearching.title "Try searching for article:">
+
+<!-- LOCALIZATION NOTE (removeExpiredArticles.title): The label for the button
+     to remove all expired articles from the newsgroup. -->
+<!ENTITY removeExpiredArticles.title "Remove All Expired Articles">