Bug 1180656 - Update en-GB for Gecko 40 - SeaMonkey part r=me THUNDERBIRD_40_0b1_BUILD1 THUNDERBIRD_40_0b1_BUILD2 THUNDERBIRD_40_0b1_BUILD3 THUNDERBIRD_40_0b1_RELEASE THUNDERBIRD_41_0b1_BUILD1 THUNDERBIRD_41_0b1_BUILD2 THUNDERBIRD_41_0b1_RELEASE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 11 Jul 2015 23:10:04 +0100
changeset 1433 dc7b99a71780cffcaa6da5658f0cc3e21cd54c92
parent 1432 1805923ec3183fe0723828fd6308cdd2b644196b
child 1439 686f94eff7a4762b39a6f2ba9b7304cfe9fd6c76
child 1440 ee1eb0cc48e57ef5d919b9054b6bf018e3ce7030
child 1442 6e63ee6b2ec094ea1c785e09655ea47064eac62d
child 1443 a84ea9368c6c1c41f827e6f6150045fdc896d1c7
child 1463 66fb8f2c815f17eddb9332336d8279c7d8c525d0
child 1480 9b843975bf293fdd8ba1fb5fcde411bd3fb8cfd9
push id771
push useriann_cvs@blueyonder.co.uk
push dateSat, 11 Jul 2015 22:10:15 +0000
reviewersme
bugs1180656
Bug 1180656 - Update en-GB for Gecko 40 - SeaMonkey part r=me
suite/chrome/browser/pageInfo.dtd
suite/chrome/common/contentAreaCommands.dtd
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/mailnews_using_mail.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/page_info_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/imapMsgs.properties
suite/chrome/mailnews/messenger.properties
--- a/suite/chrome/browser/pageInfo.dtd
+++ b/suite/chrome/browser/pageInfo.dtd
@@ -26,17 +26,17 @@
 <!ENTITY  generalTab.accesskey  "G">
 <!ENTITY  generalURL            "Address:">
 <!ENTITY  generalType           "Type:">
 <!ENTITY  generalMode           "Render Mode:">
 <!ENTITY  generalSize           "Size:">
 <!ENTITY  generalReferrer       "Referring URL:">
 <!ENTITY  generalSource         "Cache Source:">
 <!ENTITY  generalModified       "Modified:">
-<!ENTITY  generalEncoding       "Encoding:">
+<!ENTITY  generalEncoding2      "Text Encoding:">
 <!ENTITY  generalMetaName       "Name">
 <!ENTITY  generalMetaContent    "Content">
 <!ENTITY  generalSecurityDetails           "Details">
 <!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY  formsTab              "Forms">
 <!ENTITY  formsTab.accesskey    "F">
 <!ENTITY  formAction            "Form Action">
--- a/suite/chrome/common/contentAreaCommands.dtd
+++ b/suite/chrome/common/contentAreaCommands.dtd
@@ -62,21 +62,23 @@
 <!ENTITY bookmarkPageCmd.label        "Bookmark This Page">
 <!ENTITY bookmarkPageCmd.accesskey    "m">
 <!ENTITY bookmarkLinkCmd.label        "Bookmark This Link">
 <!ENTITY bookmarkLinkCmd.accesskey    "B">
 <!ENTITY bookmarkFrameCmd.label       "Bookmark This Frame">
 <!ENTITY bookmarkFrameCmd.accesskey   "m">
 <!ENTITY savePageAsCmd.label          "Save Page As…">
 <!ENTITY savePageCmd.label            "Save Page">
-<!ENTITY savePageCmd.accesskey        "a">
+<!ENTITY savePageCmd.accesskey        "e">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameAsCmd.label         "Save Frame As…">
 <!ENTITY saveFrameCmd.label           "Save Frame">
