Firefox updates (browser & toolkit) for en-GB (Fx 3.1 beta 1)
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Tue, 30 Sep 2008 17:31:12 +0100
changeset 16 6fa821579b7e2b173db041735ba85ea47bc3367e
parent 15 988d3df759a9a0d414ea0f7bdc393d97bb6fb94b
child 17 139d838bef64f75e2f94e0333e357fd38a53fc98
push id1
push userroot
push dateWed, 13 Apr 2011 19:42:42 +0000
Firefox updates (browser & toolkit) for en-GB (Fx 3.1 beta 1)
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/permissions.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/tabbrowser.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/places/places.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -304,17 +304,16 @@ you can use these alternative items. Oth
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY fullZoomToggleCmd.label        "Zoom Text Only">
 <!ENTITY fullZoomToggleCmd.accesskey    "T">
 <!ENTITY fullZoom.label                 "Zoom">
 <!ENTITY fullZoom.accesskey             "Z">
 
-<!ENTITY newTabButton.tooltip           "Open a new tab">
 <!ENTITY newWindowButton.tooltip        "Open a new window">
 <!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
 
 <!ENTITY cutButton.tooltip              "Cut">
 <!ENTITY copyButton.tooltip             "Copy">
 <!ENTITY pasteButton.tooltip            "Paste">
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -1,16 +1,15 @@
 nv_done=Done
 nv_timeout=Timed Out
 nv_stopped=Stopped
 openFile=Open File
 
 droponbookmarksbutton=Drop a link to bookmark it
 dropondownloadsbutton=Drop a link or file to download it
-droponnewtabbutton=Drop a link or file to open it in a new tab
 droponnewwindowbutton=Drop a link or file to open it in a new window
 droponhomebutton=Drop a link or file to make it your home page
 droponhometitle=Set Home Page
 droponhomemsg=Do you want this document to be your new home page?
 
 # context menu strings
 
 contextMenuSearchText=Search %S for "%S"
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -55,18 +55,18 @@
 <!ENTITY  generalMode           "Render Mode:">
 <!ENTITY  generalSize           "Size:">
 <!ENTITY  generalReferrer       "Referring URL:">
 <!ENTITY  generalSource         "Cache Source:">
 <!ENTITY  generalModified       "Modified:">
 <!ENTITY  generalEncoding       "Encoding:">
 <!ENTITY  generalMetaName       "Name">
 <!ENTITY  generalMetaContent    "Content">
-<!ENTITY  generalSecurityMore   "More">
-<!ENTITY  generalSecurityMore.accesskey "o">
+<!ENTITY  generalSecurityDetails   "Details">
+<!ENTITY  generalSecurityDetails.accesskey "D">
 
 <!ENTITY  mediaTab              "Media">
 <!ENTITY  mediaTab.accesskey    "M">
 <!ENTITY  mediaLocation         "Location:">
 <!ENTITY  mediaText             "Associated Text:">
 <!ENTITY  mediaAltHeader        "Alternate Text">
 <!ENTITY  mediaAddress          "Address">
 <!ENTITY  mediaType             "Type">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -24,16 +24,19 @@ bookmarksRestoreAlert=This will replace 
 bookmarksRestoreAlertTags=This will replace all of your current bookmarks and tags with the backup. Are you sure?
 bookmarksRestoreTitle=Select a bookmarks backup
 bookmarksRestoreFilterName=JSON
 bookmarksRestoreFilterExtension=*.json
 
 bookmarksRestoreFormatError=Unsupported file type.
 bookmarksRestoreParseError=Unable to process the backup file.
 
+bookmarksLivemarkLoading=Live Bookmark loading…
+bookmarksLivemarkFailed=Live Bookmark feed failed to load.
+
 headerTextPrefix1=Showing 
 headerTextPrefix2=Search Results for 
 headerTextPrefix3=Advanced Search
 
 lessCriteria.label=-
 moreCriteria.label=+
 
 menuOpenLivemarkOrigin.label=Open "%S"
--- a/browser/chrome/browser/preferences/permissions.dtd
+++ b/browser/chrome/browser/preferences/permissions.dtd
@@ -3,16 +3,17 @@
 
 <!ENTITY treehead.sitename.label      "Site">
 <!ENTITY treehead.status.label        "Status">
 <!ENTITY removepermission.label       "Remove Site">
 <!ENTITY removepermission.accesskey   "R">
 <!ENTITY removeallpermissions.label   "Remove All Sites">
 <!ENTITY removeallpermissions.accesskey "e">
 <!ENTITY address.label                "Address of web site:">
