Bug 1260015 - Update en-GB for Gecko 47 - Thunderbird part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 27 Mar 2016 17:00:24 +0100
changeset 598 ab336bfed7880d2c6e3f9c6538af2fc41ebd5aaf
parent 597 9f4ae52968c896c3eb41dff844cb1323fa3b84ab
child 599 e378127333483abadffe220e40ebc21559f55f2b
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 - Thunderbird part r=me
chat/xmpp.properties
mail/chrome/messenger-smime/msgSecurityInfo.properties
mail/chrome/messenger/addressbook/addressBook.properties
mail/chrome/messenger/am-offline.dtd
mail/chrome/messenger/folderProps.dtd
mail/chrome/messenger/messenger.properties
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -62,30 +62,32 @@ conversation.error.changeTopicFailedNotA
 conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as you are no longer in the room: %2$S
 #   This is displayed in a conversation as an error message when the user sends
 #   a message to a room that the recipient is not in.
 #   %1$S is the jid of the recipient.
 #   %2$S is the text of the message that wasn't delivered.
 conversation.error.sendFailedAsRecipientNotInRoom=Message could not be sent to %1$S as the recipient is no longer in the room: %2$S
 #   These are displayed in a conversation as a system error message.
 conversation.error.remoteServerNotFound=Could not reach the recipient's server
+conversation.error.unknownSendError=An unknown error occurred on sending this message.
+#   %S is the name of the message recipient.
+conversation.error.sendServiceUnavailable=It is not possible to send messages to %S at this time.
 #   %S is the nick of participant that is not in room.
 conversation.error.nickNotInRoom=%S is not in the room.
 conversation.error.banCommandAnonymousRoom=You can't ban participants from anonymous rooms. Try /kick instead.
 conversation.error.banKickCommandNotAllowed=You don't have the required privileges to remove this participant from the room.
 conversation.error.banKickCommandConflict=Sorry, you can't remove yourself from the room.
 conversation.error.changeNickFailedConflict=Could not change your nick to %S as this nick is already in use.
 conversation.error.changeNickFailedNotAcceptable=Could not change your nick to %S as nicks are locked down in this room.
 conversation.error.inviteFailedForbidden=You don't have the required privileges to invite users to this room.
 #   %S is the jid of user that is invited.
 conversation.error.failedJIDNotFound=Could not reach %S.
 #   %S is the jid that is invalid.
 conversation.error.invalidJID=%S is an invalid jid (Jabber identifiers must be of the form user@domain).
 conversation.error.commandFailedNotInRoom=You have to rejoin the room to be able to use this command.
-conversation.error.unknownError=Unknown error
 
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.
 # LOCALIZATION NOTE (tooltip.status):
 #   %S will be replaced by the XMPP resource identifier
 tooltip.status=Status (%S)
 tooltip.statusNoResource=Status
--- a/mail/chrome/messenger-smime/msgSecurityInfo.properties
+++ b/mail/chrome/messenger-smime/msgSecurityInfo.properties
@@ -1,44 +1,36 @@
 # 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/.
 
 ## Signature Information strings
 SINoneLabel=Message Has No Digital Signature
 SINone=This message does not include the sender's digital signature. The absence of a digital signature means that the message could have been sent by someone pretending to have this email address. It is also possible that the message has been altered while in transit over the network. However, it is unlikely that either event has occurred. 
-
 SIValidLabel=Message Is Signed
 SIValid=This message includes a valid digital signature. The message has not been altered since it was sent.
-
 SIInvalidLabel=Digital Signature Is Not Valid
 SIInvalidHeader=This message includes a digital signature, but the signature is invalid.
-
 SIContentAltered=The signature does not match the message content correctly. The message appears to have been altered after the sender signed it. You should not trust the validity of this message until you verify its contents with the sender.
 SIExpired=The certificate used to signed the message appears to have expired. Make sure your computer's clock is set correctly.
 SIRevoked=The certificate used to sign the message has been revoked. You should not trust the validity of this message until you verify its contents with the sender.
 SINotYetValid=The certificate used to sign the message appears not be valid yet. Make sure your computer's clock is set correctly.
 SIUnknownCA=The certificate used to sign the message was issued by an unknown certificate authority.
 SIUntrustedCA=The certificate used to sign the message was issued by a certificate authority that you do not trust for issuing this kind of certificate.
 SIExpiredCA=The certificate used to sign the message was issued by a certificate authority whose own certificate has expired. Make sure your computer's clock is set correctly.
 SIRevokedCA=The certificate used to sign the message was issued by a certificate authority whose own certificate has been revoked. You should not trust the validity of this message until you verify its contents with the sender.
 SINotYetValidCA=The certificate used to sign the message was issued by a certificate authority whose own certificate is not yet valid. Make sure your computer's clock is set correctly.
 SIInvalidCipher=The message was signed using an encryption strength that this version of your software does not support.
 SIClueless=There are unknown problems with this digital signature. You should not trust the validity of this message until you verify its contents with the sender.