-<!ENTITY saveFrameCmd.accesskey       "m">
+<!ENTITY saveFrameCmd.accesskey       "a">
+<!ENTITY printFrameCmd.label          "Print Frame…">
+<!ENTITY printFrameCmd.accesskey      "P">
 <!ENTITY saveLinkAsCmd.label          "Save Link Target As…">
 <!ENTITY saveLinkCmd.label            "Save Link Target">
 <!ENTITY saveLinkCmd.accesskey        "S">
 <!ENTITY saveImageAsCmd.label         "Save Image As…">
 <!ENTITY saveImageCmd.label           "Save Image">
 <!ENTITY saveImageCmd.accesskey       "v">
 <!ENTITY saveVideoCmd.label           "Save Video As…">
 <!ENTITY saveVideoCmd.accesskey       "v">
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -175,18 +175,18 @@
 <p><strong>Note</strong>: Some font styles may not be selectable because the
   selected language does not have fonts available for that style.</p>
 
 <ul>
   <li><strong>Fonts for</strong>: Choose a language group/script. For instance,
     to set default fonts for West European languages/script (Latin), choose
     <q>Western.</q> For Unicode or a language/script not yet in the list, choose
     <q>Unicode.</q> For more information, including <q>User Defined</q>,
-    see <a href="nav_help.xhtml#selecting_character_encodings_and_fonts">Selecting
-    Character Encodings and Fonts</a>.<br/>
+    see <a href="nav_help.xhtml#selecting_text_encodings_and_fonts">Selecting
+    Text Encodings and Fonts</a>.<br/>
     All settings below, except for the tick box, are stored per language group;
     each can have its own set of font definitions.
     <ul>
       <li><strong>Proportional</strong>: Select whether proportional text
         should be serif (like Times Roman) or sans-serif (like Arial). You can
         also specify what font size you want for proportional text.
         Proportional text is variable in width, so characters and letters vary
         in width.</li>
--- a/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -199,17 +199,17 @@
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Browser category, click Languages. (If no subcategories are
     visible, double-click Browser to expand the list.)</li>
 </ol>
 
 <p>The Languages preferences panel allows you to choose the languages and
-  character encoding for displaying web pages:</p>
+  text encoding for displaying web pages:</p>
 
 <ul>
   <li><strong>Languages for Web Pages</strong>:
     <ul>
       <li><strong>Move Up / Move Down</strong>: Click one of these buttons to
         move a selected language up or down, which sets the order of preference
         for the listed languages.</li>
       <li><strong>Add</strong>: Click this to add additional languages for
@@ -220,23 +220,23 @@
         <a href="http://www.loc.gov/standards/iso639-2/php/code_list.php">Codes
         for the Representation of Names of Languages</a> for a complete list of
         language codes. Click OK to close the dialogue and save your
         changes.</li>
       <li><strong>Remove</strong>: Click this to remove a selected
         language.</li>
     </ul>
   </li>
-  <li><strong>Character Encoding for Legacy Content</strong>:
+  <li><strong>Text Encoding for Legacy Content</strong>:
     <ul>
-      <li><strong>Fallback Character Encoding</strong>: Web pages are supposed
-        to declare the character encoding in which they are to be displayed,
-        but legacy content may not do so. Use the drop-down list to select the
-        default character encoding to be used for such web pages. This setting
-        does not affect any web pages which properly declare their encoding.
+      <li><strong>Fallback Text Encoding</strong>: Web pages are supposed to
+        declare the text encoding in which they are to be displayed, but legacy
+        content may not do so. Use the drop-down list to select the default
+        text encoding to be used for such web pages. This setting does not
+        affect any web pages which properly declare their encoding.
       </li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="helper_applications">Browser Preferences - Helper Applications</h2>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -1108,21 +1108,16 @@
          nc:link="mailnews_using_mail.xhtml#attaching_a_file_or_web_page"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:changing_account_settings"
          nc:name="changing account settings"
          nc:link="mailnews_getting_started.xhtml#changing_the_settings_for_an_account"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="Mail_and_Newsgroups:Character_Encoding"
