Bug 1260015 - Update en-GB for Gecko 47 - SeaMonkey part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 27 Mar 2016 17:00:25 +0100
changeset 599 e378127333483abadffe220e40ebc21559f55f2b
parent 598 ab336bfed7880d2c6e3f9c6538af2fc41ebd5aaf
child 600 53f84bbc83986d6a1e220597e5c462050f6d3ba5
push id124
push useriann_cvs@blueyonder.co.uk
push dateSun, 27 Mar 2016 16:00:46 +0000
reviewersme
bugs1260015
Bug 1260015 - Update en-GB for Gecko 47 - SeaMonkey part r=me
suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/chrome/common/pref/pref-content.dtd
suite/chrome/mailnews/addressbook/addressBook.properties
suite/chrome/mailnews/folderProps.dtd
suite/chrome/mailnews/messenger.properties
suite/chrome/mailnews/pref/am-offline.dtd
suite/chrome/mailnews/smime/msgSecurityInfo.properties
--- a/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -120,16 +120,19 @@
             browser&apos;s cache.</li>
           <li><strong>Always load web site icons for bookmarks</strong>: Select
             this to always load web site icons to be displayed in the bookmarks
             menu or personal toolbar, even if it&apos;s not in the cache.</li>
         </ul>
       </li>
     </ul>
   </li>
+  <li><strong>Use autoscrolling</strong>: Select this to enable autoscrolling.
+    Clicking the middle mouse button (usually the scroll wheel) lets you scroll
+    the content by moving the mouse around.</li>
   <li><strong>Use smooth scrolling</strong>: Select this to enable smooth
     scrolling. Pressing the Page Down key when this is enabled
     will&mdash;instead of an immediate jump&mdash;smoothly scroll the content
     down to the next page.</li>
   <li><strong>Use hardware acceleration when available</strong>: Select this to
     let &brandShortName; use hardware acceleration (if available) to render web
     sites. If you experience problems with the visual presentation of web
     content, disabling hardware acceleration may solve the issue.</li>
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -8,16 +8,19 @@
 <!ENTITY pref.content.description               "These settings influence how web site and message content appears in &brandShortName;.">
 <!ENTITY siteIcons.label                        "Web site icons">
 <!ENTITY useSiteIcons.label                     "Show web site icons">
 <!ENTITY useSiteIcons.accesskey                 "S">
 <!ENTITY useFavIcons.label                      "Aggressively look for web site icons when the page does not define one">
 <!ENTITY useFavIcons.accesskey                  "A">
 <!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
 <!ENTITY enableAutomaticImageResizing.accesskey "R">
+<!ENTITY scrolling.label                        "Scrolling">
+<!ENTITY useAutoScroll.label                    "Use autoscrolling">
+<!ENTITY useAutoScroll.accesskey                "t">
 <!ENTITY useSmoothScroll.label                  "Use smooth scrolling">
 <!ENTITY useSmoothScroll.accesskey              "U">
 <!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey                 "e">
 <!ENTITY textZoomOnly.label                     "Zoom only text instead of full pages">
 <!ENTITY textZoomOnly.accesskey                 "Z">
 <!ENTITY blockAutoRefresh.label                 "Warn me when web sites try to redirect or reload the page">
 <!ENTITY blockAutoRefresh.accesskey             "W">
--- a/suite/chrome/mailnews/addressbook/addressBook.properties
+++ b/suite/chrome/mailnews/addressbook/addressBook.properties
@@ -118,17 +118,18 @@ contactsMoved=%1$S contact moved;%1$S co
 invalidName=Please enter a valid Name.
 invalidHostname=Please enter a valid Hostname.
 invalidPortNumber=Please enter a valid Port Number.
 invalidResults=Please enter a valid number in the results field.
 abReplicationOfflineWarning=You must be online to perform LDAP replication.
 abReplicationSaveSettings=Settings must be saved before a directory may be downloaded.
 
 # For importing / exporting
