Bug 981444 - Update en-GB for Gecko 29 - SeaMonkey part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 09 Mar 2014 22:56:13 +0000
changeset 338 445169914a619a9be20f76c5f06bd574acbad93d
parent 337 c3c1b4c03c1381e8046636e71f1c020a27247403
child 339 8b1f98960dbaf1a9a6257d366a62ea09008fe7bf
push id70
push useriann_cvs@blueyonder.co.uk
push dateSun, 09 Mar 2014 22:56:41 +0000
reviewersme
bugs981444
Bug 981444 - Update en-GB for Gecko 29 - SeaMonkey part r=me
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/chrome/mailnews/compose/composeMsgs.properties
suite/chrome/mailnews/folderWidgets.properties
suite/chrome/mailnews/pref/am-offline.dtd
suite/chrome/mailnews/threadpane.dtd
--- a/suite/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -656,17 +656,17 @@
     When synchronisation is enabled for an account or a folder, <em>all</em>
     messages are downloaded and local copies of them kept on disc, unless
     a size limit is specified.</li>
   <li><strong>Synchronise the most recent [__] [days]</strong>: Only copies of
     messages younger than the specified number of days (weeks, months, years)
     are kept locally for synchronisation, after that they are removed from the
     offline storage. This does <em>not</em> affect the originals on the server,
     only the local copies are removed if the given age is reached.</li>
-  <li><strong>Don't download messages larger than [__] KB</strong>: Select this
+  <li><strong>Don't download messages larger than [__] kB</strong>: Select this
     option to conserve disc space by preventing large messages from being
     downloaded. Enter the maximum size for downloaded messages. Changing
     this option does <em>not</em> affect messages that have already been
     downloaded.</li>
   <li>The <a href="#retention_policy">retention settings</a> can be used to
     free up space by deleting old messages. Note that these settings apply
     to <em>both</em> local copies and their originals on the server.</li>
 </ul>
@@ -687,17 +687,17 @@
 
 <ol>
   <li>Open the Edit menu, choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialogue box.</li>
   <li>Click the Disc Space category for a POP account.</li>
 </ol>
 
 <ul>
-  <li><strong>Messages larger than [__] KB</strong>: Select this option to
+  <li><strong>Messages larger than [__] kB</strong>: Select this option to
     conserve disc space by preventing large messages from being downloaded.
     Enter the maximum size for downloaded messages.</li>
   <li>The <a href="#retention_policy">retention settings</a> can be used to
     free up space by deleting old messages. Note that these settings apply
     to <em>both</em> local copies and their originals on the server.
 
     <p><strong>Note</strong>: If your POP account is set up to use a Global
       Inbox, the retention period settings of the target Inbox apply.</p>
@@ -765,17 +765,17 @@
 </ul>
 
 <p>The following settings help to save disc space and download time. Specify
   which messages you don&apos;t want to download locally:</p>
 
 <ul>
   <li><strong>Read messages</strong>: Select this option to only download
     message bodies from messages you haven&apos;t already read.</li>
-  <li><strong>Messages larger than [__] KB</strong>: Select this option to
+  <li><strong>Messages larger than [__] kB</strong>: Select this option to
     conserve disc space by preventing large messages from being downloaded.
     Enter the maximum size for downloaded messages.</li>
   <li><strong>Messages more than [__] days old</strong>: Select this option to
     only download messages that are not older than the number of days you enter
     here.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
--- a/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -28,16 +28,22 @@
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 
 <!ENTITY printSetupCmd.label            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey        "u">
 
 <!ENTITY redoCmd.key                    "Z">  
 
+<!-- Keys for toggling Sidebar, Folder Pane in mailNews and Directory Pane in
+  Address Book -->
+<!ENTITY showHideSidebarCmd.key         "S">
+<!ENTITY toggleFolderPaneCmd.key        "S">
+<!ENTITY toggleDirectoryPaneCmd.key     "S">
+
 <!ENTITY historyCmd.key                 "H">  
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!ENTITY minimizeWindowCmd.label        "Minimise">
--- a/suite/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/chrome/mailnews/compose/composeMsgs.properties
@@ -292,16 +292,20 @@ sendMessageCheckSendButtonLabel=Send
 ## <author> wrote:
 mailnews.reply_header_authorwrote=%s wrote
 mailnews.reply_header_ondate=On %s
 
 ## reply header in composeMsg
 ## user specified 
 mailnews.reply_header_originalmessage=-------- Original Message --------
 
+## forwarded header in composeMsg
+## user specified
+mailnews.forward_header_originalmessage=-------- Forwarded Message --------
+
 ## Strings used by the rename attachment dialog
 renameAttachmentTitle=Rename Attachment
 renameAttachmentMessage=New attachment name:
 
 ## LOCALIZATION NOTE(smtpEnterPasswordPrompt): Do not translate the
 ## word $S. Place the word $S where the host name should appear.
 smtpEnterPasswordPrompt=Enter your password for %S:
 ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
--- a/suite/chrome/mailnews/folderWidgets.properties
+++ b/suite/chrome/mailnews/folderWidgets.properties
@@ -1,7 +1,11 @@
 # 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(globalInbox)
 # %S=name of the Local folders account
 globalInbox=Global Inbox (%S)
