Bug 755867 - Update en-GB for Thunderbird 14 (review pending)
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 31 May 2012 23:43:13 +0100
changeset 167 b49f71b25dceeceec04e4b9e89cb3c1d166c9dcf
parent 166 983f41383e2db1c382739b112951f73c1cd1d180
child 168 29a43f5c9be3801e743f48ed73fd2719b329bdf3
push id31
push useriann_cvs@blueyonder.co.uk
push dateThu, 31 May 2012 22:44:07 +0000
bugs755867
Bug 755867 - Update en-GB for Thunderbird 14 (review pending)
mail/chrome/messenger-newsblog/am-newsblog.dtd
mail/chrome/messenger-newsblog/feed-subscriptions.dtd
mail/chrome/messenger-newsblog/newsblog.properties
mail/chrome/messenger/accountCreation.dtd
mail/chrome/messenger/am-server-top.dtd
mail/chrome/messenger/am-serverwithnoidentities.dtd
mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
mail/chrome/messenger/cloudfile/addAccountDialog.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messenger.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/msgHdrViewOverlay.dtd
mail/chrome/messenger/preferences/junkLog.dtd
mail/chrome/messenger/preferences/security.dtd
mail/chrome/messenger/prefs.properties
--- a/mail/chrome/messenger-newsblog/am-newsblog.dtd
+++ b/mail/chrome/messenger-newsblog/am-newsblog.dtd
@@ -1,10 +1,8 @@
-<!ENTITY accountTitle.label "Account Settings">
-
 <!ENTITY biffStart.label "Check for new articles every ">
 <!ENTITY biffStart.accesskey "k">
 <!ENTITY biffEnd.label "minutes">
 
 <!ENTITY loginAtStartup.label "Check for new articles at startup"> 
 <!ENTITY loginAtStartup.accesskey "C">
 
 <!ENTITY useQuickMode.label "By default, show the article summary instead of loading the web page"> 
--- a/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
+++ b/mail/chrome/messenger-newsblog/feed-subscriptions.dtd
@@ -10,16 +10,17 @@
 <!ENTITY feedLocation.placeholder    "Enter a valid feed url to Add">
 
 <!ENTITY feedFolder.label            "Store Articles in:">
 <!ENTITY feedFolder.accesskey        "S">
 
 <!ENTITY quickMode.label             "Show the article summary instead of loading the web page">
 <!ENTITY quickMode.accesskey         "h">
 
+<!ENTITY locationValidate.label      "Validate">
 <!ENTITY validateText.label          "Check validation and retrieve a valid url.">
 
 <!ENTITY button.addFeed.label        "Add">
 <!ENTITY button.addFeed.accesskey    "A">
 <!ENTITY button.editFeed.label       "Edit">
 <!ENTITY button.editFeed.accesskey   "E">
 <!ENTITY button.removeFeed.label     "Remove">
 <!ENTITY button.removeFeed.accesskey "R">
--- a/mail/chrome/messenger-newsblog/newsblog.properties
+++ b/mail/chrome/messenger-newsblog/newsblog.properties
@@ -1,19 +1,21 @@
 subscribe-validating-feed=Verifying the feed…
 subscribe-cancelSubscription=Are you sure you wish to cancel subscribing to the current feed?
 subscribe-cancelSubscriptionTitle=Subscribing to a Feed…
 subscribe-feedAlreadySubscribed=You already have a subscription for this feed.
 subscribe-errorOpeningFile=Could not open the file.
 subscribe-feedAdded=Feed added.
 subscribe-feedUpdated=Feed updated.
 subscribe-feedMoved=Feed subscription moved.
+subscribe-feedCopied=Feed subscription copied.
 subscribe-feedRemoved=Feed unsubscribed.
 subscribe-feedNotValid=The Feed URL is not a valid feed.
 subscribe-networkError=The Feed URL could not be found. Please check the name and try again.
+subscribe-loading=Loading, please wait…
 
 subscribe-OPMLImportTitle=Select OPML file to import
 subscribe-OPMLExportTitle=Export feeds as an OPML file
 ## LOCALIZATION NOTE(subscribe-OPMLExportFileDialogTitle): %S is the brandShortName
 subscribe-OPMLExportFileDialogTitle=%S OPML Export
 ## LOCALIZATION NOTE(subscribe-OPMLExportDefaultFileName): %S is the brandShortName
 subscribe-OPMLExportDefaultFileName=My%SFeeds.opml
 ## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
