Bug 820326 - Update en-GB for Thunderbird 19 r=pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Fri, 04 Jan 2013 13:37:54 +0000
changeset 291 3a01c8fd0b1cfd2b417dddd28897054576fc7907
parent 290 4449c6790452e9bead2609086805058ec606d103
child 292 f15189b0f915c8aad2c2bc8d5d1d2f3f0932c71b
push id78
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 26 Nov 2013 14:54:15 +0000
reviewerspending
bugs820326
Bug 820326 - Update en-GB for Thunderbird 19 r=pending
chat/facebook.properties
chat/irc.properties
chat/xmpp.properties
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/am-smime.properties
mail/chrome/messenger/filter.properties
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/msgFolderPickerOverlay.dtd
mail/chrome/messenger/preferences/advanced.dtd
mail/chrome/messenger/systemIntegrationDialog.dtd
--- a/chat/facebook.properties
+++ b/chat/facebook.properties
@@ -1,5 +1,7 @@
 # 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/.
 
 connection.error.useUsernameNotEmailAddress=Please use your Facebook username, not an email address
+
+facebook.chat.name=Facebook Chat
--- a/chat/irc.properties
+++ b/chat/irc.properties
@@ -47,17 +47,18 @@ command.ctcp=%S &lt;nick&gt; &lt;msg&gt;
 command.chanserv=%S &lt;command&gt;: Send a command to ChanServ.
 command.deop=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel operator status from someone. You must be a channel operator to do this.
 command.devoice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this.
 command.invite=%S &lt;nick&gt; [&lt;room&gt;]: Invite someone to join you in the specified channel, or the current channel.
 command.join=%S &lt;room1&gt;[ &lt;key1&gt;][,&lt;room2&gt;[ &lt;key2&gt;]]*: Enter one or more channels, optionally providing a channel key for each if needed.
 command.kick=%S &lt;nick&gt; [&lt;message&gt;]: Remove someone from a channel. You must be a channel operator to do this.
 command.list=%S: Display a list of chat rooms on the network. Warning, some servers may disconnect you upon doing this.
 command.memoserv=%S &lt;command&gt;: Send a command to MemoServ.
-command.mode=%S (&lt;nick&gt;|&lt;channel&gt;) (+|-)&lt;new mode&gt;: Set or unset a channel or user mode.
+command.modeUser=%S (+|-)&lt;new mode&gt; [&lt;nick&gt;]: Set or unset a user's mode.
+command.modeChannel=%S &lt;channel&gt;[ (+|-)&lt;new mode&gt; [&lt;parameter&gt;][,&lt;parameter&gt;]*]: Get, set or unset a channel mode.
 command.msg=%S &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as opposed to a channel).
 command.nick=%S &lt;new nickname&gt;: Change your nickname.
 command.nickserv=%S &lt;command&gt;: Send a command to NickServ.
 command.notice=%S &lt;target&gt; &lt;message&gt;: Send a notice to a user or channel.
 command.op=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel operator status to someone. You must be a channel operator to do this.
 command.operserv=%S &lt;command&gt;: Send a command to OperServ.
 command.part=%S [message]: Leave the current channel with an optional message.
 command.ping=%S [&lt;nick&gt;]: Asks how much lag a user (or the server if no user specified) has.
@@ -69,31 +70,36 @@ command.umode=%S (+|-)&lt;new mode&gt;: 
 command.version=%S &lt;nick&gt;: Request the version of a user's client.
 command.voice=%S &lt;nick1&gt;[,&lt;nick2&gt;]*: Grant channel voice status to someone. You must be a channel operator to do this.
 command.whois=%S &lt;nick&gt;: Get information on a user.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
 #    %1$S is the nick and %2$S is the nick and host of the user who joined.
 message.join=%1$S [%2$S] entered the room.
+message.rejoined=You have rejoined the room.
 #    %1$S is the nick of who kicked you.
 #    %2$S is message.kicked.reason, if a kick message was given.
 message.kicked.you=You have been kicked by %1$S%2$S.
 #    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
 #    %1$S. %3$S is message.kicked.reason, if a kick message was given.
 message.kicked=%1$S has been kicked by %2$S%3$S.
 #    %S is the kick message
 message.kicked.reason=: %S
-#    %1$S is the nickname of the user whose mode was changed, %2$S is the new
-#    mode and %3$S is who set the mode.
-message.mode=mode (%1$S %2$S) by %3$S.
+#    %1$S is the new mode, %2$S is the nickname of the user whose mode
+#    was changed, and %3$S is who set the mode.
+message.usermode=Mode %1$S for %2$S set by %3$S.
+#    %1$S is the new channel mode and %2$S is who set the mode.
+message.channelmode=Channel mode %1$S set by %2$S.
 #    %1$S is the old nick and %2$S is the new nick.
 message.nick=%1$S is now known as %2$S.
 #    %S is your new nick.
 message.nick.you=You are now known as %S.