+# LOCALIZATION NOTE(verboseFolderFormat): %1$S is folder name, %2$S is server name
+verboseFolderFormat=%1$S on %2$S
+chooseFolder=Choose Folder…
+noFolders=No available folders
--- a/suite/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -6,17 +6,17 @@
 <!ENTITY doNotDownloadNntp.label "To save disc space, do not download for offline use:">
 <!ENTITY doNotDownloadImap.label "To save disc space, downloading messages from the server and keeping local copies for offline use can be restricted by age or size.">
 <!ENTITY allFoldersOffline.label "Keep messages for this account on this computer">
 <!ENTITY allFoldersOffline.accesskey "o">
 <!ENTITY offlineNotDownload.label "Messages larger than">
 <!ENTITY offlineNotDownload.accesskey "M">
 <!ENTITY autosyncNotDownload.label "Don't download messages larger than">
 <!ENTITY autosyncNotDownload.accesskey "m">
-<!ENTITY kb.label "KB">
+<!ENTITY kb.label "kB">
 <!ENTITY daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY nntpNotDownloadRead.label "Read messages">
 <!ENTITY nntpNotDownloadRead.accesskey "d">
 <!ENTITY nntpDownloadMsg.label "Messages more than">
 <!ENTITY nntpDownloadMsg.accesskey "e">
 <!ENTITY retentionCleanup.label "To recover disc space, old messages can be permanently deleted.">
 <!ENTITY retentionCleanupImap.label "To recover disc space, old messages can be permanently deleted, both the local copies and their originals on the server.">
--- a/suite/chrome/mailnews/threadpane.dtd
+++ b/suite/chrome/mailnews/threadpane.dtd
@@ -18,28 +18,28 @@
 <!ENTITY totalColumn.label "Total in Thread">
 <!ENTITY readColumn.label "Read">
 <!ENTITY receivedColumn.label "Received">
 <!ENTITY flagColumn.label "Flag">
 <!ENTITY locationColumn.label "Location">
 <!ENTITY idColumn.label "Order Received">
 
 <!--Tooltips-->
-<!ENTITY columnChooser.tooltip "Click to select columns to display">
-<!ENTITY threadColumn.tooltip "Click to display message threads"> 
-<!ENTITY fromColumn.tooltip "Click to sort by from">
-<!ENTITY recipientColumn.tooltip "Click to sort by recipient">
-<!ENTITY attachmentColumn.tooltip "Click to sort by attachments">
-<!ENTITY subjectColumn.tooltip "Click to sort by subject">
-<!ENTITY dateColumn.tooltip "Click to sort by date">
-<!ENTITY priorityColumn.tooltip "Click to sort by priority">
-<!ENTITY tagsColumn.tooltip "Click to sort by tags">
-<!ENTITY accountColumn.tooltip "Click to sort by account">
-<!ENTITY statusColumn.tooltip "Click to sort by status">
-<!ENTITY sizeColumn.tooltip "Click to sort by size">
-<!ENTITY junkStatusColumn.tooltip "Click to sort by junk status">
-<!ENTITY unreadColumn.tooltip "Number of unread messages in thread">
-<!ENTITY totalColumn.tooltip "Total number of messages in thread">
-<!ENTITY readColumn.tooltip "Click to sort by read">
-<!ENTITY receivedColumn.tooltip "Click to sort by date received">
-<!ENTITY flagColumn.tooltip "Click to sort by flag">
-<!ENTITY locationColumn.tooltip "Click to sort by location">
-<!ENTITY idColumn.tooltip "Click to sort by order received">
+<!ENTITY columnChooser2.tooltip "Select columns to display">
+<!ENTITY threadColumn2.tooltip "Display message threads">
+<!ENTITY fromColumn2.tooltip "Sort by from">
+<!ENTITY recipientColumn2.tooltip "Sort by recipient">
+<!ENTITY attachmentColumn2.tooltip "Sort by attachments">
+<!ENTITY subjectColumn2.tooltip "Sort by subject">
+<!ENTITY dateColumn2.tooltip "Sort by date">
+<!ENTITY priorityColumn2.tooltip "Sort by priority">
+<!ENTITY tagsColumn2.tooltip "Sort by tags">
+<!ENTITY accountColumn2.tooltip "Sort by account">
+<!ENTITY statusColumn2.tooltip "Sort by status">
+<!ENTITY sizeColumn2.tooltip "Sort by size">
+<!ENTITY junkStatusColumn2.tooltip "Sort by junk status">
+<!ENTITY unreadColumn2.tooltip "Number of unread messages in thread">
+<!ENTITY totalColumn2.tooltip "Total number of messages in thread">
+<!ENTITY readColumn2.tooltip "Sort by read">
+<!ENTITY receivedColumn2.tooltip "Sort by date received">
+<!ENTITY flagColumn2.tooltip "Sort by flag">
+<!ENTITY locationColumn2.tooltip "Sort by location">
+<!ENTITY idColumn2.tooltip "Sort by order received">