-         nc:name="Character Encoding"
-         nc:link="mailnews_preferences.xhtml#character_encoding"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:Compose_window"
          nc:name="Compose window"
          nc:link="mailnews_using_mail.xhtml#using_the_message_composition_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:composing_messages"
          nc:name="composing messages"
          nc:link="mailnews_using_mail.xhtml#composing_mail_and_newsgroup_messages"/>
@@ -1258,16 +1253,21 @@
          nc:link="mailnews_using_mail.xhtml#selecting_message_sending_options"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:SMTP_settings"
          nc:name="SMTP settings"
          nc:link="mailnews_account_settings.xhtml#outgoing_server"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="Mail_and_Newsgroups:Text_Encoding"
+         nc:name="Text Encoding"
+         nc:link="mailnews_preferences.xhtml#text_encoding"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:sorting_and_threading_messages"
          nc:name="sorting and threading messages"
          nc:link="mailnews_using_mail.xhtml#sorting_and_threading_messages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:using_address_books"
          nc:name="using address books"
          nc:link="mailnews_addressbooks.xhtml#using_address_books"/>
--- a/suite/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -478,22 +478,22 @@
     are logged in. Choose this setting to force &brandShortName; to
     authenticate each time it connects to this server even when the server
     doesn&apos;t ask (also called <q>Pushed Authentication</q>).</li>
   <li><strong>newsrc file</strong>: The path to the newsrc file is mostly
     displayed for your information. The newsrc file stores information about
     the newsgroups to which you are subscribed and the messages you have read
     in each newsgroup.</li>
   <li><strong>Local directory</strong>: The location on your hard disc where
-    mail for this account is stored.</li>
-  <li><strong>Default Character Encoding</strong>: Click this drop-down list to
-    select the character encoding you want Mail &amp; Newsgroups to use as the
-    default for incoming newsgroup messages. This is recommended if it&apos;s
-    likely you might receive messages in which the character encoding (MIME
-    charset) is not indicated, such as when reading messages in international
+    messages for this account is stored.</li>
+  <li><strong>Default Text Encoding</strong>: Click this drop-down list to
+    select the text encoding you want Mail &amp; Newsgroups to use as the
+    default for incoming newsgroup messages. This is recommended if it is
+    likely you might receive messages in which the text encoding (MIME charset
+    parameter) is not indicated, such as when reading messages in international
     newsgroups.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
 <h2 id="copies_and_folders">Mail &amp; Newsgroups Account Settings - Copies
   &amp; Folders</h2>
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -37,17 +37,17 @@
     <li><a href="#message_display">Message Display</a></li>
     <li><a href="#notifications">Notifications</a></li>
     <li><a href="#composition">Composition</a></li>
     <li><a href="#send_format">Send Format</a></li>
     <li><a href="#addressing_preferences">Addressing</a></li>
     <li><a href="#junk_and_suspect_preferences">Junk &amp; Suspect Mail</a></li>
     <li><a href="#tags">Tags</a></li>
     <li><a href="#return_receipts_preferences">Return Receipts</a></li>
-    <li><a href="#character_encoding">Character Encoding</a></li>
+    <li><a href="#text_encoding">Text Encoding</a></li>
     <li><a href="#network_and_storage_preferences">Network &amp; Storage
       Preferences</a></li>
   </ul>
 </div>
 
 <h2 id="mail_and_newsgroups">Mail &amp; Newsgroups Preferences - Mail &amp;
   Newsgroups</h2>
 
@@ -659,66 +659,64 @@
 
 <p>To override these global preferences for individual accounts, see
   <a href="mailnews_account_settings.xhtml#return_receipts">Mail &amp;
   Newsgroups Account Settings - Return Receipts</a>.</p>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
-<h2 id="character_encoding">Mail &amp; Newsgroups Preferences - Character
-  Encoding</h2>
+<h2 id="text_encoding">Mail &amp; Newsgroups Preferences - Text Encoding</h2>
 