+#    Could not change the nickname. %S is the user's nick.
+message.nick.fail=Could not use the specified nickname. Your nick remains %S.
 #    The paramter is the message.parted.reason, if a part message is given.
 message.parted.you=You have left the room (Part%1$S).
 #    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
 message.parted=%1$S has left the room (Part%2$S).
 #    %S is the part message supplied by the user.
 message.parted.reason=: %S
 #    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
 message.quit=%1$S has left the room (Quit%2$S).
--- a/chat/xmpp.properties
+++ b/chat/xmpp.properties
@@ -29,16 +29,23 @@ connection.error.startTLSNotSupported=Th
 connection.error.failedToStartTLS=Failed to start encryption
 connection.error.noAuthMec=No authentication mechanism offered by the server
 connection.error.noCompatibleAuthMec=None of the authentication mechanisms offered by the server are supported
 connection.error.notSendingPasswordInClear=The server only supports authentication by sending the password in cleartext
 connection.error.authenticationFailure=Authentication failure
 connection.error.notAuthorized=Not authorised (Did you enter the wrong password?)
 connection.error.failedToGetAResource=Failed to get a resource
 
+
+# LOCALIZATION NOTE (conversation.error.notDelivered):
+#   This is displayed in a conversation as an error message when a message
+#   the user has sent wasn't delivered.
+#   %S is replaced by the text of the message that wasn't delivered.
+conversation.error.notDelivered=This message could not be delivered: %S
+
 # 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
 tooltip.subscription=Subscription
@@ -71,8 +78,20 @@ options.connectionSecurity.allowUnencryp
 options.connectServer=Server
 options.connectPort=Port
 
 # LOCALIZATION NOTE (gtalk.usernameHint):
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring a Google Talk account.
 gtalk.usernameHint=email address
+
+# LOCALIZATION NOTE (vkontakte.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Vkontakte account.
+vkontakte.usernameHint=Profile ID
+
+# LOCALIZATION NOTE (odnoklassniki.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Odnoklassniki account.
+odnoklassniki.usernameHint=Profile ID
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -12,22 +12,23 @@
 
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowPriorityCmd.label "Low">
 <!ENTITY normalPriorityCmd.label "Normal">
 <!ENTITY highPriorityCmd.label "High">
 <!ENTITY highestPriorityCmd.label "Highest">
 
 <!ENTITY contextDesc.label "Apply filter when:">
-<!ENTITY contextDesc.accesskey "w">
-<!ENTITY contextIncoming.label "Checking Mail">
+<!ENTITY contextIncomingMail.label "Getting New Mail:">
+<!ENTITY contextIncomingMail.accesskey "G">
 <!ENTITY contextManual.label "Manually Run">
-<!ENTITY contextBoth.label "Checking Mail or Manually Run">
-<!ENTITY contextPostPlugin.label "Checking Mail (after classification)">
-<!ENTITY contextPostPluginBoth.label "Checking Mail (after classification) or Manually Run">
+<!ENTITY contextManual.accesskey "R">
+<!ENTITY contextBeforeCls.label "Filter before Junk Classification">
+<!ENTITY contextAfterCls.label "Filter after Junk Classification">
+
 <!ENTITY filterActionDesc.label "Perform these actions:">
 <!ENTITY filterActionDesc.accesskey "P">
 
 <!-- New Style Filter Rule Actions -->
 <!ENTITY moveMessage.label "Move Message to">
 <!ENTITY copyMessage.label "Copy Message to">
 <!ENTITY forwardTo.label "Forward Message to">
 <!ENTITY replyWithTemplate.label "Reply with Template">
--- a/mail/chrome/messenger/am-smime.properties
+++ b/mail/chrome/messenger/am-smime.properties
@@ -18,11 +18,10 @@ NoEncryptionCert=Certificate Manager can
 encryption_needCertWantSame=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to use the same certificate to encrypt & decrypt messages sent to you?
 encryption_wantSame=Do you want to use the same certificate to encrypt & decrypt messages sent to you?
 encryption_needCertWantToSelect=You should also specify a certificate for other people to use when they send you encrypted messages. Do you want to configure an encryption certificate now?
 signing_needCertWantSame=You should also specify a certificate to use for digitally signing your messages. Do you want to use the same certificate to digitally sign your messages?
 signing_wantSame=Do you want to use the same certificate to digitally sign your messages?
 signing_needCertWantToSelect=You should also specify a certificate to use for digitally signing your messages. Do you want to configure a certificate for digitally signing messages now?
 
 ## Strings used by nsMsgComposeSecure