--- a/mail/chrome/messenger/accountCreation.dtd
+++ b/mail/chrome/messenger/accountCreation.dtd
@@ -57,21 +57,21 @@
 <!ENTITY incomingSettings.label          "Incoming settings:">
 <!ENTITY outgoingSettings.label          "Outgoing settings:">
 <!ENTITY technicaldetails.label          "Technical Details">
 <!-- LOCALIZATION NOTE (confirmWarning.label): If there is a security
      warning on the outgoing server, then the user will need to check a
      checkbox beside this text before continuing. -->
 <!ENTITY confirmWarning.label            "I understand the risks.">
 <!ENTITY confirmWarning.accesskey        "u">
-<!-- LOCALIZATION NOTE (createAccount.label): If there is a security warning
+<!-- LOCALIZATION NOTE (doneAccount.label): If there is a security warning
      on the incoming or outgoing servers, then the page that pops up will
      have this text in a button to continue by creating the account. -->
-<!ENTITY createAccount.label             "Create Account">
-<!ENTITY createAccount.accesskey         "C">
+<!ENTITY doneAccount.label               "Done">
+<!ENTITY doneAccount.accesskey           "D">
 <!-- LOCALIZATION NOTE (changeSettings.label): If there is a security warning on
      the incoming or outgoing servers, then the page that pops up will have
      this text in a button to take you back to the previous page to change
      the settings and try again. -->
 <!ENTITY changeSettings.label            "Change Settings">
 <!ENTITY changeSettings.accesskey        "S">
 
 <!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Thunderbird FAQ for more information.">
--- a/mail/chrome/messenger/am-server-top.dtd
+++ b/mail/chrome/messenger/am-server-top.dtd
@@ -1,10 +1,11 @@
 <!-- extracted from am-server-top.xul -->
 
+<!ENTITY messageStorage.label "Message Storage">
 <!ENTITY securitySettings.label "Security Settings">
 <!ENTITY serverSettings.label "Server Settings">
 <!ENTITY serverType.label "Server Type:">
 <!ENTITY serverName.label "Server Name:">
 <!ENTITY serverName.accesskey "S">
 <!ENTITY userName.label "User Name:">
 <!ENTITY userName.accesskey "N">
 <!ENTITY port.label "Port:">
@@ -71,8 +72,11 @@
 <!ENTITY advancedButton.accesskey "v">
 <!ENTITY serverDefaultCharset.label "Default Character Encoding:">
 <!ENTITY localFolderPicker.label "Select Local Directory">
 <!ENTITY browseFolder.label "Browse…">
 <!ENTITY browseFolder.accesskey "B">
 <!ENTITY newsrcPicker.label "Select newsrc File">
 <!ENTITY browseNewsrc.label "Browse…">
 <!ENTITY browseNewsrc.accesskey "e">
+
+<!ENTITY accountTitle.label "Account Settings">
+<!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
--- a/mail/chrome/messenger/am-serverwithnoidentities.dtd
+++ b/mail/chrome/messenger/am-serverwithnoidentities.dtd
@@ -1,11 +1,2 @@
-<!ENTITY accountTitle.label "Account Settings">
-<!ENTITY accountSettingsDesc.label "The following is a special account.  There are no identities associated with it.">
 <!ENTITY accountName.label "Account Name:">
 <!ENTITY accountName.accesskey "N">
-<!ENTITY messageStorage.label "Message Storage">
-<!ENTITY emptyTrashOnExit.label "Empty Deleted folder on Exit">
-<!ENTITY emptyTrashOnExit.accesskey "x">
-<!ENTITY localPath.label "Local directory:">
-<!ENTITY localFolderPicker.label "Select Local Directory">
-<!ENTITY browseFolder.label "Browse…">
-<!ENTITY browseFolder.accesskey "B">
new file mode 100644
--- /dev/null
+++ b/mail/chrome/messenger/cloudfile/Dropbox/settings.dtd
@@ -0,0 +1,4 @@
+<!-- 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 dropboxSettings.learnMore "Learn more…">
--- a/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
+++ b/mail/chrome/messenger/cloudfile/YouSendIt/settings.dtd
@@ -1,5 +1,6 @@
 <!-- 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 youSendItSettings.username "Username:">
 <!ENTITY youSendItSettings.needAnAccount "Need an account?">