-ExportAddressBookTitle=Export Address Book
+## LOCALIZATION NOTE (ExportAddressBookNameTitle): %S is the name of exported addressbook
+ExportAddressBookNameTitle=Export Address Book - %S
 LDIFFiles=LDIF
 CSVFiles=Comma Separated
 CSVFilesSysCharset=Comma Separated (System Charset)
 CSVFilesUTF8=Comma Separated (UTF-8)
 TABFiles=Tab Delimited
 TABFilesSysCharset=Tab Delimited (System Charset)
 TABFilesUTF8=Tab Delimited (UTF-8)
 VCFFiles=vCard
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -25,18 +25,16 @@
 <!ENTITY retentionCleanupImap.label "Keep messages, both the local copies and their originals on the server:">
 <!ENTITY retentionCleanupPop.label "Keep messages, including their originals on the server:">
 <!ENTITY retentionDeleteMsg.label "Delete messages more than">
 <!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "All messages">
 <!ENTITY retentionKeepAll.accesskey "A">
 <!ENTITY retentionKeepRecent.label "The newest">
 <!ENTITY retentionKeepRecent.accesskey "n">
-<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
-<!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep flagged messages">
 <!ENTITY retentionApplyToFlagged.accesskey "e">
 
 <!ENTITY folderSynchronizationTab.label          "Synchronisation">
 <!ENTITY folderCheckForNewMessages2.label        "When getting new messages for this account, always check this folder">
 <!ENTITY folderCheckForNewMessages2.accesskey    "c">
 
 <!ENTITY offlineFolder.check.label               "Select this folder for offline use">
--- a/suite/chrome/mailnews/messenger.properties
+++ b/suite/chrome/mailnews/messenger.properties
@@ -313,20 +313,22 @@ deleteAttachmentFailure=Failed to delete
 #   ie: 1 file.txt
 #       2 another file.txt
 attachmentDisplayNameFormat=%S %S
 
 # This is the heading for the attachment summary when printing an email
 attachmentsPrintHeader=Attachments:
 
 # Connection Error Messages
-101=Unknown Error 
-102=Failed to connect to server %S.
-103=Could not connect to server %S; the connection was refused.
-104=Connection to server %S timed out.
+# 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(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/pref/am-offline.dtd
+++ b/suite/chrome/mailnews/pref/am-offline.dtd
@@ -10,30 +10,28 @@
 <!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 daysOld.label "days old">
 <!ENTITY message.label "messages">
 <!ENTITY nntpNotDownloadRead.label "Read messages">
-<!ENTITY nntpNotDownloadRead.accesskey "d">
+<!ENTITY nntpNotDownloadRead.accesskey "R">
 <!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.">
 <!ENTITY retentionCleanupPop.label "To recover disc space, old messages can be permanently deleted, including their originals on the server.">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
 <!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "n">
 <!ENTITY retentionKeepRecent.label "Delete all but the most recent">
 <!ENTITY retentionKeepRecent.accesskey "b">
-<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
-<!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep flagged messages">
 <!ENTITY retentionApplyToFlagged.accesskey "k">
 <!ENTITY nntpRemoveMsgBody.label "Remove bodies from messages more than">
 <!ENTITY nntpRemoveMsgBody.accesskey "o">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use…">
 <!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineImapAdvancedOffline.label "Advanced…">
 <!ENTITY offlineImapAdvancedOffline.accesskey "v">
--- a/suite/chrome/mailnews/smime/msgSecurityInfo.properties
+++ b/suite/chrome/mailnews/smime/msgSecurityInfo.properties
@@ -26,17 +26,17 @@ SIClueless=There are unknown problems wi
 
 SIPartiallyValidLabel=Message is signed
 SIPartiallyValidHeader=Although the digital signature is valid, it is unknown whether sender and signer are the same person.
 
 SIHeaderMismatch=The email address listed in the signer's certificate is different from the email address that was used to send this message. Please look at the details of the signature certificate to learn who signed the message.
 SICertWithoutAddress=The certificate used to sign the message does not contain an email address. Please look at the details of the signature certificate to learn who signed the message.
 
 ## Encryption Information strings
-EINoneLabel=Message Not Encrypted
+EINoneLabel2=Message Is Not Encrypted
 EINone=This message was not encrypted before it was sent. Information sent over the Internet without encryption can be seen by other people while in transit.
 
 EIValidLabel=Message Is Encrypted
 EIValid=This message was encrypted before it was sent to you. Encryption makes it very difficult for other people to view information while it is travelling over the network.
 
 EIInvalidLabel=Message Cannot Be Decrypted
 EIInvalidHeader=This message was encrypted before it was sent to you, but it cannot be decrypted.