-mime_multipartSignedBlurb=This is a cryptographically signed message in MIME format.
 mime_smimeEncryptedContentDesc=S/MIME Encrypted Message
 mime_smimeSignatureContentDesc=S/MIME Cryptographic Signature
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -3,16 +3,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 mustSelectFolder=You must select a target folder.
 enterValidEmailAddress=Enter a valid email address to forward to.
 pickTemplateToReplyWith=Choose a template to reply with.
 mustEnterName=You must give this filter a name.
 cannotHaveDuplicateFilterTitle=Duplicate Filter Name
 cannotHaveDuplicateFilterMessage=The filter name you entered already exists. Please enter a different filter name.
+mustHaveFilterTypeTitle=No filter event selected
+mustHaveFilterTypeMessage=You must select at least one event when this filter is applied. If you temporarily do not wish the filter to run at any event, uncheck its enabled state from the Message Filters dialog.
 deleteFilterConfirmation=Are you sure you want to delete the selected filter(s)?
 untitledFilterName=Untitled Filter
 matchAllFilterName=Match All Messages
 filterListBackUpMsg=Your filters do not work because the msgFilterRules.dat file, which contains your filters, could not be read. A new msgFilterRules.dat file will be created and a backup of the old file, called rulesbackup.dat, will be created in the same directory.
 customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
 invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
 continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -303,17 +303,17 @@
 <!ENTITY goForwardCmd.label "Forwards">
 <!ENTITY goForwardCmd.accesskey "F">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY goBackCmd.label "Back">
 <!ENTITY goBackCmd.accesskey "B">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goChatCmd.label "Chat">
 <!ENTITY goChatCmd.accesskey "C">
-<!ENTITY goChatCmd.commandKey "C">
+<!ENTITY goChatCmd.key "I">
 <!ENTITY prevStarredMsgCmd.label "Starred Message">
 <!ENTITY prevStarredMsgCmd.accesskey "S">
 <!ENTITY folderMenu.label "Folder">
 <!ENTITY folderMenu.accesskey "O">
 <!ENTITY thisFolder.label "This Folder">
 <!ENTITY thisFolder.accesskey "F">
 <!ENTITY goRecentlyClosedTabs.label "Recently Closed Tabs">
 <!ENTITY goRecentlyClosedTabs.accesskey "R">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -470,19 +470,16 @@ copyToFolderAgainAccessKey=t
 #LOCALIZATION NOTE %1$S is the e-mail address of the person we will allow remote content for
 alwaysLoadRemoteContentForSender2= Always load remote content from %1$S
 
 #LOCALIZATION NOTE(mdnBarMessageNormal) %1$S is the name of the sender
 mdnBarMessageNormal=%1$S has asked to be notified when you read this message.
 #LOCALIZATION NOTE(mdnBarMessageAddressDiffers) %1$S is the name of the sender, %2$S is the address(es) to send return receipt to
 mdnBarMessageAddressDiffers=%1$S has asked to be notified (on %2$S) when you read this message.
 
-# Strings for growl notifications on Mac OS X
-growlNotification=New Mail
-
 # mailCommands.js
 emptyJunkTitle=Confirm
 emptyJunkMessage=Are you sure you want to permanently delete all messages and subfolders in the Junk folder?
 emptyJunkDontAsk=Don't ask me again.
 emptyTrashTitle=Confirm
 emptyTrashMessage=Are you sure you want to permanently delete all messages and subfolders in the Deleted folder?
 emptyTrashDontAsk=Don't ask me again.
 
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -152,18 +152,17 @@ 12560=Your message has been posted to th
 12561=Would you like to return to the compose window?
 
 ## @name NS_MSG_GENERIC_FAILURE_EXPLANATION
 12562=Please verify that your Mail & Newsgroups account settings are correct and try again.
 
 ## @name NS_MSG_ERROR_READING_FILE
 12563=Error reading file.
 