+<!ENTITY youSendItSettings.learnMore "Learn more…">
--- a/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
+++ b/mail/chrome/messenger/cloudfile/addAccountDialog.dtd
@@ -1,12 +1,13 @@
 <!-- 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 addAccountDialog.title   "Set up Filelink">
 <!ENTITY addAccountDialog.menuTitle "Select an online storage service">
 <!ENTITY addAccountDialog.style "width: 40em; min-height: 20em;">
 <!ENTITY addAccountDialog.accountName.label "Account Name:">
 <!ENTITY addAccountDialog.noAccountText "We're sorry, but the current version of &brandShortName; only allows one account from each online storage service.">
-<!ENTITY addAccountDialog.createAccountText "This feature allows you to send large attachments using one of several online storage services. You can either connect to an existing account, or sign up for a new account.">
+<!ENTITY addAccountDialog.createAccountText2 "You can send large attachments using one of several online storage services. Please either set up an existing account, or sign up for a new account.">
 <!ENTITY addAccountDialog.authorizing "Checking authorisation...">
 <!ENTITY addAccountDialog.error "An error occurred while setting up the account!">
 <!ENTITY addAccountDialog.acceptButton.label "Set up Account">
+<!ENTITY addAccountDialog.learnMore "Learn more…">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -353,18 +353,18 @@ you can use these alternative items. Oth
 <!ENTITY archiveMsgCmd.key  "a">
 <!ENTITY cancelNewsMsgCmd.label "Cancel Message">
 <!ENTITY cancelNewsMsgCmd.accesskey "C">
 <!ENTITY replyMsgCmd.label "Reply">
 <!ENTITY replyMsgCmd.accesskey "R">
 <!ENTITY replyMsgCmd.key  "r">
 <!ENTITY replySenderCmd.label "Reply to Sender Only">
 <!ENTITY replySenderCmd.accesskey "R">
-<!ENTITY replyNewsgroupCmd.label "Reply to Newsgroup">
-<!ENTITY replyNewsgroupCmd.accesskey  "y">
+<!ENTITY replyNewsgroupCmd2.label "Followup to Newsgroup">
+<!ENTITY replyNewsgroupCmd2.accesskey  "u">
 <!ENTITY replyToAllMsgCmd.label "Reply to All">
 <!ENTITY replyToAllMsgCmd.accesskey  "p">
 <!ENTITY replyToAllMsgCmd.key  "r">
 <!ENTITY replyToListMsgCmd.label "Reply to List">
 <!ENTITY replyToListMsgCmd.accesskey  "L">
 <!ENTITY replyToListMsgCmd.key  "l">
 <!ENTITY forwardMsgCmd.label "Forward">
 <!ENTITY forwardMsgCmd.accesskey "F">
@@ -493,16 +493,17 @@ you can use these alternative items. Oth
 <!ENTITY runJunkControls.label "Run Junk Mail Controls on Folder">
 <!ENTITY runJunkControls.accesskey "C">
 <!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
 <!ENTITY deleteJunk.accesskey "D">
 <!ENTITY importCmd.label "Import…">
 <!ENTITY importCmd.accesskey "m">
 <!ENTITY errorConsoleCmd.label "Error Console">
 <!ENTITY errorConsoleCmd.accesskey "E">
+<!ENTITY errorConsoleCmd.commandkey "j">
 <!ENTITY accountManagerCmd.label "Account Settings…">
 <!ENTITY accountManagerCmd.accesskey "S">
 <!-- LOCALIZATION NOTE (accountManagerCmdUnix.accesskey): belongs to accountManagerCmd.label,
         which is placed under the Edit menu on Unix systems -->
 <!ENTITY accountManagerCmdUnix.accesskey "A">
 
 <!-- Mail Toolbar -->
 <!ENTITY getMsgButton.label "Get Mail">