-<p>Character encoding preferences allow you to choose how messages are encoded
-  when being displayed or created in all accounts. If you are not already
-  viewing the Character Encoding settings, follow these steps:</p>
+<p>Text (character) encoding preferences allow you to choose how messages are
+  encoded when being displayed or created in all accounts. If you are not
+  already viewing the Text Encoding settings, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences. You see the
     Preferences dialogue box.</li>
-  <li>Under the Mail &amp; Newsgroups category, click Character Encoding. (If
-    no subcategories are visible, double-click Mail &amp; Newsgroups to expand
+  <li>Under the Mail &amp; Newsgroups category, click Text Encoding. (If no
+    subcategories are visible, double-click Mail &amp; Newsgroups to expand
     the list.)</li>
 </ol>
 
 <ul>
-  <li><strong>Fallback Character Encoding</strong>: Click this drop-down list
-    to select the character encoding you want Mail &amp; Newsgroups to use as
-    the fallback for incoming mail and newsgroup messages. Senders are supposed
-    to declare the character encoding in which they are to be displayed, but
+  <li><strong>Fallback Text Encoding</strong>: Click this drop-down list to
+    select the text encoding you want Mail &amp; Newsgroups to use as the
+    fallback for incoming mail and newsgroup messages. Senders are supposed
+    to declare the text encoding in which they are to be displayed, but some
     legacy content (e.g., from mailing lists or in international newsgroups)
     may not do so. This encoding is used for such messages you&apos;ve received
-    in which the character encoding (MIME charset) is not specified.
+    in which the text encoding (MIME charset parameter) is not specified.
 
     <p><strong>Note</strong>: Individual folders may override this setting in
       the General Information tab of the Folder Properties. This dialogue can be
       accessed from the Edit menu of a Mail &amp; Newsgroup window when a
       folder is selected.</p>
 
-    <p><strong>Tip</strong>: You can later view or change the character
-      encoding for a specific message. Select a folder, then the message to
-      display. Open the View menu, and choose Character Encoding.</p>
+    <p><strong>Tip</strong>: You can later view or change the text encoding
+      for a specific message. Select a folder, then the message to display.
+      Open the View menu, and choose Text Encoding.</p>
   </li>
   <li><strong>For messages that contain 8-bit characters, use &apos;quoted
     printable&apos; MIME encoding</strong>: Choose to have Mail &amp;
     Newsgroups use <q>quoted printable</q> MIME encoding when sending regular
-    messages that use an 8-bit character encoding (for example, Latin
-    ISO-8859-3). This is usually only necessary when communicating via a legacy
-    server that doesn&apos;t process 8-bit encoding correctly.</li>
-  <li><strong>Default Character Encoding</strong>: Select the character
-    encoding you want Mail &amp; Newsgroups to use as the default for outgoing
-    mail and newsgroup messages.</li>
-  <li><strong>When possible, use this default character encoding in
-    replies.</strong>: By default, the selected character encoding is
-    <strong>not</strong> used when replying to a message. Instead, the
-    character encoding of the message being replied to is used. Choose this
-    option to use the default character encoding for outgoing messages even
-    when replying, as long as the quoted characters can be represented in the
-   selected encoding.</li>
+    messages that use an 8-bit text encoding (for example, Latin ISO-8859-3).
+    This is usually only necessary when communicating via a legacy server that
+    doesn&apos;t process 8-bit encoding correctly.</li>
+  <li><strong>Default Text Encoding</strong>: Select the text encoding you want
+    Mail &amp; Newsgroups to use as the default for outgoing mail and newsgroup
+    messages.</li>
+  <li><strong>When possible, use this default text encoding in
+    replies.</strong>: By default, the selected text encoding is
+    <strong>not</strong> used when replying to a message. Instead, the text
+    encoding of the message being replied to is used. Choose this option to use
+    the default text encoding for outgoing messages even when replying, as long
+    as the quoted characters can be represented in the selected encoding.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 <h2 id="network_and_storage_preferences">Mail &amp; Newsgroups Preferences -
   Network &amp; Storage</h2>
 
--- a/suite/chrome/common/help/mailnews_using_mail.xhtml
+++ b/suite/chrome/common/help/mailnews_using_mail.xhtml
@@ -536,18 +536,18 @@
     (formatted), or both. If you choose <q>Auto-Detect</q>, Mail &amp;
     Newsgroups prompts you for the format to use if it&apos;s unknown whether
     the recipient&apos;s mail program can display an HTML message. The format
     you choose here overrides the send format you specified using the
     Preferences command on the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu.</li>
   <li><strong>Priority</strong>: Choose a priority to indicate whether the
     message has lowest, low, normal, high, or highest priority.</li>
-  <li><strong>Character Encoding</strong>: Choose a character encoding used for
-    this message.</li>
+  <li><strong>Text Encoding</strong>: Choose a text encoding used for this
+    message.</li>
   <li><strong>Send a Copy To</strong>: Choose this if you want to file an
     additional copy of the sent message in a different folder than your default
     Sent folder. Then select the folder you want.</li>
   <li><strong>Encrypt This Message</strong>: Choose this to have &brandShortName;
     encrypt this message (without changing the default).</li>
   <li><strong>Digitally Sign This Message</strong>: Choose this to have
     &brandShortName; digitally sign this message (without changing the
     default).</li>
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -1011,96 +1011,96 @@
 <p>[<a href="#copying_saving_and_printing_pages">Return to beginning of
   section</a>]</p>
 
 <h1 id="using_languages_and_international_content">Using Languages and
   International Content</h1>
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#selecting_character_encodings_and_fonts">Selecting Character
-      Encodings and Fonts</a></li>
+    <li><a href="#selecting_text_encodings_and_fonts">Selecting Text Encodings
+      and Fonts</a></li>
     <li><a href="#setting_language_preferences">Setting Language
       Preferences</a></li>
     <li><a href="#finding_localized_version">Finding a &brandShortName; version
       in your own language</a></li>
   </ul>
 </div>
 
-<h2 id="selecting_character_encodings_and_fonts">Selecting Character Encodings
-  and Fonts</h2>
+<h2 id="selecting_text_encodings_and_fonts">Selecting Text Encodings and
+  Fonts</h2>
 
 <p>If you browse, compose, or send and receive email in more than one language,
-  you need to select the appropriate character encodings and fonts.</p>
+  you need to select the appropriate text encodings and fonts.</p>
 
-<p>A character encoding method is the way a document or message has been
-  converted to data to be used by your computer. All web documents and mail and
-  news messages use a character encoding method (also known as a character set,
+<p>A text encoding method is the way characters in a document or message are
+  converted to data to be used by your computer. All web documents and mail or
+  news messages use a text encoding method (also known as a character set,
   character coding, or charset).</p>
 
-<p>The character encoding method for a document may depend on its language.
+<p>The text encoding method for a document may depend on its language.
   Some languages e.g. most West European languages, share the same encoding
   method. Others such as Chinese, Japanese, and Russian use different methods.
   In contrast, Unicode provides language-independent encoding methods. UTF-8,
   for example, can be used for any language document.</p>
 
-<p>Your version of &brandShortName; is set to a default character encoding
+<p>Your version of &brandShortName; is set to a default text encoding which is
   appropriate for your region. However, if you use more than one language, you
-  may need to select appropriate character encoding methods and designate the
-  fonts you wish to use for your language/script.</p>
+  may need to select appropriate text encoding methods and designate the fonts
+  you wish to use for your language.</p>
 
-<p>To select character encodings, begin from the browser window:</p>
+<p>To select text encodings, begin from the browser window:</p>
 
 <ol>
-  <li>Open the View menu, choose Character Encoding, and then choose More
+  <li>Open the View menu, choose Text Encoding, and then choose More
     Encodings.</li>
   <li>Choose a region from the top section of the submenu.</li>
-  <li>Choose a character encoding within the region submenu. Repeat steps
-    1-3 for each character encoding method you want.</li>
+  <li>Choose a text encoding within the region submenu. Repeat steps 1-3 for
+    each text encoding method you want.</li>
 </ol>
 
-<p>The character encoding methods you select are added to the Character
-  Encoding menu. If you have more than one encoding method selected, the active
-  one has a bullet (dot) next to it.</p>
+<p>The text encoding methods you select are added to the Text Encoding menu.
+  If you have more than one encoding method selected, the active one has a
+  bullet (dot) next to it.</p>
 
 <p>If the page, which you are viewing, shows wrong character glyphs with all
-  predefined character encodings, there is a chance that it requires special
-  fonts. Such web sites should contain instructions on which fonts to download
-  and/or use in order to view the page correctly. When you have the necessary
-  fonts installed on your system, you can choose User Defined from the More
-  Encodings submenu. &brandShortName; will then use the fonts defined in the <a
+  predefined text encodings, there is a chance that it requires special fonts.
+  Such web sites should contain instructions on which fonts to download and/or
+  use in order to view the page correctly. When you have the necessary fonts
+  installed on your system, you can choose User Defined from the More Encodings
+  submenu. &brandShortName; will then use the fonts defined in the <a
   href="cs_nav_prefs_appearance.xhtml#fonts">Fonts preferences</a> (Fonts for:
   User Defined).</p>
 
-<p>&brandShortName; can detect which character encoding a document uses, and
-  can display it correctly on your screen. To take advantage of this
-  capability, begin from the browser window:</p>
+<p>&brandShortName; can detect which text encoding a document uses, and can
+  display it correctly on your screen. To take advantage of this capability,
+  begin from the browser window:</p>
 
 <ol>
-  <li>Open the View menu, choose Character Encoding, and then choose
+  <li>Open the View menu, choose Text Encoding, and then choose
     Auto-Detect.</li>
   <li>Choose one of the Auto-Detect options, or choose (Off) from the
     submenu.</li>
 </ol>
 
-<p>To make changes to your list of active character encodings:</p>
+<p>To make changes to your list of active text encodings:</p>
 
 <ol>
-  <li>Open the View menu, choose Character Encoding, and then choose Customise
-    List. You can see the Customise Character Encoding dialogue box.</li>
+  <li>Open the View menu, choose Text Encoding, and then choose Customise
+    List. You can see the Customise Text Encoding dialogue box.</li>
   <li>Choose from the following procedures:
     <ul>
-      <li>To add to the list of active character encodings, choose a character
-        encoding from the list on the left and click Add.</li>
-      <li>To remove a character encoding from the active list, choose a
-        character encoding from the list on the right and click Remove.</li>
-      <li>To change the order in which active encodings appear in the Character
-        Encoding menu, highlight character encodings in the list on the right,
-        and use the Move Up and Move Down buttons to move the character
-        encodings up or down in the list.</li>
+      <li>To add to the list of active text encodings, choose a text encoding
+        from the list on the left and click Add.</li>
+      <li>To remove a text encoding from the active list, choose a text
+        encoding from the list on the right and click Remove.</li>
+      <li>To change the order in which active encodings appear in the Text
+        Encoding menu, highlight text encodings in the list on the right,
+        and use the Move Up and Move Down buttons to move the text encodings
+        up or down in the list.</li>
     </ul>
   </li>
 </ol>
 
 <p>To change the default fonts within a language group:</p>
 
 <ol>
   <li>Open the
--- a/suite/chrome/common/help/page_info_help.xhtml
+++ b/suite/chrome/common/help/page_info_help.xhtml
@@ -62,17 +62,17 @@
     to lay out the page. Quirks mode takes account of nonstandard behaviour that
     may be used by some older web pages designed for older versions of web
     browsers that are not fully standards compliant. Standards compliance mode
     adheres strictly to standards specifications. Your browser chooses the
     render mode automatically according to information contained in the web
     page itself.</li>
   <li><strong>Source</strong>: Indicates whether the source code for this page
     has been cached.</li>
-  <li><strong>Encoding</strong>: The character encoding used for this HTML
+  <li><strong>Text Encoding</strong>: The text encoding used for this HTML
     document.</li>
   <li><strong>Size</strong>: The size of the file, if available.</li>
   <li><strong>Modified</strong>: The date the page was last modified, if
     available.</li>
   <li><strong>Expires</strong>: The date on which the information displayed by
     the page expires.</li>
 </ul>
 
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -92,17 +92,17 @@
         <rdf:li> <rdf:Description ID="nav-doc-print" nc:name="Printing a Page" nc:link="nav_help.xhtml#printing_a_page"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
   <rdf:Description about="#nav-doc-language">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="nav-doc-charencode" nc:name="Selecting Character Encodings and Fonts" nc:link="nav_help.xhtml#selecting_character_encodings_and_fonts"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="nav-doc-charencode" nc:name="Selecting Text Encodings and Fonts" nc:link="nav_help.xhtml#selecting_text_encodings_and_fonts"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-languagepref" nc:name="Setting Language Preferences" nc:link="nav_help.xhtml#setting_language_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav-doc-webcontent" nc:name="Finding a &brandShortName; version in your own language" nc:link="nav_help.xhtml#finding_localized_version"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
   <rdf:Description about="#nav-doc-pluginsdownloads">
     <nc:subheadings>
@@ -504,17 +504,17 @@
         <rdf:li> <rdf:Description ID="mail_prefs_display" nc:name="Message Display" nc:link="mailnews_preferences.xhtml#message_display"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mailnews_preferences.xhtml#notifications"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mailnews_preferences.xhtml#composition"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="mailnews_preferences.xhtml#send_format"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mailnews_preferences.xhtml#addressing_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk &amp; Suspect Mail" nc:link="mailnews_preferences.xhtml#junk_and_suspect_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-tags" nc:name="Tags" nc:link="mailnews_preferences.xhtml#tags"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mailnews_preferences.xhtml#return_receipts_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mailnews_preferences.xhtml#character_encoding"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_text_encoding" nc:name="Text Encoding" nc:link="mailnews_preferences.xhtml#text_encoding"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Network &amp; Storage" nc:link="mailnews_preferences.xhtml#network_and_storage_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <!-- COMPOSER HELP SECTION -->
 
 <rdf:Description about="#comp">
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -69,18 +69,18 @@ smtpTempSizeExceeded=The size of the mes
 smtpPermSizeExceeded1=The size of the message you are trying to send exceeds the global size limit (%d bytes) of the server. The message was not sent; reduce the message size and try again.
 
 ## LOCALIZATION NOTE (smtpPermSizeExceeded2): argument %s is the server's response
 smtpPermSizeExceeded2=The size of the message you are trying to send exceeds the global size limit of the server. The message was not sent; reduce the message size and try again. The server responded:  %s.
 
 ## LOCALIZATION NOTE (smtpSendFailedUnknownServer): argument %S is the Outgoing server (SMTP)
 smtpSendFailedUnknownServer=An error occurred while sending mail: Outgoing server (SMTP) %S is unknown. The server may be incorrectly configured. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
-## LOCALIZATION NOTE (smtpSendRefused): argument %S is the Outgoing server (SMTP)
-smtpSendRefused=The message could not be sent because connecting to Outgoing server (SMTP) %S failed. The server may be unavailable or is refusing Outgoing server (SMTP) connections. Please verify that your Outgoing server (SMTP) settings are correct and try again.
+## LOCALIZATION NOTE (smtpSendRequestRefused): argument %S is the Outgoing server (SMTP)
+smtpSendRequestRefused=The message could not be sent because connecting to Outgoing server (SMTP) %S failed. The server may be unavailable or is refusing SMTP connections. Please verify that your Outgoing server (SMTP) settings are correct and try again.
 
 ## LOCALIZATION NOTE (smtpSendInterrupted): argument %S is the Outgoing server (SMTP)
 smtpSendInterrupted=The message could not be sent because the connection to Outgoing server (SMTP) %S was lost in the middle of the transaction. Try again.
 
 ## LOCALIZATION NOTE (smtpSendTimeout): argument %S is the Outgoing server (SMTP)
 smtpSendTimeout=The message could not be sent because the connection to Outgoing server (SMTP) %S timed out. Try again.
 
 ## LOCALIZATION NOTE (smtpSendFailedUnknownReason): argument %S is the Outgoing server (SMTP)
@@ -99,20 +99,19 @@ smtpHintAuthPlainToEncrypt=The Outgoing 
 smtpAuthFailure=Unable to authenticate to Outgoing server (SMTP) %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
 # LOCALIZATION NOTE (smtpAuthGssapi): %S is the server hostname
 smtpAuthGssapi=The Kerberos/GSSAPI ticket was not accepted by the Outgoing server (SMTP) %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
 
 # LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
 smtpAuthMechNotSupported=The Outgoing server (SMTP) %S does not support the selected authentication method. Please change the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
-# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
-smtpAuthNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (Outgoing server (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 (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.
 
-## @name NS_ERROR_ILLEGAL_LOCALPART
 # 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)?
 
--- a/suite/chrome/mailnews/imapMsgs.properties
+++ b/suite/chrome/mailnews/imapMsgs.properties
@@ -114,20 +114,20 @@ imapCopyingMessage=Copying message to %S…
 # Place the word %S in your translation where the name of the folder should appear.
 # Place the word %lu where the number of headers should appear.
 imapFolderReceivingMessageOf2=%S - Downloading message %lu of %lu…
 
 # LOCALIZATION NOTE (imapDiscoveringMailbox): Do not translate the word "%S" below.
 # Place the word %S in your translation where the name of the folder should appear.
 imapDiscoveringMailbox=Found folder: %S
 
-# LOCALIZATION NOTE (imapEnterPasswordPrompt): Do not translate the word %S below.
-# Place the word "%S" in your translation where the email address
-# or the username should appear
-imapEnterPasswordPrompt=Enter your password for %S:
+# LOCALIZATION NOTE (imapEnterPasswordPrompt): Do not translate the words %1$S and %2$S below.
+# Place the word %1$S in your translation where the username should appear.
+# Place the word %2$S in your translation where the servername should appear.
+imapEnterServerPasswordPrompt=Enter your password for %1$S on %2$S:
 
 # LOCALIZATION NOTE (imapServerNotImap4): Do not translate the word "IMAP4" below.
 imapServerNotImap4=Mail server %S is not an IMAP4 mail server.
 
 # This is intentionally left blank.
 imapDone=
 
 imapEnterPasswordPromptTitle=Mail Server Password Required
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -281,23 +281,24 @@ mail.addr_book.show_phonetic_fields=fals
 #
 mailnews.search_date_format=0
 # separator for search date (e.g. "/", "-"), or empty when search_date_format is zero
 mailnews.search_date_separator=
 # leading zeros for day and month values, not used if mailnews.search_date_format is not zero
 mailnews.search_date_leading_zeros=true
 
 # offline msg 
-nocachedbodybody=The body of this message has not been downloaded from \
+nocachedbodybody2=The body of this message has not been downloaded from \
 the server for reading offline. To read this message, \
 you must reconnect to the network, choose Offline from \
-the File menu and then untick Work Offline.\
+the File menu and then untick Work Offline. \
 In the future, you can select which messages or folders to read offline. To do \
-this, choose Offline from the file menu and then select Synchronise. You can \
-adjust the Disc Space preference to prevent the downloading of large messages.
+this, choose Offline from the file menu and then select Download/Sync Now. \
+You can adjust the Disc Space preference to prevent the downloading of large \
+messages.
 
 # accountCentral
 mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Mail
 newsAcctType=News
 feedsAcctType=Feeds