-## @name NS_FOLLOWUPTO_SENDER
-12564=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
+followupToSenderMessage=The author of this message has requested that responses be sent only to the author. If you also want to reply to the newsgroup, add a new row to the addressing area, choose Newsgroup from the recipients list, and enter the name of the newsgroup.
 
 ## @name NS_MSG_UNDISCLOSED_RECIPIENTS
 ## LOCALIZATION NOTE: this string must be using only US_ASCII characters
 12566=undisclosed-recipients
 
 ## @name NS_MSG_ERROR_ATTACHING_FILE
 12570=There was an error attaching %S. Please check if you have access to the file.
 
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -134,18 +134,18 @@
 <!--LOCALIZATION NOTE attachVCard.label Don't translate the term 'vCard' -->
 <!ENTITY attachVCard.label "Attach Personal Card (vCard)">
 <!ENTITY attachVCard.accesskey "v">
 
 <!ENTITY returnReceiptMenu.label "Return Receipt">
 <!ENTITY returnReceiptMenu.accesskey "t">
 <!ENTITY dsnMenu.label "Delivery Status Notification">
 <!ENTITY dsnMenu.accesskey "N">
-<!ENTITY outputFormatMenu.label "Format">
-<!ENTITY outputFormatMenu.accesskey "f">
+<!ENTITY deliveryFormatMenu.label "Delivery Format">
+<!ENTITY deliveryFormatMenu.accesskey "F">
 <!ENTITY autoFormatCmd.label "Auto-Detect">
 <!ENTITY autoFormatCmd.accesskey "a">
 <!ENTITY plainTextFormatCmd.label "Plain Text Only">
 <!ENTITY plainTextFormatCmd.accesskey "p">
 <!ENTITY htmlFormatCmd.label "Rich Text (HTML) Only">
 <!ENTITY htmlFormatCmd.accesskey "r">
 <!ENTITY bothFormatCmd.label "Plain and Rich (HTML) Text">
 <!ENTITY bothFormatCmd.accesskey "l">
--- a/mail/chrome/messenger/msgFolderPickerOverlay.dtd
+++ b/mail/chrome/messenger/msgFolderPickerOverlay.dtd
@@ -1,7 +1,8 @@
 <!-- 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/. -->
 
 <!-- Labels -->
 <!ENTITY newfolderchoosethis.label      "choose this for the parent">
 <!ENTITY filemessageschoosethis.label   "choose this folder">
+<!ENTITY recentfolders.label            "Recent">
--- a/mail/chrome/messenger/preferences/advanced.dtd
+++ b/mail/chrome/messenger/preferences/advanced.dtd
@@ -22,18 +22,18 @@
 <!ENTITY useSmoothScrolling.label      "Use smooth scrolling">
 <!ENTITY useSmoothScrolling.accesskey  "m">
 
 <!ENTITY systemIntegration.label       "System Integration">
 <!ENTITY alwaysCheckDefault.label      "Always check to see if &brandShortName; is the default mail client on startup">
 <!ENTITY alwaysCheckDefault.accesskey  "A">
 <!ENTITY searchIntegration.label       "Allow &searchIntegration.engineName; to search messages">
 <!ENTITY searchIntegration.accesskey   "S">
-<!ENTITY checkNow.label                "Check Now">
-<!ENTITY checkNow.accesskey            "N">
+<!ENTITY checkDefaultsNow.label        "Check Now…">
+<!ENTITY checkDefaultsNow.accesskey    "N">
 <!ENTITY configEditDesc.label          "Advanced Configuration">
 <!ENTITY configEdit.label              "Config Editor…">
 <!ENTITY configEdit.accesskey          "C">
 <!ENTITY returnReceiptsInfo.label      "Determine how &brandShortName; handles return receipts">
 <!ENTITY showReturnReceipts.label      "Return Receipts…">
 <!ENTITY showReturnReceipts.accesskey  "R">
 
 <!-- Display and Reading Settings -->
--- a/mail/chrome/messenger/systemIntegrationDialog.dtd
+++ b/mail/chrome/messenger/systemIntegrationDialog.dtd
@@ -1,16 +1,20 @@
 <!-- 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/. -->
 
 <!ENTITY systemIntegration.title  "System Integration">
+<!ENTITY acceptIntegration.label  "Set as Default">
+<!ENTITY cancelIntegration.label  "Skip Integration">
 <!ENTITY defaultClient.intro  "Use &brandShortName; as the default client for:">
 
 <!ENTITY email.label "Email">
 <!ENTITY newsgroups.label "Newsgroups">
 <!ENTITY feeds.label "Feeds">
 
+<!ENTITY unsetDefault.tooltip "It is not possible to unset &brandShortName; as the default client within &brandShortName;. To make another application the default you must use its 'Set as default' dialog.">
+
 <!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
 <!ENTITY checkOnStartup.accesskey "A">
 
 <!ENTITY searchIntegration.label "Allow &searchIntegration.engineName; to search messages">
 <!ENTITY searchIntegration.accesskey "S">