@@ -687,18 +688,18 @@ you can use these alternative items. Oth
 <!ENTITY contextOpenConversation.label "Open Message in Conversation">
 <!ENTITY contextOpenConversation.accesskey "n">
 <!ENTITY contextEditAsNew.label "Edit As New…">
 <!ENTITY contextEditAsNew.accesskey "E">
 <!ENTITY contextArchive.label "Archive">
 <!ENTITY contextArchive.accesskey "h">
 <!ENTITY contextReplySender.label "Reply to Sender Only">
 <!ENTITY contextReplySender.accesskey "R">
-<!ENTITY contextReplyNewsgroup.label "Reply to Newsgroup">
-<!ENTITY contextReplyNewsgroup.accesskey "y">
+<!ENTITY contextReplyNewsgroup2.label "Followup to Newsgroup">
+<!ENTITY contextReplyNewsgroup2.accesskey "u">
 <!ENTITY contextReplyAll.label "Reply to All">
 <!ENTITY contextReplyAll.accesskey "A">
 <!ENTITY contextReplyList.label "Reply to List">
 <!ENTITY contextReplyList.accesskey "L">
 <!ENTITY contextForward.label "Forward">
 <!ENTITY contextForward.accesskey "F">
 <!ENTITY contextForwardAsAttachment.label "Forward as Attachments">
 <!ENTITY contextForwardAsAttachment.accesskey "o">
--- a/mail/chrome/messenger/messenger.properties
+++ b/mail/chrome/messenger/messenger.properties
@@ -313,16 +313,17 @@ this, choose Offline from the file menu 
 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
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
 
 # mailWindowOverlay.js
 confirmUnsubscribeTitle=Confirm Unsubscribe
 confirmUnsubscribeText=Are you sure you want to unsubscribe from %S?
 confirmUnsubscribeManyText=Are you sure you want to unsubscribe from these newsgroups?
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -363,16 +363,19 @@ attachmentReminderMsg=Did you forget to 
 # LOCALIZATION NOTE (attachmentReminderKeywordsMsgs): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of keywords
 attachmentReminderKeywordsMsgs=Found an attachment keyword:;Found #1 attachment keywords:
 attachmentReminderOptionsMsg=Attachment reminder words can be configured in your preferences
 attachmentReminderYesIForgot=Oh, I did!
 attachmentReminderFalseAlarm=No, Send Now
 
+# Strings used by the Filelink offer notification bar.
+learnMore.label=Learn More…
+learnMore.accesskey=M
 # LOCALIZATION NOTE (bigFileDescription): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
 # #1 number of big attached files
 bigFileDescription=This is a large file. It might be better to use Filelink instead.;These are large files. It might be better to use Filelink instead.
 bigFileShare.label=Link
 bigFileShare.accesskey=l
 bigFileAttach.label=Ignore
 bigFileAttach.accesskey=i
--- a/mail/chrome/messenger/msgHdrViewOverlay.dtd
+++ b/mail/chrome/messenger/msgHdrViewOverlay.dtd
@@ -60,16 +60,18 @@
 <!ENTITY hdrArchiveButton1.tooltip "Archive this message">
 <!ENTITY hdrSmartReplyButton1.label "Smart Reply">
 <!ENTITY hdrReplyButton1.label "Reply">
 <!ENTITY hdrReplyButton1.tooltip "Reply to this message">
 <!ENTITY hdrReplyAllButton1.label "Reply All">
 <!ENTITY hdrReplyAllButton1.tooltip "Reply to sender and all recipients">
 <!ENTITY hdrReplyListButton1.label "Reply List">
 <!ENTITY hdrReplyListButton1.tooltip "Reply to mailing list">
+<!ENTITY hdrFollowupButton1.label "Followup">
+<!ENTITY hdrFollowupButton1.tooltip "Post a followup to this newsgroup">
 <!ENTITY hdrForwardButton1.label "Forward">
 <!ENTITY hdrForwardButton1.tooltip "Forward this message">
 <!ENTITY hdrJunkButton1.label "Junk">
 <!ENTITY hdrJunkButton1.tooltip "Mark this message as junk">
 <!ENTITY hdrTrashButton1.label "Delete">
 <!ENTITY hdrTrashButton1.tooltip "Delete this message">
 
 <!ENTITY hdrViewToolbarShowFull.label "Show Icons and Text">