+<!ENTITY address.accesskey            "d">
 <!ENTITY block.label                  "Block">
 <!ENTITY block.accesskey              "B">
 <!ENTITY session.label                "Allow for Session">
 <!ENTITY session.accesskey            "S">
 <!ENTITY allow.label                  "Allow">
 <!ENTITY allow.accesskey              "A">
 <!ENTITY windowClose.key              "w">
 
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,23 +1,23 @@
 <!ENTITY  warnAddonInstall.label        "Warn me when sites try to install add-ons">
 <!ENTITY  warnAddonInstall.accesskey    "W">
 
 <!-- LOCALIZATION NOTE (tellMaybeForgery.label, tellMaybeAttackSite.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
-  useDownloadedList.label convey the meaning "suspected" (and not something like
+  useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
 -->
-<!ENTITY  tellMaybeAttackSite.label     "Tell me if the site I'm visiting is a suspected attack site">
+<!ENTITY  tellMaybeAttackSite2.label    "Block reported attack sites">
 <!ENTITY  tellMaybeAttackSite.accesskey "k">
 
-<!ENTITY  tellMaybeForgery.label     "Tell me if the site I'm visiting is a suspected forgery">
-<!ENTITY  tellMaybeForgery.accesskey "T">
+<!ENTITY  tellMaybeForgery2.label       "Block reported web forgeries">
+<!ENTITY  tellMaybeForgery.accesskey    "B">
 
 <!ENTITY  addonExceptions.label         "Exceptions…">
 <!ENTITY  addonExceptions.accesskey     "E">
 
 
 <!ENTITY  passwords.label               "Passwords">
 
 <!ENTITY  rememberPasswords.label       "Remember passwords for sites">
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -1,17 +1,14 @@
-<!ENTITY newPagesIn.label             "New pages should be opened in:">
-<!ENTITY inNewWindow.label            "a new window">
-<!ENTITY inNewWindow.accesskey        "w">
-<!ENTITY inNewTab.label               "a new tab">
-<!ENTITY inNewTab.accesskey           "t">
-
-<!ENTITY warnCloseMultipleTabs.label  "Warn me when closing multiple tabs">
-<!ENTITY warnCloseMultipleTabs.accesskey  "m">
-
-<!ENTITY warnOpenManyTabs.label       "Warn me when opening multiple tabs might slow down &brandShortName;">
-<!ENTITY warnOpenManyTabs.accesskey   "o">
-
-<!ENTITY showTabBar.label             "Always show the tab bar">
-<!ENTITY showTabBar.accesskey         "b">
-
-<!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
-<!ENTITY switchToNewTabs.accesskey    "s">
+<!ENTITY newWindowsAsTabs.label       "Open new windows in a new tab instead">
+<!ENTITY newWindowsAsTabs.accesskey   "t">
+
+<!ENTITY warnCloseMultipleTabs.label  "Warn me when closing multiple tabs">
+<!ENTITY warnCloseMultipleTabs.accesskey  "m">
+
+<!ENTITY warnOpenManyTabs.label       "Warn me when opening multiple tabs might slow down &brandShortName;">
+<!ENTITY warnOpenManyTabs.accesskey   "o">
+
+<!ENTITY showTabBar.label             "Always show the tab bar">
+<!ENTITY showTabBar.accesskey         "b">
+
+<!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
+<!ENTITY switchToNewTabs.accesskey    "s">
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -1,25 +1,10 @@
-searchtip=Search using %S
-
-cmd_clearHistory=Clear Search History
-cmd_clearHistory_accesskey=C
-
-cmd_showSuggestions=Show Suggestions
-cmd_showSuggestions_accesskey=S
-
-addEngineConfirmTitle=Add Search Engine
-addEngineConfirmation=Add "%S" to the list of engines available in the search bar?\n\nFrom: %S
-addEngineUseNowText=Start &using it right away
-addEngineAddButtonLabel=Add
-
-error_loading_engine_title=Download Error
-# LOCALIZATION NOTE (error_loading_engine_msg2): %1$S = brandShortName, %2$S = location
-error_loading_engine_msg2=%S could not download the search plugin from:\n%S
-error_duplicate_engine_msg=%S could not install the search plugin from "%S" because an engine with the same name already exists.
-
-error_invalid_engine_title=Install Error
-# LOCALIZATION NOTE (error_invalid_engine_msg): %S = brandShortName
-error_invalid_engine_msg=This search engine isn't supported by %S and can't be installed.
-
-cmd_addFoundEngine=Add "%S"
-
-suggestion_label=Suggestions
+searchtip=Search using %S
+
+cmd_clearHistory=Clear Search History
+cmd_clearHistory_accesskey=C
+
+cmd_showSuggestions=Show Suggestions
+cmd_showSuggestions_accesskey=S
+
+cmd_addFoundEngine=Add "%S"
+
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -11,8 +11,9 @@
 <!ENTITY reloadTab.accesskey        "R">
 <!ENTITY listAllTabs.label          "List all tabs">
 <!ENTITY bookmarkAllTabs.label      "Bookmark All Tabs…">
 <!ENTITY bookmarkAllTabs.accesskey  "T">
 <!ENTITY bookmarkThisTab.label      "Bookmark This Tab">
 <!ENTITY bookmarkThisTab.accesskey  "B">
 <!ENTITY undoCloseTab.label         "Undo Close Tab">
 <!ENTITY undoCloseTab.accesskey     "U">
+<!ENTITY newTabButton.tooltip       "Open a new tab">
--- a/toolkit/chrome/mozapps/plugins/plugins.dtd
+++ b/toolkit/chrome/mozapps/plugins/plugins.dtd
@@ -1,23 +1,25 @@
-<!ENTITY pluginWizard.title                                  "Plugin Finder Service">
-<!ENTITY pluginWizard.firstPage.title                        "Welcome to the &pluginWizard.title;">
-
-<!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; is now checking for available plugins…">
-
-<!ENTITY pluginWizard.availablePluginsPage.title             "Available Plugin Downloads">
-<!ENTITY pluginWizard.availablePluginsPage.description.label "The following plugins are available:">
-<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Press Next to install these plugins.">
-<!ENTITY pluginWizard.availablePluginsPage.installerUI       "Some plugins may require additional information from you during installation.">
-
-<!ENTITY pluginWizard.licensePage.title                      "Plugin Licences">
-<!ENTITY pluginWizard.licensePage.accept.label               "I agree.">
-<!ENTITY pluginWizard.licensePage.deny.label                 "I do not agree (plugin will not be installed).">
-
-<!ENTITY pluginWizard.installPluginsPage.title               "Installing Plugins">
-<!ENTITY pluginWizard.installPluginsPage.description.label   "&brandShortName; is installing plugins…">
-
-<!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; finished installing the missing plugins:">
-
-<!ENTITY pluginWizard.finalPage.moreInfo.label               "Find out more about Plugins or manually find missing plugins.">
-<!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; needs to be restarted for the plugin(s) to work.">
-  
-<!ENTITY missingPlugin.label                                 "Click here to download plugin.">
+<!ENTITY pluginWizard.title                                  "Plugin Finder Service">
+<!ENTITY pluginWizard.firstPage.title                        "Welcome to the &pluginWizard.title;">
+
+<!ENTITY pluginWizard.checkingForPlugins.description.label   "&brandShortName; is now checking for available plugins…">
+
+<!ENTITY pluginWizard.availablePluginsPage.title             "Available Plugin Downloads">
+<!ENTITY pluginWizard.availablePluginsPage.description.label "The following plugins are available:">
+<!ENTITY pluginWizard.availablePluginsPage.continueMsg.label "Press Next to install these plugins.">
+<!ENTITY pluginWizard.availablePluginsPage.installerUI       "Some plugins may require additional information from you during installation.">
+
+<!ENTITY pluginWizard.licensePage.title                      "Plugin Licences">
+<!ENTITY pluginWizard.licensePage.accept.label               "I agree.">
+<!ENTITY pluginWizard.licensePage.deny.label                 "I do not agree (plugin will not be installed).">
+
+<!ENTITY pluginWizard.installPluginsPage.title               "Installing Plugins">
+<!ENTITY pluginWizard.installPluginsPage.description.label   "&brandShortName; is installing plugins…">
+
+<!ENTITY pluginWizard.finalPage.description.label            "&brandShortName; finished installing the missing plugins:">
+
+<!ENTITY pluginWizard.finalPage.moreInfo.label               "Find out more about Plugins or manually find missing plugins.">
+<!ENTITY pluginWizard.finalPage.restart.label                "&brandShortName; needs to be restarted for the plugin(s) to work.">
+  
+<!ENTITY missingPlugin.label                                 "Click here to download plugin.">
+<!ENTITY disabledPlugin.label                                "The plugin for this content has been disabled. Click here to manage your plugins.">
+<!ENTITY blockedPlugin.label                                 "This plugin has been blocked for your protection.">
--- a/toolkit/chrome/places/places.properties
+++ b/toolkit/chrome/places/places.properties
@@ -1,16 +1,13 @@
 BookmarksMenuFolderTitle=Bookmarks Menu
 BookmarksToolbarFolderTitle=Bookmarks Toolbar
 UnsortedBookmarksFolderTitle=Unsorted Bookmarks
 TagsFolderTitle=Tags
 
-bookmarksLivemarkLoading=Live Bookmark loading…
-bookmarksLivemarkFailed=Live Bookmark feed failed to load.
-
 finduri-AgeInDays-is-0=Today
 finduri-AgeInDays-is-1=Yesterday
 finduri-AgeInDays-is=%S days ago
 finduri-AgeInDays-isgreater=Older than %S days
 
 localhost=(local files)
 
 # LOCALIZATION NOTE (bookmarksArchiveFilename):