Bug 725179 - Update en-GB for SeaMonkey 2.9 review pending rs=pike
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -11,30 +11,30 @@
<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "E">
<!ENTITY editPageCmd.commandkey "e">
<!ENTITY navbarCmd.label "Navigation Toolbar">
<!ENTITY navbarCmd.accesskey "N">
-<!ENTITY personalbarCmd.label "Personal Toolbar">
-<!ENTITY personalbarCmd.accesskey "P">
+<!ENTITY bookmarksToolbarCmd.label "Bookmarks Toolbar">
+<!ENTITY bookmarksToolbarCmd.accesskey "m">
<!ENTITY closeWindow.label "Close Window">
<!ENTITY closeWindow.accesskey "W">
<!ENTITY minimizeButton.tooltip "Minimise">
<!ENTITY restoreButton.tooltip "Restore">
<!ENTITY feedsMenu.label "Subscribe to This Page">
<!ENTITY feedsMenu.accesskey "S">
<!ENTITY menuBar.tooltip "Menu Bar">
-<!ENTITY personalToolbar.tooltip "Personal Toolbar">
+<!ENTITY bookmarksToolbar.tooltip "Bookmarks Toolbar">
<!ENTITY navigationToolbar.tooltip "Navigation Toolbar">
<!-- Toolbar items -->
<!ENTITY backButton.label "Back">
<!ENTITY backButton.tooltip "Go back one page">
<!ENTITY forwardButton.label "Forwards">
<!ENTITY forwardButton.tooltip "Go forwards one page">
<!ENTITY reloadButton.label "Reload">
--- a/suite/chrome/common/pref/pref-languages.dtd
+++ b/suite/chrome/common/pref/pref-languages.dtd
@@ -18,15 +18,8 @@
<!ENTITY languages.customize.DefaultCharset.label "Character Encoding:">
<!ENTITY languages.customize.DefaultCharset.accesskey "C">
<!-- LOCALIZATION NOTE Character Encoding Preferences Dialog: Do NOT localize the terms "en-bz, ar-jo" -->
<!ENTITY languages.customize.others.examples "e.g.: en-bz, ar-jo">
<!ENTITY languages.customize.moveUp.label "Move Up">
<!ENTITY languages.customize.moveUp.accesskey "U">
<!ENTITY languages.customize.moveDown.label "Move Down">
<!ENTITY languages.customize.moveDown.accesskey "D">
-
-<!ENTITY spelling.label "Spelling">
-<!ENTITY checkSpelling.label "When typing check my spelling:">
-<!ENTITY checkSpelling.accesskey "W">
-<!ENTITY dontCheckSpelling.label "Never">
-<!ENTITY multilineCheckSpelling.label "In multiline boxes">
-<!ENTITY alwaysCheckSpelling.label "All boxes">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -12,13 +12,15 @@
<!ENTITY allowScripts.accesskey "s">
<!ENTITY allowWindowMoveResize.label "Move or resize existing windows">
<!ENTITY allowWindowFlip.label "Raise or lower windows">
<!ENTITY allowWindowStatusChange.label "Change status bar text">
<!ENTITY allowWindowImageSrcChange.label "Change images">
<!ENTITY allowContextmenuDisable.label "Disable or replace context menus">
<!ENTITY allowHideStatusBar.label "Hide the status bar">
-<!ENTITY enablePlugin.label "Enable Plugins for">
+<!ENTITY enablePlugin.label "Enable Plugins for:">
+<!ENTITY enablePluginForSuite.label "Suite">
+<!ENTITY enablePluginForSuite.accesskey "u">
<!ENTITY whenPluginsRequired.label "When additional plugins are required">
<!ENTITY displayNotification.label "Display a notification bar at the top of the content area">
<!ENTITY displayNotification.accesskey "N">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/pref/pref-spelling.dtd
@@ -0,0 +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 prefSpelling.title "Spelling">
+<!ENTITY generalSpelling.label "General">
+<!ENTITY checkSpellingWhenTyping.label "When typing, check my spelling:">
+<!ENTITY checkSpellingWhenTyping.accesskey "W">
+<!ENTITY dontCheckSpelling.label "Never">
+<!ENTITY multilineCheckSpelling.label "In multiline boxes">
+<!ENTITY alwaysCheckSpelling.label "All boxes">
+<!ENTITY spellForMailAndNews.label "Mail & Newsgroups">
+<!ENTITY checkSpellingBeforeSend.label "Check spelling before sending">
+<!ENTITY checkSpellingBeforeSend.accesskey "C">
+<!ENTITY spellCheckInline.label "Check spelling as you type">
+<!ENTITY spellCheckInline.accesskey "e">
+<!ENTITY languagePopup.label "Language:">
+<!ENTITY languagePopup.accessKey "L">
+<!ENTITY moreDictionaries.label "Download more dictionaries…">
+<!ENTITY noSpellCheckAvailable.label "No dictionaries available.">
--- a/suite/chrome/common/pref/pref-sync.dtd
+++ b/suite/chrome/common/pref/pref-sync.dtd
@@ -29,16 +29,18 @@
<!ENTITY addDevice.label "Add a Device">
<!ENTITY addDevice.accesskey "A">
<!-- Sync Settings -->
<!ENTITY syncComputerName.label "Computer Name:">
<!ENTITY syncComputerName.accesskey "N">
<!ENTITY syncMy2.label "Synchronise My:">
+<!ENTITY engine.addons.label "Add-ons">
+<!ENTITY engine.addons.accesskey "A">
<!ENTITY engine.bookmarks.label "Bookmarks">
<!ENTITY engine.bookmarks.accesskey "B">
<!ENTITY engine.tabs.label "Tabs">
<!ENTITY engine.tabs.accesskey "T">
<!ENTITY engine.history.label "History">
<!ENTITY engine.history.accesskey "r">
<!ENTITY engine.passwords.label "Passwords">
<!ENTITY engine.passwords.accesskey "w">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -31,10 +31,11 @@
<!ENTITY smart.label "Software Installation">
<!ENTITY download.label "Downloads">
<!ENTITY keynav.label "Keyboard Navigation">
<!ENTITY findAsYouType.label "Find As You Type">
<!ENTITY search.label "Internet Search">
<!ENTITY policies.label "Security Policies">
<!ENTITY mousewheel.label "Mouse Wheel">
<!ENTITY scriptsAndWindows.label "Scripts & Plugins">
+<!ENTITY spellingPane.label "Spelling">
<!ENTITY focusSearch.key "f">
--- a/suite/chrome/common/sync/syncQuota.properties
+++ b/suite/chrome/common/sync/syncQuota.properties
@@ -1,8 +1,9 @@
+collection.addons.label = Add-ons
collection.bookmarks.label = Bookmarks
collection.history.label = History
collection.passwords.label = Passwords
collection.prefs.label = Preferences
collection.tabs.label = Tabs
# LOCALIZATION NOTE (quota.usageNoQuota.label): %1$S and %2$S are numeric value
# and unit (as defined in the download manager) of the amount of space occupied
--- a/suite/chrome/common/sync/syncSetup.dtd
+++ b/suite/chrome/common/sync/syncSetup.dtd
@@ -76,16 +76,18 @@
<!ENTITY resetSyncKey.label "I have lost my other device.">
<!-- Sync Options -->
<!ENTITY setup.optionsPage.title "Sync Options">
<!ENTITY syncComputerName.label "Computer Name:">
<!ENTITY syncComputerName.accesskey "C">
<!ENTITY syncMy.label "Synchronise My">
+<!ENTITY engine.addons.label "Add-ons">
+<!ENTITY engine.addons.accesskey "A">
<!ENTITY engine.bookmarks.label "Bookmarks">
<!ENTITY engine.bookmarks.accesskey "B">
<!ENTITY engine.tabs.label "Tabs">
<!ENTITY engine.tabs.accesskey "T">
<!ENTITY engine.history.label "History">
<!ENTITY engine.history.accesskey "r">
<!ENTITY engine.passwords.label "Passwords">
<!ENTITY engine.passwords.accesskey "P">
--- a/suite/chrome/mailnews/mailOverlay.dtd
+++ b/suite/chrome/mailnews/mailOverlay.dtd
@@ -1,8 +1,10 @@
<!ENTITY newMessageCmd.key "M">
<!ENTITY newMessageCmd.label "Message">
<!ENTITY newMessageCmd.accesskey "m">
<!ENTITY newContactCmd.label "Contact…">
<!ENTITY newContactCmd.accesskey "C">
+<!ENTITY printButton.label "Print">
+<!ENTITY printButton.tooltip "Print this message">
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -264,16 +264,20 @@
<!ENTITY stopCmd.label "Stop">
<!ENTITY stopCmd.accesskey "S">
<!ENTITY pageSourceCmd.label "Message Source">
<!ENTITY pageSourceCmd.accesskey "o">
<!ENTITY pageSourceCmd.key "u">
<!ENTITY findCmd.label "Find in This Message…">
+<!-- LOCALIZATION NOTE (quickFilterBar.show.key2):
+ This is the key used to show the Lightning quick filter bar. -->
+<!ENTITY quickFilterBar.show.key2 "K">
+
<!-- Go Menu -->
<!ENTITY goMenu.label "Go">
<!ENTITY goMenu.accesskey "G">
<!ENTITY nextMenu.label "Next">
<!ENTITY nextMenu.accesskey "N">
<!ENTITY nextMsgCmd.label "Message">
<!ENTITY nextMsgCmd.accesskey "M">
@@ -440,17 +444,16 @@
<!ENTITY forwardButton.label "Forward">
<!ENTITY fileButton.label "File">
<!ENTITY nextButton.label "Next">
<!ENTITY goBackButton.label "Go Back">
<!ENTITY goForwardButton.label "Go Forwards">
<!ENTITY deleteButton.label "Delete">
<!ENTITY undeleteButton.label "Undelete">
<!ENTITY markButton.label "Mark">
-<!ENTITY printButton.label "Print">
<!ENTITY stopButton.label "Stop">
<!ENTITY junkButton.label "Junk">
<!ENTITY notJunkButton.label "Not Junk">
<!ENTITY searchButton.title "Advanced Search">
<!-- Tooltips -->
<!ENTITY menuBar.tooltip "Menu Bar">
<!ENTITY mailToolbar.tooltip "Mail Toolbar">
@@ -464,17 +467,16 @@
<!ENTITY forwardButton.tooltip "Forward selected message">
<!ENTITY fileButton.tooltip "File selected message">
<!ENTITY nextButton.tooltip "Move to the next unread message">
<!ENTITY goBackButton.tooltip "Go back one message">
<!ENTITY goForwardButton.tooltip "Go forwards one message">
<!ENTITY deleteButton.tooltip "Delete selected message or folder">
<!ENTITY undeleteButton.tooltip "Undelete selected message">
<!ENTITY markButton.tooltip "Mark messages">
-<!ENTITY printButton.tooltip "Print this message">
<!ENTITY stopButton.tooltip "Stop the current transfer">
<!ENTITY throbber.tooltip "Go to the &vendorShortName; home page">
<!ENTITY junkButton.tooltip "Mark the selected messages as junk">
<!ENTITY notJunkButton.tooltip "Mark the selected messages as not junk">
<!-- Statusbar -->
<!ENTITY statusText.label "Done">
--- a/suite/chrome/mailnews/msgHdrViewPopup.dtd
+++ b/suite/chrome/mailnews/msgHdrViewPopup.dtd
@@ -39,16 +39,20 @@
<!ENTITY AddToAddressBook.label "Add To Address Book…">
<!ENTITY AddToAddressBook.accesskey "B">
<!ENTITY SendMailTo.label "Compose Mail To…">
<!ENTITY SendMailTo.accesskey "s">
<!ENTITY CopyEmailAddress.label "Copy Email Address">
<!ENTITY CopyEmailAddress.accesskey "C">
<!ENTITY CreateFilterFrom.label "Create Filter From…">
<!ENTITY CreateFilterFrom.accesskey "F">
+<!ENTITY openInBrowser.label "Open in Browser">
+<!ENTITY openInBrowser.accesskey "O">
+<!ENTITY bookmarkLinkCmd.label "Bookmark This Link…">
+<!ENTITY bookmarkLinkCmd.accesskey "B">
<!ENTITY copyLinkCmd.label "Copy Link Location">
<!ENTITY copyLinkCmd.accesskey "C">
<!ENTITY CopyMessageId.label "Copy Message-ID">
<!ENTITY CopyMessageId.accesskey "C">
<!ENTITY OpenMessageForMsgId.label "Open Message For ID">
<!ENTITY OpenMessageForMsgId.accesskey "O">
<!ENTITY OpenBrowserWithMsgId.label "Open Browser With Message-ID">
<!ENTITY OpenBrowserWithMsgId.accesskey "B">
--- a/suite/chrome/mailnews/newsblog/newsblog.properties
+++ b/suite/chrome/mailnews/newsblog/newsblog.properties
@@ -6,18 +6,24 @@ subscribe-feedAlreadySubscribed=You alre
subscribe-errorOpeningFile=Could not open the file.
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-errorInvalidOPMLFile): %S is the name of the OPML file the user tried to import.
-subscribe-errorInvalidOPMLFile=Either %S is not a valid OPML file or there was an error importing the file.
+## LOCALIZATION NOTE(subscribe-OPMLImportInvalidFile): %S is the name of the OPML file the user tried to import.
+subscribe-OPMLImportInvalidFile=The file %S does not seem to be a valid OPML file.
+## LOCALIZATION NOTE(subscribe-OPMLImportNewFeeds): %S is the count of new imported entries.
+subscribe-OPMLImportNewFeeds=Imported %S new feeds.
+## LOCALIZATION NOTE(subscribe-OPMLImportTotalFeeds):
+## - The first %S is the the count of new imported entries,
+## - The second %S is total number of elements found in the file
+subscribe-OPMLImportTotalFeeds=Imported %S new feeds to which you aren't already subscribed (out of %S total entries found).
subscribe-OPMLExportOPMLFilesFilterText=OPML Files
subscribe-confirmFeedDeletionTitle=Remove Feed
## LOCALIZATION NOTE(subscribe-confirmFeedDeletion): %S is the name of the feed the user wants to unsubscribe from.
subscribe-confirmFeedDeletion=Are you sure you want to unsubscribe from the feed: \n %S?
## LOCALIZATION NOTE(subscribe-gettingFeedItems):
--- a/suite/chrome/mailnews/pref/AccountWizard.dtd
+++ b/suite/chrome/mailnews/pref/AccountWizard.dtd
@@ -56,46 +56,50 @@
<!ENTITY popType.accesskey "P">
<!ENTITY portNum.label "Port:">
<!ENTITY portNum.accesskey "o">
<!ENTITY defaultPortLabel.label "Default:">
<!ENTITY defaultPortValue.label "">
<!ENTITY leaveMsgsOnSrvr.label "Leave messages on server">
<!ENTITY leaveMsgsOnSrvr.accesskey "L">
-<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix2) : Do not translate "SMTP" and """ in
- these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix2 as a single sentence, inserting
- text after the """ entity in haveSmtp1.suffix2, if required grammatically.
+<!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
+ haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
+-->
+<!ENTITY modifyOutgoing.suffix "You can modify outgoing server settings from within Mail & Newsgroups Account Settings.">
+<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and """ in
+ these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
+ text after the """ entity in haveSmtp1.suffix3, if required grammatically.
-->
<!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), "">
-<!ENTITY haveSmtp1.suffix2 "", will be used. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
+<!ENTITY haveSmtp1.suffix3 "", will be used.">
<!-- Entities for Login page -->
<!ENTITY loginTitle.label "User Names">
<!ENTITY usernameDesc.label "Enter the incoming user name given to you by your email provider ">
<!-- LOCALIZATION NOTE (usernameExample.label) : do not translate ""jsmith"" in below line -->
<!ENTITY usernameExample.label "(for example, "jsmith").">
<!ENTITY usernameLabel.label "Incoming User Name:">
<!ENTITY usernameLabel.accesskey "I">
<!ENTITY usernameSmtpDesc.label "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
<!ENTITY usernameSmtpLabel.label "Outgoing User Name:">
<!ENTITY usernameSmtpLabel.accesskey "O">
-<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix2) : Do not translate "SMTP" and """ in
- these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix2 as a single sentence, inserting
- text after the """ entity in haveSmtp2.suffix2, if required grammatically.
+<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and """ in
+ these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
+ text after the """ entity in haveSmtp2.suffix3, if required grammatically.
-->
<!ENTITY haveSmtp2.prefix "Your existing outgoing (SMTP) username, "">
-<!ENTITY haveSmtp2.suffix2 "", will be used. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
-<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix2) : Do not translate "SMTP" and """ in
- these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix2 as a single sentence, inserting
- text after the """ entity in haveSmtp3.suffix2, if required grammatically.
+<!ENTITY haveSmtp2.suffix3 "", will be used.">
+<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and """ in
+ these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
+ text after the """ entity in haveSmtp3.suffix3, if required grammatically.
-->
<!ENTITY haveSmtp3.prefix "Your outgoing (SMTP) server, "">
-<!ENTITY haveSmtp3.suffix2 "", is identical to your incoming server, your incoming user name will be used to access it. You can modify outgoing server settings by choosing Mail & Newsgroups Account Settings from the Edit menu.">
+<!ENTITY haveSmtp3.suffix3 "", is identical to your incoming server, your incoming user name will be used to access it.">
<!-- Entities for Account name page -->
<!ENTITY accnameTitle.label "Account Name">
<!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any """ in below line -->
<!ENTITY accnameDesc.label "Enter the name by which you would like to refer to this account (for example, "Work Account", "Home Account" or "News Account").">
<!ENTITY accnameLabel.label "Account Name:">
<!ENTITY accnameLabel.accesskey "A">
--- a/suite/chrome/mailnews/pref/pref-composing_messages.dtd
+++ b/suite/chrome/mailnews/pref/pref-composing_messages.dtd
@@ -53,25 +53,16 @@
<!ENTITY autoSave.label "Automatically save the message every">
<!ENTITY autoSave.accesskey "u">
<!ENTITY autoSaveEnd.label "minutes">
<!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
<!ENTITY wrapOutMsg.label "Wrap plain text messages at">
<!ENTITY wrapOutMsg.accesskey "W">
<!ENTITY char.label "characters">
-<!ENTITY spellingHeader.label "Spelling">
-<!ENTITY spellCheck.label "Check spelling before sending">
-<!ENTITY spellCheck.accesskey "C">
-<!ENTITY spellCheckInline.label "Check spelling as you type">
-<!ENTITY spellCheckInline.accesskey "e">
-<!ENTITY languagePopup.label "Language:">
-<!ENTITY languagePopup.accessKey "g">
-<!ENTITY moreDictionaries.label "Download more dictionaries…">
-
<!ENTITY defaultMessagesHeader.label "Defaults for HTML Messages">
<!ENTITY font.label "Font:">
<!ENTITY font.accesskey "F">
<!ENTITY size.label "Size:">
<!ENTITY size.accesskey "S">
<!ENTITY fontColor.label "Text:">
<!ENTITY fontColor.accesskey "T">
<!ENTITY bgColor.label "Background:">