-
 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.
-
 EIContentAltered=The message contents appear to have been altered during transmission.
 EIClueless=There are unknown problems with this encrypted message.
--- a/mail/chrome/messenger/addressbook/addressBook.properties
+++ b/mail/chrome/messenger/addressbook/addressBook.properties
@@ -125,17 +125,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/mail/chrome/messenger/am-offline.dtd
+++ b/mail/chrome/messenger/am-offline.dtd
@@ -17,42 +17,40 @@
 <!ENTITY nntpNotDownloadRead.label "Read messages">
 <!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 local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disc space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionKeepMsg.label "Delete messages more than">
-<!ENTITY retentionKeepMsg.accesskey "m">
+<!ENTITY retentionKeepMsg.accesskey "t">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
-<!ENTITY retentionKeepAll.accesskey "a">
+<!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 starred messages">
-<!ENTITY retentionApplyToFlagged.accesskey "e">
+<!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 "A">
+<!ENTITY offlineImapAdvancedOffline.accesskey "v">
 <!ENTITY syncGroupTitle.label "Message Synchronising">
 <!ENTITY diskspaceGroupTitle.label "Disc Space">
 
 <!-- LOCALIZATION NOTE: (ageAutosyncBefore.label, ageAutosyncMiddle.label, ageAutosyncAfter.label):
   The entities ageAutosyncBefore.label, ageAutosyncMiddle.label, and ageAutosyncAfter.label appear
   on a single line within the scope of useAutosync.ByAge as follows:
 
   &ageAutosyncBefore.label [textbox for autosync value] &ageAutosyncMiddle.label; [dropdown for autosync interval] &ageAutosyncAfter.label;
 -->
 <!ENTITY allAutosync.label               "Synchronise all messages locally regardless of age">
 <!ENTITY allAutosync.accesskey           "c">
 <!ENTITY ageAutosyncBefore.label         "Synchronise the most recent">
-<!ENTITY ageAutosync.accesskey           "y">
+<!ENTITY ageAutosync.accesskey           "S">
 <!ENTITY ageAutosyncMiddle.label         "">
 <!ENTITY dayAgeInterval.label            "Days">
 <!ENTITY weekAgeInterval.label           "Weeks">
 <!ENTITY monthAgeInterval.label          "Months">
 <!ENTITY yearAgeInterval.label           "Years">
 <!ENTITY ageAutosyncAfter.label          "">
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -25,18 +25,16 @@
 <!ENTITY retentionCleanupImap.label "To recover disc space, old messages can be permanently deleted, both local copies and originals on the remote server.">
 <!ENTITY retentionCleanupPop.label "To recover disc space, old messages can be permanently deleted, including originals on the remote server.">
 <!ENTITY retentionDeleteMsg.label "Delete messages more than">
 <!ENTITY retentionDeleteMsg.accesskey "m">
 <!ENTITY retentionKeepAll.label "Don't delete any messages">
 <!ENTITY retentionKeepAll.accesskey "A">
 <!ENTITY retentionKeepRecent.label "Delete all but the most recent">
 <!ENTITY retentionKeepRecent.accesskey "l">
-<!-- LOCALIZATION NOTE: Unhide with .keepUnreadOnly { display: -moz-box; } -->
-<!ENTITY retentionKeepUnreadHidden.label "Always delete read messages (overrides age settings)">
 <!ENTITY retentionApplyToFlagged.label "Always keep starred 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/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -392,20 +392,22 @@ attachmentSizeAtLeast=at least %1$S
 #   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.
 
 recipientSearchCriteria=Subject or Recipient contains:
 fromSearchCriteria=Subject or From contains:
 
 # 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