--- a/mail/chrome/messenger/preferences/junkLog.dtd
+++ b/mail/chrome/messenger/preferences/junkLog.dtd
@@ -1,6 +1,6 @@
-<!ENTITY junkLog.title "Junk Mail Log">
-<!ENTITY junkLogInfo.label "Log of junk mail control activity.">
+<!ENTITY adaptiveJunkLog.title "Adaptive Junk Mail Log">
+<!ENTITY adaptiveJunkLogInfo.label "Log of adaptive junk mail control activity.">
 <!ENTITY clearLog.label "Clear Log">
 <!ENTITY clearLog.accesskey "C">
 <!ENTITY closeLog.label "Close">
 <!ENTITY closeLog.accesskey "o">
--- a/mail/chrome/messenger/preferences/security.dtd
+++ b/mail/chrome/messenger/preferences/security.dtd
@@ -9,18 +9,18 @@
 <!ENTITY manualMark.label "When I mark messages as junk:">
 <!ENTITY manualMark.accesskey "W">
 <!ENTITY manualMarkModeMove.label "Move them to the account's &quot;Junk&quot; folder">
 <!ENTITY manualMarkModeMove.accesskey "o">
 <!ENTITY manualMarkModeDelete.label "Delete them">
 <!ENTITY manualMarkModeDelete.accesskey "D">
 <!ENTITY markAsReadOnSpam.label "Mark messages determined to be Junk as read">
 <!ENTITY markAsReadOnSpam.accesskey "M">
-<!ENTITY enableJunkLogging.label "Enable junk filter logging">
-<!ENTITY enableJunkLogging.accesskey "E">
+<!ENTITY enableAdaptiveJunkLogging.label "Enable adaptive junk filter logging">
+<!ENTITY enableAdaptiveJunkLogging.accesskey "E">
 <!ENTITY openJunkLog.label "Show log">
 <!ENTITY openJunkLog.accesskey "S">
 <!ENTITY resetTrainingData.label "Reset Training Data">
 <!ENTITY resetTrainingData.accesskey "R">
 
 <!-- Phishing Detector -->
 <!ENTITY phishingDetector1.intro  "&brandShortName; can analyse messages for suspected email scams by looking for common techniques used to deceive you.">
 <!ENTITY enablePhishingDetector1.label    "Tell me if the message I'm reading is a suspected email scam">
--- a/mail/chrome/messenger/prefs.properties
+++ b/mail/chrome/messenger/prefs.properties
@@ -1,15 +1,21 @@
 # The following are used by the Account Wizard
 #
 enterValidEmail=Please enter a valid email address.
 accountExists=A mail or newsgroup account with the same user name and server name already exists. Click Back and enter a different server name, or click Cancel.
 modifiedAccountExists=An account with that user name and server name already exists. Please enter a different user name and/or server name.
 userNameChanged=Your User Name has been updated. You may also need to update your Email Address and/or User Name associated with this account.
 serverNameChanged=The server name setting has changed. Please verify that any folders used by filters exist on the new server.
+# LOCALIZATION NOTE (junkSettingsBroken): %1$S is the account name
+junkSettingsBroken=The Junk settings on account "%1$S" have a possible problem. Would you like to review them before saving Account Settings?
+# LOCALIZATION NOTE (localDirectoryChanged): %1$S is program name (&brandShortName;)
+localDirectoryChanged=%1$S needs to restart now to apply the change to the Local directory setting.
+localDirectoryRestart=Restart
+serverNameEmpty=Neither the server name nor the user name can be empty.
 # if the user chooses to cancel the wizard when no accounts are there throw a message
 # LOCALIZATION NOTE (cancelWizard) 
 # do not localize "\n\n"
 cancelWizard=Are you sure you want to exit the Account Wizard?\n\nIf you exit, any information you have entered will be lost and the account will not be created.
 accountWizard=Account Wizard
 WizardExit=Exit
 WizardContinue=Cancel
 # when the wizard already has a domain (Should we say something different?)