updates for fx4.0 /toolkit/
authorMark Tyndall <moz_en-gb@tyndall.org.uk>
Sat, 09 Oct 2010 22:16:20 +0100
changeset 64 85181846edf3ce760e5fbc19252b91e36085b156
parent 63 e1c4896b1fce5f711cac0251270f7ba25100bf9d
child 65 9fcad1e1469e9d4ce456933e569970b60fbf4b65
push id1
push userroot
push dateWed, 13 Apr 2011 19:42:42 +0000
updates for fx4.0 /toolkit/
toolkit/chrome/global-region/region.properties
toolkit/chrome/global/about.dtd
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/actions.dtd
toolkit/chrome/global/commonDialog.dtd
toolkit/chrome/global/commonDialogs.properties
toolkit/chrome/global/config.properties
toolkit/chrome/global/customizeToolbar.dtd
toolkit/chrome/global/filepicker.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/license.dtd
toolkit/chrome/global/nsHelperAppDlg.dtd
toolkit/chrome/global/nsHelperAppDlg.properties
toolkit/chrome/global/nsProgressDialog.dtd
toolkit/chrome/global/nsProgressDialog.properties
toolkit/chrome/global/tree.dtd
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/webConsole.dtd
toolkit/chrome/mozapps/extensions/blocklist.dtd
toolkit/chrome/mozapps/extensions/errors.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/incompatible.dtd
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/chrome/passwordmgr/passwordManager.dtd
toolkit/chrome/passwordmgr/passwordmgr.properties
--- a/toolkit/chrome/global-region/region.properties
+++ b/toolkit/chrome/global-region/region.properties
@@ -1,11 +1,13 @@
 #
 #   Localizable URLs
 #
 pluginStartupMessage=Starting Plugin for type
 
 # plug-ins URLs
 more_plugins_label=mozilla.org
 more_plugins_url=https://pfs.mozilla.org/plugins/
+pluginupdates_label=mozilla.com/plugincheck
+pluginupdates_url=http://www.mozilla.com/plugincheck/
 plugindoc_label=plugindoc.mozdev.org
 plugindoc_url=http://plugindoc.mozdev.org/
 
--- a/toolkit/chrome/global/about.dtd
+++ b/toolkit/chrome/global/about.dtd
@@ -1,19 +1,27 @@
 <!ENTITY about.version                "version">
 
-<!ENTITY about.copy.beforeLink        "Copyright &copy; 1998-2010 by">
-<!ENTITY about.copy.linkTitle         "contributors">
-<!ENTITY about.copy.afterLink         "to the Mozilla Project.">
+<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
+<!ENTITY about.credits.beforeLink     "See a list of ">
+<!ENTITY about.credits.linkTitle      "contributors">
+<!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
+<!ENTITY about.credits.afterLink      " to the Mozilla Project.">
 
-<!ENTITY about.license.beforeLink     "Read the">
-<!ENTITY about.license.linkTitle      "licencing information">
-<!ENTITY about.license.afterLink      "for this product.">
+<!-- LOCALIZATION NOTE (about.license.beforeTheLink): note that there is no space between this phrase and the linked about.license.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
+<!ENTITY about.license.beforeTheLink  "Read the ">
+<!ENTITY about.license.linkTitle      "licensing information">
+<!-- LOCALIZATION NOTE (about.license.afterTheLink): note that there is no space between the linked about.license.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
+<!ENTITY about.license.afterTheLink   " for this product.">
 
-<!ENTITY about.relnotes.beforeLink    "Read the">
+<!-- LOCALIZATION NOTE (about.relnotes.beforeTheLink): note that there is no space between this phrase and the linked about.relnotes.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
+<!ENTITY about.relnotes.beforeTheLink "Read the ">
 <!ENTITY about.relnotes.linkTitle     "release notes">
-<!ENTITY about.relnotes.afterLink     "for this version.">
+<!-- LOCALIZATION NOTE (about.relnotes.afterTheLink): note that there is no space between the linked about.relnotes.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
+<!ENTITY about.relnotes.afterTheLink  " for this version.">
 
-<!ENTITY about.buildconfig.beforeLink "See the">
-<!ENTITY about.buildconfig.linkTitle  "build configuration">
-<!ENTITY about.buildconfig.afterLink  "used for this version.">
+<!-- LOCALIZATION NOTE (about.buildconfig.beforeTheLink): note that there is no space between this phrase and the linked about.buildconfig.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
+<!ENTITY about.buildconfig.beforeTheLink "See the ">
+<!ENTITY about.buildconfig.linkTitle     "build configuration">
+<!-- LOCALIZATION NOTE (about.buildconfig.afterTheLink): note that there is no space between the linked about.buildconfig.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
+<!ENTITY about.buildconfig.afterTheLink  " used for this version.">
 
 <!ENTITY about.buildIdentifier        "Build identifier: ">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutAbout.dtd
@@ -0,0 +1,4 @@
+<!ENTITY aboutAbout.title  "About About">
+<!ENTITY aboutAbout.note   "This is a list of “about” pages for your convenience.<br/>
+                            Some of them might be confusing. Some are for diagnostic purposes only.<br/>
+                            And some are omitted because they require query strings.">
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -11,55 +11,75 @@
      chunk, it can be left blank.
 
      Also note the leading/trailing whitespace in strings here, which is
      deliberate for formatting around the embedded links. -->
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
-<!ENTITY rights.intro-point2a "Mozilla does not grant you any rights to the Mozilla and Firefox trademarks or logos. Additional information on Trademarks may be found ">
-<!ENTITY rights.intro-point2b "here">
-<!ENTITY rights.intro-point2c ".">
+<!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. ">
+<!ENTITY rights.intro-point2-b "Additional information on trademarks">
+<!ENTITY rights.intro-point2-c " is available.">
+
+<!-- point 2.5 text for official branded builds -->
+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its web sites, and to distribute the feedback.">
 
 <!-- point 3 text for official branded builds -->
-<!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
-<!ENTITY rights.intro-point3b "here">
+<!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
+<!ENTITY rights2.intro-point3b "&brandShortName; Privacy Policy">
 <!ENTITY rights.intro-point3c ".">
 
 <!-- point 3 text for unbranded builds -->
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
 
 <!-- point 4 text for official branded builds -->
 <!ENTITY rights.intro-point4a "&brandShortName; also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the services, can be found in the ">
 <!ENTITY rights.intro-point4b "service terms">
 <!ENTITY rights.intro-point4c ".">
 
 <!-- point 4 text for unbranded builds -->
 <!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
 <!ENTITY rights.intro-point4b-unbranded "Web Site Services">
 <!ENTITY rights.intro-point4c-unbranded " section.">
 
-<!ENTITY rights.webservices-header "&brandFullName; Web Site Services">
+<!ENTITY rights2.webservices-header "&brandFullName; Web-Based Information Services">
 
 <!-- Note that this paragraph references a couple of entities from
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
-<!ENTITY rights.webservices-a "&brandFullName; uses web site information services (&quot;Services&quot;), such as the SafeBrowsing service, that are available for your use with this binary version of &brandShortName; as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by opening the application preferences, selecting the ">
-<!ENTITY rights.webservices-b "Security">
-<!ENTITY rights.webservices-c " section, and unchecking the options for &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights2.webservices-a "&brandFullName; uses web-based information services (&quot;Services&quot;) to provide some of the features provided for your use with this binary version of &brandShortName; under the terms described below. If you do not want to use one or more of the Services or the terms below are unacceptable, you may disable the feature or Service(s). Instructions on how to ">
+<!ENTITY rights2.webservices-b "disable a particular feature or Service">
+<!ENTITY rights2.webservices-c " is available.">
+
+<!-- safe browsing points for branded builds -->
+<!ENTITY rights.safebrowsing-a "SafeBrowsing: ">
+<!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.safebrowsing-term1 "Open the application preferences">
+<!ENTITY rights.safebrowsing-term2 "Select the Security selection">
+<!ENTITY rights.safebrowsing-term3 "Clear the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
+<!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
+
+<!-- location aware browsing points for branded builds -->
+<!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
+<!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
+<!ENTITY rights.locationawarebrowsing-term1a "In the URL bar, type ">
+<!ENTITY rights.locationawarebrowsing-term1b "about:config">
+<!ENTITY rights.locationawarebrowsing-term2 "Type geo.enabled">
+<!ENTITY rights.locationawarebrowsing-term3 "Double click on the geo.enabled preference">
+<!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
 
 <!-- intro paragraph for unbranded builds -->
 <!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 
 <!-- point 1 text for unbranded builds -->
 <!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
 
 <!-- points 1-7 text for branded builds -->
-<!ENTITY rights.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.">
+<!ENTITY rights2.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only and neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
-<!ENTITY rights.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
+<!ENTITY rights2.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and &vendorShortName; grants you its rights to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
 <!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
 <!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
 <!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
 <!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -0,0 +1,40 @@
+<!ENTITY aboutSupport.pageTitle "Troubleshooting Information">
+
+<!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
+<!ENTITY aboutSupport.pageSubtitle "
+  This page contains technical information that might be useful when you're
+  trying to solve a problem. If you are looking for answers to common questions
+  about &brandShortName;, check out our <a id='supportLink'>support web site</a>.
+">
+
+<!ENTITY aboutSupport.extensionsTitle "Extensions">
+<!ENTITY aboutSupport.extensionName "Name">
+<!ENTITY aboutSupport.extensionEnabled "Enabled">
+<!ENTITY aboutSupport.extensionVersion "Version">
+<!ENTITY aboutSupport.extensionId "ID">
+
+<!ENTITY aboutSupport.appBasicsTitle "Application Basics">
+<!ENTITY aboutSupport.appBasicsName "Name">
+<!ENTITY aboutSupport.appBasicsVersion "Version">
+<!ENTITY aboutSupport.appBasicsProfileDir "Profile Directory">
+<!ENTITY aboutSupport.appBasicsEnabledPlugins "Enabled Plugins">
+<!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
+<!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
+
+<!ENTITY aboutSupport.show.label "Open Containing Folder">
+
+<!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
+variant of aboutSupport.show.label.  This allows us to use the preferred
+"Finder" terminology on Mac. -->
+<!ENTITY aboutSupport.showMac.label "Show in Finder">
+
+<!ENTITY aboutSupport.modifiedPrefsTitle "Modified Preferences">
+<!ENTITY aboutSupport.modifiedPrefsName "Name">
+<!ENTITY aboutSupport.modifiedPrefsValue "Value">
+
+<!ENTITY aboutSupport.graphicsTitle "Graphics">
+
+<!ENTITY aboutSupport.installationHistoryTitle "Installation History">
+<!ENTITY aboutSupport.updateHistoryTitle "Update History">
+
+<!ENTITY aboutSupport.copyToClipboard.label "Copy all to clipboard">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -0,0 +1,25 @@
+# LOCALIZATION NOTE In the following string, "Direct2D" is a proper noun and should not be translated.
+# Feel free to leave english strings if there are no good translations, these are only used in about:support
+
+# LOCALIZATION NOTE: This can be localized with a more generic term, like
+# "Graphics-accelerated Windows". It describes a number of windows, e.g.:
+# "GPU Accelerated Windows: 2/2 (Direct3D 9)"
+# "GPU Accelerated Windows: 0/2"
+acceleratedWindows = GPU Accelerated Windows
+
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+# The %1 here is a placeholder, leave unchanged, it will get replaced by the driver version string.
+tryNewerDriverVersion = Blocked on your graphics driver. Try updating your graphics driver to version %1 or newer.
+
+# LOCALIZATION NOTE The verb "blocked" here refers to a graphics feature such as "Direct2D" or "OpenGL layers".
+blockedGraphicsCard = Blocked on your graphics card because of unresolved driver issues.
+
+direct2DEnabled = Direct2D Enabled
+directWriteEnabled = DirectWrite Enabled
+adapterDescription = Adapter Description
+adapterVendorID = Vendor ID
+adapterDeviceID = Device ID
+adapterDrivers = Adapter Drivers
+adapterRAM = Adapter RAM
+driverVersion = Driver Version
+driverDate = Driver Date
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/actions.dtd
@@ -0,0 +1,1 @@
+<!ENTITY action.switchToTab.label "Switch to tab">
--- a/toolkit/chrome/global/commonDialog.dtd
+++ b/toolkit/chrome/global/commonDialog.dtd
@@ -1,10 +1,9 @@
-<!ENTITY header.label     "Brief Title"> 
-<!ENTITY message.label    "Some sample Text goes here.">
-<!ENTITY editfield0.label "User Name:"> 
-<!ENTITY editfield1.label "Password:"> 
-<!ENTITY editfield2.label "Confirm Password:"> 
-<!ENTITY checkbox.label   "tick"> 
-<!ENTITY copyCmd.label    "Copy">
-<!ENTITY copyCmd.accesskey "C">
-<!ENTITY selectAllCmd.label "Select All">
-<!ENTITY selectAllCmd.accesskey "A">
+<!ENTITY header.label     "Brief Title"> 
+<!ENTITY message.label    "Some sample Text goes here.">
+<!ENTITY editfield0.label "User Name:"> 
+<!ENTITY editfield1.label "Password:"> 
+<!ENTITY checkbox.label   "tick">
+<!ENTITY copyCmd.label    "Copy">
+<!ENTITY copyCmd.accesskey "C">
+<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.accesskey "A">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -9,8 +9,19 @@ OK=OK
 Cancel=Cancel
 Yes=&Yes
 No=&No
 Save=&Save
 Revert=&Revert
 DontSave=&Don't Save
 ScriptDlgGenericHeading=[JavaScript Application]
 ScriptDlgHeading=The page at %S says:
+ScriptDialogLabel=Prevent this page from creating additional dialogues
+ScriptDialogPreventTitle=Confirm Dialogue Preference
+# LOCALIZATION NOTE (EnterLoginForRealm, EnterLoginForProxy):
+# %1 is an untrusted string provided by a remote server. It could try to
+# take advantage of sentence structure in order to mislead the user (see
+# bug 244273). %1 should be integrated into the translated sentences as
+# little as possible. %2 is the url of the site being accessed.
+EnterLoginForRealm=A user name and password are being requested by %2$S. The site says: "%1$S"
+EnterLoginForProxy=The proxy %2$S is requesting a user name and password. The site says: "%1$S"
+EnterUserPasswordFor=Enter user name and password for %1$S
+EnterPasswordFor=Enter password for %1$S on %2$S
--- a/toolkit/chrome/global/config.properties
+++ b/toolkit/chrome/global/config.properties
@@ -45,8 +45,11 @@ string=string
 int=integer
 bool=boolean
 
 # Preference prompts
 # %S is replaced by one of the type column values above
 new_title=New %S value
 new_prompt=Enter the preference name
 modify_title=Enter %S value
+
+nan_title=Invalid value
+nan_text=The text you entered is not a number.
--- a/toolkit/chrome/global/customizeToolbar.dtd
+++ b/toolkit/chrome/global/customizeToolbar.dtd
@@ -1,12 +1,12 @@
-<!ENTITY dialog.title             "Customise Toolbar">
-<!ENTITY dialog.style             "width: 635px; height: 400px;">
-<!ENTITY instructions.description "You can add or remove items by dragging to or from the toolbars.">
-<!ENTITY show.label               "Show:">
-<!ENTITY iconsAndText.label       "Icons and Text">
-<!ENTITY icons.label              "Icons">
-<!ENTITY text.label               "Text">
-<!ENTITY useSmallIcons.label      "Use Small Icons">
-<!ENTITY restoreDefaultSet.label  "Restore Default Set">
-<!ENTITY addNewToolbar.label      "Add New Toolbar">
-<!ENTITY saveChanges.label        "Done">
-<!ENTITY undoChanges.label        "Undo Changes">
+<!ENTITY dialog.title             "Customise Toolbar">
+<!ENTITY dialog.style             "width: 86ch; height: 36em;">
+<!ENTITY instructions.description "You can add or remove items by dragging to or from the toolbars.">
+<!ENTITY show.label               "Show:">
+<!ENTITY iconsAndText.label       "Icons and Text">
+<!ENTITY icons.label              "Icons">
+<!ENTITY text.label               "Text">
+<!ENTITY useSmallIcons.label      "Use Small Icons">
+<!ENTITY restoreDefaultSet.label  "Restore Default Set">
+<!ENTITY addNewToolbar.label      "Add New Toolbar">
+<!ENTITY saveChanges.label        "Done">
+<!ENTITY undoChanges.label        "Undo Changes">
--- a/toolkit/chrome/global/filepicker.properties
+++ b/toolkit/chrome/global/filepicker.properties
@@ -1,22 +1,19 @@
-# LOCALIZATION NOTE FILE
-# --do not localize the extensions, only the titles
+# LOCALIZATION NOTE: The extensions to which these descriptions refer
+#                    now live in toolkit/content/filepicker.properties
 allTitle=All Files
-allFilter=*
 htmlTitle=HTML Files
-htmlFilter=*.html; *.htm; *.shtml; *.xhtml
 textTitle=Text Files
-textFilter=*.txt; *.text
 imageTitle=Image Files
 xmlTitle=XML Files
-xmlFilter=*.xml
 xulTitle=XUL Files
-xulFilter=*.xul
 appsTitle=Applications
+audioTitle=Audio Files
+videoTitle=Video Files
 
 dirTextInputLabel=Directory name:
 dirTextInputAccesskey=n
 
 confirmTitle=Confirm
 confirmFileReplacing=%S already exists.\nDo you want to replace it?
 openButtonLabel=Open
 saveButtonLabel=Save
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/headsUpDisplay.properties
@@ -0,0 +1,112 @@
+typeError=Error: 
+typeWarning=Warning: 
+typeNetwork=Network: 
+typeException=Exception:  
+typeCssParser=CSS Parser: 
+typeStrict=Strict Warning: 
+msgCategory=Category: 
+errFile=Source File: %S
+errLine=Line: %S
+errLineCol=Line: %S, Column: %S
+errCode=Source Code:
+jsWorkspaceTitle=JS Workspace
+btnHide=Hide
+btnPrefs=Preferences
+categoryPage=Page:
+categoryConsole=Console:
+btnMutation=DOM Mutation
+tipMutation=Toggle DOM Mutation event logging
+btnPageNet=Net
+tipPageNet=Log network access
+btnPageCSS=CSS
+tipPageCSS=Log CSS parsing errors
+btnPageJS=JS
+tipPageJS=Log JavaScript exceptions
+btnConsoleErrors=Errors
+tipConsoleErrors=Log calls to console.error()
+btnConsoleInfo=Info
+tipConsoleInfo=Log calls to console.info()
+btnConsoleWarnings=Warnings
+tipConsoleWarnings=Log calls to console.warn()
+btnConsoleLog=Log
+tipConsoleLog=Log calls to console.log()
+btnGlobal=Global Messages
+tipGlobal=Toggle Global Message logging
+localConsole=Local Console
+clearConsoleCmd.label=Clear Console
+clearConsoleCmd.accesskey=e
+stringFilter=Filter
+close.button=Close
+close.accesskey=C
+update.button=Update
+update.accesskey=U
+# LOCALIZATION NOTE FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
+#
+# The "PropertyPanel" is used to display a JS object to the user.
+# If it is clear which object is being inspected (e.g., window, document object)
+# the title of the panel is based on the `jsPropertyInspectTitle` string.
+# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
+# gets used. This can be the case when the user logs an object to the WebConsole
+# output using the console.log(aObjectToInspect) method.
+#
+# You can find a screenshot of the PropertyPanel here:
+#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
+jsPropertyTitle=Object Inspector
+# LOCALIZATION NOTE (jsPropertyInspectTitle):
+#
+# The %S is replaced by the evaluated code the user clicked on in the console.
+#
+# Example: The user executed `window.document` in the WebConsole. The `document`
+# object is written to the output. If the user clicks on the `document` output
+# in the console, a PropertyPanel will show up. The title of the PropertyPanel
+# is set to `Inspect: window.document` because the clicked `document` object was
+# evaluated based on the `window.document` string.
+jsPropertyInspectTitle=Inspect: %S
+saveBodies.label=Log Request and Response Bodies
+saveBodies.accesskey=L
+copyCmd.label=Copy
+copyCmd.accesskey=C
+selectAllCmd.label=Select All
+selectAllCmd.accesskey=A
+# LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
+# %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
+timestampFormat=%02S:%02S:%02S.%03S
+
+helperFuncUnsupportedTypeError=Can't call pprint on this type of object.
+# LOCALIZATION NOTE (networkUrlWithStatus):
+#
+# When the HTTP request is started only the URL of the request is printed to the
+# WebConsole. As the response status of the HTTP request arrives, the URL string
+# is replaced by this string (the response status can look like `HTTP/1.1 200 OK`).
+# The bracket is not closed to mark that this request is not done by now. As the
+# request is finished (the HTTP connection is closed) this string is replaced
+# by `networkUrlWithStatusAndDuration` which has a closing the braket.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+networkUrlWithStatus=%1$S [%2$S
+# LOCALIZATION NOTE (networkUrlWithStatusAndDuration):
+#
+# When the HTTP request is finished (the HTTP connection is closed) this string
+# replaces the former `networkUrlWithStatus` string in the WebConsole.
+#
+# %1$S = URL of network request
+# %2$S = response status code from the server (e.g. `HTTP/1.1 200 OK`)
+# %3$S = duration for the complete network request in milliseconds
+networkUrlWithStatusAndDuration=%1$S [%2$S %3$Sms]
+NetworkPanel.label=Inspect Network Request
+# LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
+#
+# This string is used to show the duration between two network events (e.g
+# request and respones header or response header and response body).
+NetworkPanel.durationMS=%Sms
+# LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS):
+# This string is used to show the duration between the response header and the
+# response body event. It also shows the size of the received or cached image.
+#
+# The first %S is replace by the width of the inspected image.
+# The second %S is replaced by the height of the inspected image.
+# The third %S is replaced by the duration between the response header and the
+# response body event.
+NetworkPanel.imageSizeDeltaDurationMS=%S×%Spx, Δ%Sms
+ConsoleAPIDisabled=The Web Console logging API (console.log, console.info, console.warn, console.error) has been disabled by a script on this page.
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -146,16 +146,17 @@ sd = Sindhi
 se = Northern Sami
 sg = Sango
 si = Singhalese
 sk = Slovak
 sl = Slovenian
 sm = Samoan
 sn = Shona
 so = Somali
+son = Songhay
 sq = Albanian
 sr = Serbian
 ss = Siswati
 st = Sotho, Southern
 su = Sundanese
 sv = Swedish
 sw = Swahili
 ta = Tamil
deleted file mode 100644
--- a/toolkit/chrome/global/license.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY license.part0     "is copyright">
-<!ENTITY license.part1     "by its">
-<!ENTITY license.contrib   "contributors">
-<!ENTITY license.part2     "according to terms set out in the">
-<!ENTITY license.part3     "document. All Rights Reserved.">
deleted file mode 100644
--- a/toolkit/chrome/global/nsHelperAppDlg.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<!ENTITY caption.label         "Opening #1">
-
-<!-- Localization note: The default intro text has 3 "inserts":
-        #1 - replaced with the descriptive text that describes the mime type
-             (e.g., "MSWord Document")
-        #2 - replaced with the mime type (e.g., "application/ms-word")
-        #3 - replaced with the filename (e.g., "manual.doc")
-        #4 - will be replaced by the brand name (e.g., "Mozilla")
-     If there is no descriptive text, then the alternative text is used which
-     has only insert #2.
- -->
-<!ENTITY intro.label           "The file &quot;#3&quot; is of type #2 (#1); #4 does not know how to handle this file type. This file is located at:">
-<!ENTITY intro.noDesc.label    "The file &quot;#3&quot; is of type #2; #4 does not know how to handle this file type. This file is located at:">
-
-<!ENTITY intro.attachment.label "The site has suggested that &quot;#3&quot; be handled as an attachment. It is of type #2 (#1) and located at:">
-<!ENTITY intro.attachment.noDesc.label "The site has suggested that &quot;#3&quot; be handled as an attachment. It is of type #2 and located at:">
-
-<!ENTITY intro.sniffed.label "#4 has detected that the file &quot;#3&quot; is likely to be of type #2 (#1). The file is located at:">
-<!ENTITY intro.sniffed.noDesc.label "#4 has detected that the file &quot;#3&quot; is likely to be of type #2. The file is located at:">
-
-<!ENTITY prompt.label          "What should #1 do with this file?">
-
-<!ENTITY alwaysHandle.label     "Always perform this action when handling files of this type">
-<!ENTITY alwaysHandle.accesskey "A">
-
-<!ENTITY saveToDisk.label      "Save it to disc">
-<!ENTITY saveToDisk.accesskey  "S">
-
-<!ENTITY useSystemDefault.label        "Open it with the default application (#1)">
-<!ENTITY useSystemDefault.noDesc.label "Open it with the default application">
-<!ENTITY useSystemDefault.accesskey    "O">
-
-<!ENTITY openUsing.label       "Open it with">
-<!ENTITY openUsing.accesskey   "w">
-
-<!ENTITY chooseApp.label       "Choose…">
-<!ENTITY chooseApp.accesskey   "C">
-
-<!ENTITY chooseAppFilePickerTitle "Choose Helper Application">
-
-<!ENTITY badApp                 "The application you specified (&quot;#1&quot;) could not be found.  Check the file name or select another application.">
-<!ENTITY badApp.title           "Application not found">
deleted file mode 100644
--- a/toolkit/chrome/global/nsHelperAppDlg.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-saveDialogTitle=Enter name of file to save to…
-noDefaultFile=unnamed
deleted file mode 100644
--- a/toolkit/chrome/global/nsProgressDialog.dtd
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Mozilla Progress Dialog.
-   -
-   - The Initial Developer of the Original Code is
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2002
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bill Law       <law@netscape.com>
-   -   Aaron Kaluszka <ask@swva.net>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-<!-- These strings are used on the download progress dialog.
-     See: http://lxr.mozilla.org/seamonkey/source/embedding/components/ui/progressDlg/nsProgressDialog.xul
--->
-
-<!-- This is used prior to initializing with a proper title -->
-<!ENTITY defaultTitle     "Saving">
-
-<!-- These are used when saving -->
-<!ENTITY savingTitle      "#2&#037; of #1 Saved"> 
-<!ENTITY savingSource     "Saving From:"> 
-<!ENTITY savingTarget     "To:"> 
-
-<!-- These are used when opening (with an application) -->
-<!ENTITY openingTitle      "#2&#037; of #1 Completed">
-<!ENTITY openingSource     "Opening From:">
-<!ENTITY openingTarget     "With:">
-
-<!-- This is used when the download percentage is unknown -->
-<!ENTITY unknownSavingTitle  "Saving #1">
-<!ENTITY unknownOpeningTitle "Opening #1">
-
-<!-- Labels on other fields -->
-<!ENTITY status      "Status:"> 
-<!ENTITY timeElapsed "Time Elapsed:">
-<!ENTITY timeLeft    "Time Left:">
-<!ENTITY progress    "Progress:">
-
-<!-- Label for the "keep dialog" checkbox -->
-<!ENTITY keep "Keep this window open after the download is complete.">
-
-<!-- Button labels -->
-<!ENTITY cancel "Cancel"> 
-<!ENTITY pause  "Pause">
-<!ENTITY resume "Resume">
-<!ENTITY close  "Close">
-<!ENTITY reveal "Show File Location">
-<!ENTITY launch "Launch File">
-
-<!-- Status/progress messages -->
-
-<!-- LOCALIZATION NOTE (pausedMsg):
-    This string is used to indicate that the download is paused -->
-<!ENTITY pausedMsg "Download Paused">
-
-<!-- LOCALIZATION NOTE (progressMsg):
-
-    This string is used to generate the status message used during
-    file download.
-
-    #1 will be replaced by the number of bytes downloaded thus far
-    #2 will be replaced by the total number of bytes to be downloaded
-    #3 will be replaced by the download rate (in KB per second) -->
-<!ENTITY progressMsg "#1kB of #2kB (at #3kB/sec)">
-
-<!-- LOCALIZATION NOTE (unknownTime):
-    
-    This string is used when the time remaining is unknown. -->
-<!ENTITY unknownTime "Unknown">
-
-<!-- LOCALIZATION NOTE (longTimeFormat):
-
-    This string is used to format elapsed/remaining times when the
-    time exceeds 1 hour in length.
-
-    #1 will be replaced by the number of hours
-    #2 will be replaced by the number of minutes
-    #3 will be replaced by the number of seconds -->
-<!ENTITY longTimeFormat "#1:#2:#3">
-
-<!-- LOCALIZATION NOTE (shortTimeFormat):
-
-    This string is used to format elapsed/remaining times when the
-    time is less than 1 hour in length.  Note that you can leave
-    "#1" out of this string to omit the leading "00:" if you so choose.
-
-    #1 will be replaced by the number of hours
-    #2 will be replaced by the number of minutes
-    #3 will be replaced by the number of seconds -->
-<!ENTITY shortTimeFormat "#2:#3">
-
-<!-- LOCALIZATION NOTE (completeMsg):
-
-    This string is displayed when the download is complete.  The insert
-    "#1" is replaced by the elapsed time, formatted according to the
-    xxxTimeFormat strings defined above).  You can omit "#1" if you don't
-    want the elapsed time in the message.
-
-    #1 will be replaced by the elapsed time
-    #2 will be replaced by the size of the file in Kilobytes -->
-<!ENTITY completeMsg "Finished, #2 kB downloaded (elapsed time was #1)">
-
-<!-- LOCALIZATION NOTE (percentMsg):
-
-    This string is used to format the text to the right of the progress
-    meter.
-
-    #1 will be replaced by the percentage of the file that has been saved -->
-<!ENTITY percentMsg "#1&#037;">
deleted file mode 100644
--- a/toolkit/chrome/global/nsProgressDialog.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Progress Dialog.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Bill Law  <law@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-savingAlertTitle=Saving %S
-openingAlertTitle=Opening %S
-securityAlertMsg=Warning! Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch %S?
-dontAskAgain=Don't ask me again.
--- a/toolkit/chrome/global/tree.dtd
+++ b/toolkit/chrome/global/tree.dtd
@@ -1,1 +1,1 @@
-<!ENTITY restoreNaturalOrder.label "Restore Defaults">
+<!ENTITY restoreColumnOrder.label "Restore Column Order">
--- a/toolkit/chrome/global/videocontrols.dtd
+++ b/toolkit/chrome/global/videocontrols.dtd
@@ -1,10 +1,11 @@
 <!ENTITY playButton.playLabel "Play">
 <!ENTITY playButton.pauseLabel "Pause">
 <!ENTITY muteButton.muteLabel "Mute">
 <!ENTITY muteButton.unmuteLabel "Unmute">
 
 <!-- LOCALIZATION NOTE (scrubberScale.nameFormat): the #1 string is the current
 media position, and the #2 string is the total duration. For example, when at
 the 5 minute mark in a 6 hour long video, #1 would be "5:00" and #2 would be
-"6:00:00", result string would be "5:00 of 6:00:00 elapsed". -->
+"6:00:00", result string would be "5:00 of 6:00:00 elapsed".
+-->
 <!ENTITY scrubberScale.nameFormat "#1 of #2 elapsed">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/webConsole.dtd
@@ -0,0 +1,15 @@
+<!ENTITY networkPanel.requestURL                  "Request URL">
+<!ENTITY networkPanel.requestMethod               "Request Method">
+<!ENTITY networkPanel.statusCode                  "Status Code">
+
+<!ENTITY networkPanel.requestHeaders              "Request Headers">
+<!ENTITY networkPanel.requestCookie               "Sent Cookie">
+<!ENTITY networkPanel.requestBody                 "Request Body">
+<!ENTITY networkPanel.requestFormData             "Sent Form Data">
+
+<!ENTITY networkPanel.responseHeaders             "Response Headers">
+<!ENTITY networkPanel.responseBody                "Response Body">
+<!ENTITY networkPanel.responseBodyCached          "Cached Data">
+<!ENTITY networkPanel.responseNoBody              "No Response Body">
+<!ENTITY networkPanel.responseImage               "Received Image">
+<!ENTITY networkPanel.responseImageCached         "Cached Image">
--- a/toolkit/chrome/mozapps/extensions/blocklist.dtd
+++ b/toolkit/chrome/mozapps/extensions/blocklist.dtd
@@ -3,8 +3,11 @@
 <!ENTITY blocklist.summary           "&brandShortName; has determined that the following add-ons are known to cause stability or security problems:">
 <!ENTITY blocklist.softblocked       "For your protection, it is highly recommended that you restart with these add-ons disabled.">
 <!ENTITY blocklist.hardblocked       "These add-ons have a high risk of causing stability or security problems and have been blocked, but a restart is required to disable them completely.">
 <!ENTITY blocklist.softandhard       "The add-ons that have a high risk of causing stability or security problems have been blocked. The others are lower risk, but it is highly recommended that you restart with them disabled.">
 <!ENTITY blocklist.moreinfo          "More information">
 
 <!ENTITY blocklist.accept.label      "Restart &brandShortName;">
 <!ENTITY blocklist.accept.accesskey  "R">
+
+<!ENTITY blocklist.blocked.label     "Blocked">
+<!ENTITY blocklist.checkbox.label    "Disable">
deleted file mode 100644
--- a/toolkit/chrome/mozapps/extensions/errors.dtd
+++ /dev/null
@@ -1,1 +0,0 @@
-<!ENTITY  errors.title                "Errors">
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -1,176 +1,188 @@
-<!ENTITY addons.title                     "Add-ons">
+<!ENTITY addons.windowTitle                   "Add-ons Manager">
+<!ENTITY search.placeholder                   "Search all add-ons">
+<!ENTITY loading.label                        "Loading…">
+<!ENTITY listEmpty.installed.label            "You don't have any add-ons of this type installed">
+<!ENTITY listEmpty.availableUpdates.label     "No updates found">
+<!ENTITY listEmpty.recentUpdates.label        "You haven't recently updated any add-ons">
+<!ENTITY listEmpty.findUpdates.label          "Check For Updates">
+<!ENTITY listEmpty.search.label               "Could not find any matching add-ons">
+<!ENTITY listEmpty.button.label               "Learn more about add-ons">
+<!ENTITY installAddonFromFile.label           "Install Add-on From File…">
+<!ENTITY installAddonFromFile.accesskey       "I">
+<!ENTITY toolsMenu.tooltip                    "Tools for all add-ons">
 
-<!-- Default window size for the addon manager in pixels -->
-<!ENTITY em.width                         "520">
-<!ENTITY em.height                        "380">
+<!ENTITY cmd.back.tooltip                     "Go back one page">
+<!ENTITY cmd.forward.tooltip                  "Go forwards one page">
 
-<!ENTITY cmd.info.commandKey              "i">
-<!ENTITY cmd.options.commandKey           ",">
-<!ENTITY cmd.close.commandKey             "w">
+<!-- global warnings -->
+<!ENTITY warning.safemode.label                    "All add-ons have been disabled by safe mode.">
+<!ENTITY warning.checkcompatibility.label          "Add-on compatibility checking is disabled. You may have incompatible add-ons.">
+<!ENTITY warning.checkcompatibility.enable.label   "Enable">
+<!ENTITY warning.checkcompatibility.enable.tooltip "Enable add-on compatibility checking">
+<!ENTITY warning.updatesecurity.label              "Add-on update security checking is disabled. You may be compromised by updates.">
+<!ENTITY warning.updatesecurity.enable.label       "Enable">
+<!ENTITY warning.updatesecurity.enable.tooltip     "Enable add-on update security checking">
 
-<!-- View labels -->
-<!ENTITY search.label                     "Get Add-ons">
-<!ENTITY extensions.label                 "Extensions">
-<!ENTITY themes.label                     "Themes">
-<!ENTITY locales.label                    "Languages">
-<!ENTITY plugins.label                    "Plugins">
-<!ENTITY update.label                     "Updates">
-<!ENTITY install.label                    "Installation">
+<!-- categories / views -->
+<!ENTITY view.search.label                    "Search">
+<!ENTITY view.discover.label                  "Get Add-ons">
+<!ENTITY view.locales.label                   "Languages">
+<!ENTITY view.searchengines.label             "Search Engines">
+<!ENTITY view.features.label                  "Extensions">
+<!ENTITY view.appearance2.label               "Appearance">
+<!ENTITY view.plugins.label                   "Plugins">
+<!ENTITY view.recentUpdates.label             "Recent Updates">
+<!ENTITY view.availableUpdates.label          "Available Updates">
 
-<!-- Command Bar items -->
-<!ENTITY cmd.checkUpdatesAll.label        "Find Updates">
-<!ENTITY cmd.checkUpdatesAll.accesskey    "F">
-<!ENTITY cmd.checkUpdatesAllAddon.tooltip "Finds Updates to your Add-ons">
-<!ENTITY cmd.checkUpdatesAllTheme.tooltip "Finds Updates to your Themes">
-<!ENTITY cmd.checkUpdatesAllPlugin.tooltip "Finds Updates to your Plugins">
-<!ENTITY cmd.installLocalFile.label       "Install…">
-<!ENTITY cmd.installLocalFile.accesskey   "n">
-<!ENTITY cmd.installFileAddon.tooltip     "Install an Add-on">
-<!ENTITY cmd.installFileTheme.tooltip     "Install a Theme">
-<!ENTITY cmd.installUpdatesAll2.label     "Install Updates">
-<!ENTITY cmd.installUpdatesAll2.accesskey "I">
-<!ENTITY cmd.installUpdatesAll2.tooltip   "Install the selected updates">
-<!ENTITY cmd.restartApp2.label            "Restart &brandShortName;">
-<!ENTITY cmd.restartApp2.accesskey        "R">
-<!ENTITY cmd.restartApp2.tooltip          "Restart &brandShortName; to apply changes">
-<!ENTITY cmd.skip.label                   "Skip">
-<!ENTITY cmd.skip.accesskey               "k">
-<!ENTITY cmd.skip.tooltip                 "Skip these updates">
-<!ENTITY cmd.continue.label               "Continue">
-<!ENTITY cmd.continue.accesskey           "C">
-<!ENTITY cmd.continue.tooltip             "Continue loading &brandShortName;">
+<!-- addon updates -->
+<!ENTITY updates.checkForUpdates.label        "Check for Updates">
+<!ENTITY updates.checkForUpdates.accesskey    "C">
+<!ENTITY updates.viewUpdates.label            "View Recent Updates">
+<!ENTITY updates.viewUpdates.accesskey        "V">
+<!ENTITY updates.updateAddonsAutomatically.label     "Update Add-ons Automatically">
+<!ENTITY updates.updateAddonsAutomatically.accesskey "A">
+<!ENTITY updates.resetUpdatesToAutomatic.label       "Reset All Add-ons to Update Automatically">
+<!ENTITY updates.resetUpdatesToAutomatic.accesskey   "R">
+<!ENTITY updates.resetUpdatesToManual.label          "Reset All Add-ons to Update Manually">
+<!ENTITY updates.resetUpdatesToManual.accesskey      "R">
+<!ENTITY updates.updating.label               "Updating add-ons">
+<!ENTITY updates.installed.label              "Your add-ons have been updated.">
+<!ENTITY updates.downloaded.label             "Your add-on updates have been downloaded.">
+<!ENTITY updates.restart.label                "Restart now to complete installation">
+<!ENTITY updates.noneFound.label              "No updates found">
+<!ENTITY updates.manualUpdatesFound.label     "View Available Updates">
+<!ENTITY updates.updateSelected.label         "Install Updates">
+<!ENTITY updates.updateSelected.tooltip       "Install available updates in this list">
 
-<!ENTITY cmd.enableAll.label              "Enable All">
-<!ENTITY cmd.enableAll.accesskey          "a">
-<!ENTITY cmd.enableAll.tooltip            "Enable all displayed Add-ons">
-<!ENTITY cmd.disableAll.label             "Disable All">
-<!ENTITY cmd.disableAll.accesskey         "s">
-<!ENTITY cmd.disableAll.tooltip           "Disable all displayed Add-ons">
+<!-- addon actions -->
+<!ENTITY cmd.showDetails.label                "Show More Information">
+<!ENTITY cmd.showDetails.accesskey            "S">
+<!ENTITY cmd.findUpdates.label                "Find Updates">
+<!ENTITY cmd.findUpdates.accesskey            "F">
+<!ENTITY cmd.preferencesWin.label             "Options">
+<!ENTITY cmd.preferencesWin.accesskey         "O">
+<!ENTITY cmd.preferencesUnix.label            "Preferences">
+<!ENTITY cmd.preferencesUnix.accesskey        "P">
+<!ENTITY cmd.about.label                      "About">
+<!ENTITY cmd.about.accesskey                  "A">
+
+<!ENTITY cmd.enableAddon.label                "Enable">
+<!ENTITY cmd.enableAddon.accesskey            "E">
+<!ENTITY cmd.disableAddon.label               "Disable">
+<!ENTITY cmd.disableAddon.accesskey           "D">
+<!ENTITY cmd.enableTheme.label                "Wear Theme">
+<!ENTITY cmd.enableTheme.accesskey            "W">
+<!ENTITY cmd.disableTheme.label               "Stop Wearing Theme">
+<!ENTITY cmd.disableTheme.accesskey           "W">
+<!ENTITY cmd.installAddon.label               "Install">
+<!ENTITY cmd.installAddon.accesskey           "I">
+<!ENTITY cmd.uninstallAddon.label             "Remove">
+<!ENTITY cmd.uninstallAddon.accesskey         "R">
+<!ENTITY cmd.showPreferencesWin.label         "Options">
+<!ENTITY cmd.showPreferencesWin.tooltip       "Change this add-on's options">
+<!ENTITY cmd.showPreferencesUnix.label        "Preferences">
+<!ENTITY cmd.showPreferencesUnix.tooltip      "Change this add-on's preferences">
+<!ENTITY cmd.contribute.label                 "Contribute">
+<!ENTITY cmd.contribute.accesskey             "C">
+<!ENTITY cmd.contribute.tooltip               "Contribute to the development of this add-on">
+
+<!ENTITY cmd.showReleaseNotes.label           "Show Release Notes">
+<!ENTITY cmd.showReleaseNotes.tooltip         "Show the release notes for this update">
+<!ENTITY cmd.hideReleaseNotes.label           "Hide Release Notes">
+<!ENTITY cmd.hideReleaseNotes.tooltip         "Hide the release notes for this update">
 
-<!-- Displayed in the selected Add-on's richlistitem and context menu -->
-<!ENTITY cmd.useTheme.label               "Use Theme">
-<!ENTITY cmd.useTheme.accesskey           "T">
-<!ENTITY cmd.useTheme.tooltip             "Changes &brandShortName;'s Theme">
-<!ENTITY cmd.options.label                "Options">
-<!ENTITY cmd.options.accesskey            "O">
-<!ENTITY cmd.options.tooltip              "Set Options for the selected Extension">
-<!ENTITY cmd.optionsUnix.label            "Preferences">
-<!ENTITY cmd.optionsUnix.accesskey        "P">
-<!ENTITY cmd.optionsUnix.tooltip          "Edit Preferences for the selected Extension">
-<!ENTITY cmd.enable.label                 "Enable">
-<!ENTITY cmd.enable.accesskey             "E">
-<!ENTITY cmd.enable.tooltip               "Enable this Add-on when &brandShortName; is restarted">
-<!ENTITY cmd.disable.label                "Disable">
-<!ENTITY cmd.disable.accesskey            "D">
-<!ENTITY cmd.disable.tooltip              "Disable this Add-on when &brandShortName; is restarted">
-<!ENTITY cmd.uninstall.label              "Uninstall">
-<!ENTITY cmd.uninstall2.accesskey         "U">
-<!ENTITY cmd.uninstall2.tooltip           "Uninstall this Add-on when &brandShortName; is restarted">
-<!ENTITY cmd.cancelUninstall.label        "Cancel Uninstall">
-<!ENTITY cmd.cancelUninstall.accesskey    "C">
-<!ENTITY cmd.cancelUninstall.tooltip      "Cancel the uninstall of this Add-on">
-<!ENTITY cmd.cancelInstall.label          "Cancel Install">
-<!ENTITY cmd.cancelInstall.accesskey      "C">
-<!ENTITY cmd.cancelInstall.tooltip        "Cancel the install of this Add-on">
-<!ENTITY cmd.cancelUpgrade.label          "Cancel Upgrade">
-<!ENTITY cmd.cancelUpgrade.accesskey      "C">
-<!ENTITY cmd.cancelUpgrade.tooltip        "Cancel the upgrade of this Add-on">
-<!ENTITY cmd.installUpdate.label          "Install Update">
-<!ENTITY cmd.installUpdate.accesskey      "I">
-<!ENTITY cmd.installUpdate.tooltip        "Install an update for this Add-on">
-<!ENTITY cmd.showUpdateInfo.label         "Show Information">
-<!ENTITY cmd.showUpdateInfo.accesskey     "S">
-<!ENTITY cmd.showUpdateInfo.tooltip       "Show more information about these updates">
-<!ENTITY cmd.hideUpdateInfo.label         "Hide Information">
-<!ENTITY cmd.hideUpdateInfo.accesskey     "H">
-<!ENTITY cmd.hideUpdateInfo.tooltip       "Hide information about these updates">
-<!ENTITY cmd.installSearchResult.label     "Add to &brandShortName;…">
-<!ENTITY cmd.installSearchResult.accesskey "A">
-<!ENTITY cmd.installSearchResult.tooltip   "Download and install this add-on">
-<!-- The selected add-on's cancel action button label -->
-<!ENTITY cancel.label                     "Cancel">
-<!ENTITY cancel.accesskey                 "C">
-<!ENTITY cancelInstall.label              "Cancel">
-<!ENTITY cancelInstall.accesskey          "C">
-<!ENTITY cancelUpgrade.label              "Cancel">
-<!ENTITY cancelUpgrade.accesskey          "C">
+<!-- discovery view -->
+<!-- LOCALIZATION NOTE (discover.title,discover.description,discover.footer):
+     Displayed in the center of the Get Add-ons view, see bug 601143 for mockups. -->
+<!ENTITY discover.title                       "What are Add-ons?">
+<!ENTITY discover.description2                "Add-ons are applications that let you personalise &brandShortName; with
+  extra functionality or style. Try a time-saving sidebar, a weather notifier, or a themed look to make &brandShortName;
+  your own.">
+<!ENTITY discover.footer                      "When you're connected to the internet, this pane will feature
+  some of the best and most popular add-ons for you to try out.">
+
+<!-- detail view -->
+<!ENTITY detail.version.label                 "Version">
+<!ENTITY detail.lastupdated.label             "Last Updated">
+<!ENTITY detail.creator.label                 "Developer">
+<!ENTITY detail.homepage.label                "Homepage">
+<!ENTITY detail.numberOfDownloads.label       "Downloads">
+
+<!ENTITY detail.contributions.description     "The developer of this add-on asks that you help support its continued development by making a small contribution.">
 
-<!-- Only displayed in the selected Add-on's context menu -->
-<!ENTITY cmd.homepage.label               "Visit Home Page">
-<!ENTITY cmd.homepage.accesskey           "H">
-<!ENTITY cmd.about2.label                 "About this Add-on">
-<!ENTITY cmd.about.accesskey              "A">
-<!ENTITY cmd.checkUpdate.label            "Find Update">
-<!ENTITY cmd.checkUpdate.accesskey        "F">
+<!ENTITY detail.updateType                    "Automatic Updates">
+<!ENTITY detail.updateDefault.label           "Default">
+<!ENTITY detail.updateDefault.tooltip         "Automatically install updates only if that's the default">
+<!ENTITY detail.updateAutomatic.label         "On">
+<!ENTITY detail.updateAutomatic.tooltip       "Automatically install updates">
+<!ENTITY detail.updateManual.label            "Off">
+<!ENTITY detail.updateManual.tooltip          "Don't automatically install updates">
+<!ENTITY detail.home                          "Homepage">
+<!ENTITY detail.repository                    "Add-on Profile">
+<!ENTITY detail.size                          "Size">
 
-<!ENTITY cmd.includeUpdate.label          "Include Update">
-<!ENTITY cmd.includeUpdate.accesskey      "n">
-<!ENTITY includeUpdate.label              "Include this update">
-<!ENTITY includeUpdate.accesskey          "n">
-<!ENTITY includeUpdate.tooltip            "Include this Add-on when installing the updates">
+<!ENTITY detail.checkForUpdates.label         "Check for Updates">
+<!ENTITY detail.checkForUpdates.accesskey     "F">
+<!ENTITY detail.checkForUpdates.tooltip       "Check for updates for this add-on">
+<!ENTITY detail.showPreferencesWin.label      "Options">
+<!ENTITY detail.showPreferencesWin.accesskey  "O">
+<!ENTITY detail.showPreferencesWin.tooltip    "Change this add-on's options">
+<!ENTITY detail.showPreferencesUnix.label     "Preferences">
+<!ENTITY detail.showPreferencesUnix.accesskey "P">
+<!ENTITY detail.showPreferencesUnix.tooltip   "Change this add-on's preferences">
+
+
+<!-- ratings -->
+<!ENTITY rating2.label                        "Rating">
+
+<!-- download/install progress -->
+<!ENTITY progress.pause.tooltip               "Pause">
+<!ENTITY progress.cancel.tooltip              "Cancel">
 
-<!-- Status Messsages -->
-<!ENTITY insecureUpdate.label             "Does not provide secure updates.">
-<!ENTITY needsDependencies.label          "Requires additional items.">
-<!ENTITY blocklisted.label                "Disabled for your protection.">
-<!ENTITY softBlocklisted.label            "Known to cause security or stability issues.">
-<!ENTITY outdated.label                   "A newer, safer version is available.">
-<!ENTITY toBeDisabled.label               "This add-on will be disabled when &brandShortName; is restarted.">
-<!ENTITY toBeEnabled.label                "This add-on will be enabled when &brandShortName; is restarted.">
-<!ENTITY toBeInstalled.label              "This add-on will be installed when &brandShortName; is restarted.">
-<!ENTITY toBeUninstalled.label            "This add-on will be uninstalled when &brandShortName; is restarted.">
-<!ENTITY toBeUpdated.label                "This add-on will be updated when &brandShortName; is restarted.">
 
-<!ENTITY getExtensions.label              "Get Extensions">
-<!ENTITY getThemes.label                  "Get Themes">
-<!ENTITY getPlugins.label                 "Get Plugins">
+<!-- list sorting -->
+<!ENTITY sort.name.label                      "Name">
+<!ENTITY sort.name.tooltip                    "Sort by name">
+<!ENTITY sort.dateUpdated.label               "Last Updated">
+<!ENTITY sort.dateUpdated.tooltip             "Sort by date updated">
+<!ENTITY sort.relevance.label                 "Best match">
+<!ENTITY sort.relevance.tooltip               "Sort by relevance">
+<!ENTITY sort.price.label                     "Price">
+<!ENTITY sort.price.tooltip                   "Sort by price">
+
+<!ENTITY search.filter2.label                 "Search:">
+<!ENTITY search.filter2.installed.label       "My Add-ons">
+<!ENTITY search.filter2.installed.tooltip     "Show installed add-ons">
+<!ENTITY search.filter2.available.label       "Available Add-ons">
+<!ENTITY search.filter2.available.tooltip     "Show add-ons available to install">
 
-<!ENTITY searchAddons.label               "Search All Add-ons">
-<!ENTITY browseAddons.label               "Browse All Add-ons">
-<!ENTITY searchFailed.label               "&brandShortName; couldn't retrieve add-ons">
-<!ENTITY recommendedHeader.label          "Recommended">
-<!ENTITY recommendedThrobber.label        "Retrieving recommended add-ons">
-<!ENTITY searchThrobber.label             "Searching add-ons">
-<!ENTITY resetSearch.label                "Clear Results">
-<!ENTITY noSearchResults.label            "All results are already installed or incompatible.">
-<!ENTITY noRecommendedResults.label       "All recommendations are already installed or incompatible.">
-<!ENTITY emptySearch.label                "No matching add-ons">
-<!ENTITY emptySearch.button               "OK">
-<!ENTITY cancelSearch.button              "Cancel">
-<!ENTITY searchFailed.button              "OK">
-<!ENTITY searchResultHomepage.value       "Learn More">
-<!ENTITY searchBox.label                  "Search All Add-ons">
-<!ENTITY recommendedResults.label         "See All Recommended Add-ons">
-<!ENTITY searchResultConnecting.label     "Connecting…">
-<!ENTITY searchResultInstalling.label     "Installing…">
-<!ENTITY searchResultFailed.label         "Install Failed">
-<!ENTITY searchResultInstalled.label      "Install Complete">
-<!ENTITY addonTypeExtension.label         "Extension">
-<!ENTITY addonTypeTheme.label             "Theme">
-<!ENTITY missingThumbnail.label           "No Preview">
+<!ENTITY addon.homepage                       "Homepage">
+<!ENTITY addon.details.label                  "More">
+<!ENTITY addon.details.tooltip                "Show more details about this add-on">
+<!ENTITY addon.unknownDate                    "Unknown">
+<!-- LOCALIZATION NOTE (addon.disabled.postfix): This is used in a normal list
+     to signify that an add-on is disabled, in the form
+     "<Addon name> <1.0> (disabled)" -->
+<!ENTITY addon.disabled.postfix               "(disabled)">
+<!-- LOCALIZATION NOTE (addon.update.postfix): This is used in the available
+     updates list to signify that an item is an update, in the form
+     "<Addon name> <1.1> Update". It is fine to use constructs like brackets if
+     necessary -->
+<!ENTITY addon.update.postfix                 "Update">
+<!ENTITY addon.undoAction.label               "Undo">
+<!ENTITY addon.undoAction.tooltip             "Undo this action">
+<!ENTITY addon.undoRemove.label               "Undo">
+<!ENTITY addon.undoRemove.tooltip             "Keep this add-on installed">
+<!ENTITY addon.restartNow.label               "Restart now">
+<!ENTITY addon.install.label                  "Install">
+<!ENTITY addon.install.tooltip                "Install this add-on">
+<!ENTITY addon.updateNow.label                "Update Now">
+<!ENTITY addon.updateNow.tooltip              "Install the update for this add-on">
+<!ENTITY addon.includeUpdate.label            "Include in Update">
+<!ENTITY addon.updateAvailable.label          "An update is available">
+<!ENTITY addon.checkingForUpdates.label       "Checking for updates…">
+<!ENTITY addon.releaseNotes.label             "Release Notes:">
+<!ENTITY addon.loadingReleaseNotes.label      "Loading…">
+<!ENTITY addon.errorLoadingReleaseNotes.label "Sorry, but there was an error loading the release notes.">
 
-<!ENTITY previewNoThemeSelected.label     "No Theme Selected">
-<!ENTITY previewNoPreviewImage.label      "This Theme does not have a Preview Image">
-<!ENTITY moreInfo.label                   "More Information">
-<!ENTITY infoNoAddonSelected.label        "No Update Selected">
-<!ENTITY infoNoUpdateInfo.label           "This update does not have any additional information">
-<!ENTITY infoUpdateInfoError.label        "There was an error loading the information about this update">
-
-<!ENTITY updateSuccess.label              "Update completed successfully.">
-<!ENTITY installSuccess.label             "Install completed successfully.">
-<!ENTITY installSuccessRestart.label      "Restart to complete the installation.">
-<!ENTITY updateSuccessRestart.label       "Restart to complete the update.">
-<!ENTITY installWaiting.label             "Waiting…">
-<!ENTITY installIncompatibleUpdate.label  "Checking compatibility…">
-<!ENTITY installFinishing.label           "Installing…">
-<!ENTITY installFailure.label             "Install failed.">
-
-<!ENTITY progressStatus.label             "Checking For Updates">
-
-<!ENTITY eula.title                       "End-User Licence Agreement">
-<!ENTITY eula.width                       "560px">
-<!ENTITY eula.height                      "400px">
-<!ENTITY eula.accept                      "Accept and Install…">
-
-<!ENTITY blocklist.blocked.label          "Blocked">
-<!ENTITY blocklist.checkbox.label         "Disable">
+<!ENTITY addon.createdBy.label                "By ">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -1,116 +1,103 @@
+#LOCALIZATION NOTE (aboutWindowTitle) %S is the addon name
 aboutWindowTitle=About %S
 aboutWindowCloseButton=Close
+#LOCALIZATION NOTE (aboutWindowVersionString) %S is the addon version
 aboutWindowVersionString=version %S
+#LOCALIZATION NOTE (aboutAddon) %S is the addon name
 aboutAddon=About %S
-updatingMsg=Looking for updates…
-updateCompatibilityMsg=A compatibility update has been applied.
-updateNoUpdateMsg=No updates were found.
-updateErrorMessage=An error occurred while trying to find updates for %S.
-updateDisabledMessage=Updates are disabled for %S.
-updateReadOnlyMessage=Update not supported (install location is read only).
-updateNotManagedMessage=Update not supported (install location is not managed by %S).
-incompatibleUpdateMessage=%S is checking for a compatibility update to %S.
-installSuccess=Install completed successfully
-installWaiting=Waiting…
-droppedInWarning=The following items were found in your Extensions folder. Do you want to install them?
-updateNotificationTitle=Add-on updates found
-updateNotificationText=%S has found an update for 1 of your add-ons
-multipleUpdateNotificationText=%S has found updates for %S of your add-ons
-# LOCALIZATION NOTE (lightweightThemeDescription): %S is the theme designer, either a person or organisation
-lightweightThemeDescription=Created by %S.
+
+#LOCALIZATION NOTE (uninstallNotice) %S is the add-on name
+uninstallNotice=%S has been removed.
+
+#LOCALIZATION NOTE (numReviews) #1 is the number of reviews
+numReviews=#1 review;#1 reviews
+
+#LOCALIZATION NOTE (dateUpdated) %S is the date the addon was last updated
+dateUpdated=Updated %S
 
-uninstallButton=Uninstall
-disableButton=Disable
-cancelButton=Cancel
-restartMessage=Restart %S to complete your changes.
-restartButton=Restart %S
-restartAccessKey=R
-laterButton=Later
-moreInfoText=More information
-uninstallTitle=Uninstall %S
-uninstallWarnDependMsg=%S is required by one or more add-ons. If you continue, the following items will be disabled:
-uninstallQueryMessage=Do you want to uninstall %S?
-cancelInstallTitle=Cancel Install of %S
-cancelInstallQueryMessage=Are you sure you want to cancel the install of %S?
-cancelInstallButton=Yes
-cancelCancelInstallButton=No
-cancelUpgradeTitle=Cancel Upgrade of %S
-cancelUpgradeQueryMessage=Are you sure you want to cancel the upgrade of %S?
-cancelUpgradeButton=Yes
-cancelCancelUpgradeButton=No
-disableTitle=Disable %S
-disableWarningDependMessage=If you disable %S, the following items that require this extension will also be disabled:
-disableQueryMessage=Do you want to disable %S?
+#LOCALIZATION NOTE (notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
+notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (notification.blocked) %1$S is the add-on name
+notification.blocked=%1$S has been disabled due to security or stability issues.
+notification.blocked.link=More Information
+#LOCALIZATION NOTE (notification.softblocked) %1$S is the add-on name
+notification.softblocked=%1$S is known to cause security or stability issues.
+notification.softblocked.link=More Information
+#LOCALIZATION NOTE (notification.outdated) %1$S is the add-on name
+notification.outdated=An important update is available for %1$S.
+notification.outdated.link=Update Now
+#LOCALIZATION NOTE (notification.enable) %1$S is the add-on name, %2$S is brand name
+notification.enable=%1$S will be enabled after you restart %2$S.
+#LOCALIZATION NOTE (notification.disable) %1$S is the add-on name, %2$S is brand name
+notification.disable=%1$S will be disabled after you restart %2$S.
+#LOCALIZATION NOTE (notification.install) %1$S is the add-on name, %2$S is brand name
+notification.install=%1$S will be installed after you restart %2$S.
+#LOCALIZATION NOTE (notification.uninstall) %1$S is the add-on name, %2$S is brand name
+notification.uninstall=%1$S will be uninstalled after you restart %2$S.
+#LOCALIZATION NOTE (notification.upgrade) %1$S is the add-on name, %2$S is brand name
+notification.upgrade=%1$S will be updated after you restart %2$S.
+#LOCALIZATION NOTE (notification.downloadError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.downloadError=There was an error downloading %1$S.
+notification.downloadError.retry=Try again
+notification.downloadError.retry.tooltip=Try downloading this add-on again
+#LOCALIZATION NOTE (notification.installError) %1$S is the add-on name. Not yet implemented - see https://bug593535.bugzilla.mozilla.org/attachment.cgi?id=475403
+notification.installError=There was an error installing %1$S.
+notification.installError.retry=Try again
+notification.installError.retry.tooltip=Try downloading and installing this add-on again
 
-themesTitle=Themes
-extensionsTitle=Extensions
-
-type-32=Multiple Extension Package
-type-16=Plugin
-type-8=Language
-type-4=Theme
-type-2=Extension
-incompatibleTitle=Incompatible %S
-incompatibleMessage=%S %S could not be installed because it is not compatible with %S %S.
-incompatibleThemeName=this Theme
-incompatibleExtension=Disabled - not compatible with %S %S
-incompatibleAddonMsg=Not compatible with %S %S
-insecureUpdateMessage="%S" will not be installed because it does not provide secure updates
+#LOCALIZATION NOTE (contributionAmount) %S is the currency amount recommended for contributions
+contributionAmount=Suggested Donation: %S
 
-invalidGUIDMessage="%S" could not be installed because of an error in its Install Manifest ("%S" is not a valid GUID). Please contact the author of this item about the problem.
-invalidVersionMessage="%S" could not be installed because of an error in its Install Manifest ("%S" is not a valid Version String). Please contact the author of this item about the problem.
-incompatiblePlatformMessage="%S" could not be installed because it is not compatible with your %S build type (%S). Please contact the author of this item about the problem.
-
-blocklistedInstallTitle2=This add-on is dangerous to use
-blocklistedInstallMsg2=The add-on %S has a high risk of causing stability or security problems and can't be installed.
-softBlockedInstallTitle=This add-on may be dangerous to use
-softBlockedInstallMsg=The add-on %S may cause stability or security problems. It is highly recommended that you do not install it.
-softBlockedInstallAcceptLabel=Install Anyway
-softBlockedInstallAcceptKey=I
-
-missingFileTitle=Missing File
-missingFileMessage=%S could not load this item because the file %S was missing.
-
-malformedMessage=%S could not install this item because "%S" (provided by the item) is not well-formed or does not exist. Please contact the author about this problem.
-malformedTitle=Malformed File
-
-invalidFileExtTitle=Invalid File Extension
-invalidFileExtMessage="%S" could not be installed because this item has an invalid file extension (%S is not a valid file extension for a %S). Please contact the author about this problem.
-missingPackageFilesTitle=Missing Installation Files
-missingPackageFilesMessage="%S" could not be installed because it does not contain a valid package (a %S must contain at least one extension or theme). Please contact the author about this problem.
-
-errorInstallTitle=Error
-errorInstallMsg=%S could not install the file at \n\n%S\n\nbecause: %S
+installDownloading=Downloading
+installDownloaded=Downloaded
+installDownloadFailed=Error downloading
+installVerifying=Verifying
+installInstalling=Installing
+installEnablePending=Restart to enable
+installDisablePending=Restart to disable
+installFailed=Error installing
+installCancelled=Install cancelled
 
-extensionFilter=Extensions (*.xpi)
-themesFilter=Themes (*.jar)
-installThemePickerTitle=Select a theme to install
-installExtensionPickerTitle=Select an extension to install
-
-dssSwitchAfterRestart=Restart %S to use.
-
-finishedUpdateCheck=Finished checking for updates to %S
-updateAvailableMsg=Version %S is available.
+#LOCALIZATION NOTE (details.notification.incompatible) %1$S is the add-on name, %2$S is brand name, %3$S is application version
+details.notification.incompatible=%1$S is incompatible with %2$S %3$S.
+#LOCALIZATION NOTE (details.notification.blocked) %1$S is the add-on name
+details.notification.blocked=%1$S has been disabled due to security or stability issues.
+details.notification.blocked.link=More Information
+#LOCALIZATION NOTE (details.notification.softblocked) %1$S is the add-on name
+details.notification.softblocked=%1$S is known to cause security or stability issues.
+details.notification.softblocked.link=More Information
+#LOCALIZATION NOTE (details.notification.outdated) %1$S is the add-on name
+details.notification.outdated=An important update is available for %1$S.
+details.notification.outdated.link=Update Now
+#LOCALIZATION NOTE (details.notification.enable) %1$S is the add-on name, %2$S is brand name
+details.notification.enable=%1$S will be enabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.disable) %1$S is the add-on name, %2$S is brand name
+details.notification.disable=%1$S will be disabled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.install) %1$S is the add-on name, %2$S is brand name
+details.notification.install=%1$S will be installed after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.uninstall) %1$S is the add-on name, %2$S is brand name
+details.notification.uninstall=%1$S will be uninstalled after you restart %2$S.
+#LOCALIZATION NOTE (details.notification.upgrade) %1$S is the add-on name, %2$S is brand name
+details.notification.upgrade=%1$S will be updated after you restart %2$S.
 
-xpinstallDisabledMsgLocked=Software installation has been disabled by your system administrator.
-xpinstallDisabledMsg=Software installation is currently disabled. Click Enable and try again.
-# LOCALIZATION NOTE: Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-newAddonsNotificationMsg2=%S new add-on has been installed.;%S new add-ons have been installed.
-safeModeMsg=All add-ons have been disabled by safe mode.
-disabledCompatMsg=Add-on compatibility checking is disabled. You may have incompatible add-ons.
-disabledUpdateSecurityMsg=Add-on update security checking is disabled. You may be compromised by updates.
-noUpdatesMsg=No updates were found.
-offlineUpdateMsg2=%S is currently in offline mode and is unable to update add-ons. Click Go Online and try again.
-offlineSearchMsg=%S is currently in offline mode and is unable to search for add-ons. Click Go Online and try again.
-enableButtonLabel=Enable
-enableButtonAccesskey=n
-goOnlineButtonLabel=Go Online
-goOnlineButtonAccesskey=G
+installFromFile.dialogTitle=Select add-on to install
+installFromFile.filterName=Add-ons
+
+uninstallAddonTooltip=Uninstall this add-on
+uninstallAddonRestartRequiredTooltip=Uninstall this add-on (restart required)
+enableAddonTooltip=Enable this add-on
+enableAddonRestartRequiredTooltip=Enable this add-on (restart required)
+disableAddonTooltip=Disable this add-on
+disableAddonRestartRequiredTooltip=Disable this add-on (restart required)
 
-newUpdateWindowTitle=%S Add-on Updates
-newUpdatesAvailableMsg=There are new updates available for your add-ons.
+#LOCALIZATION NOTE (showAllSearchResults) #1 is the total number of search results
+showAllSearchResults=See one result;See all #1 results
 
-searchResults=See all results (%S)
-
-eulaHeader=%S requires that you accept the following End User Licence Agreement before installation can proceed:
+#LOCALIZATION NOTE (addon.purchase.label) displayed on a button in the list
+# view, %S is the price of the add-on including currency symbol
+addon.purchase.label=Purchase for %S…
+addon.purchase.tooltip=Visit the add-ons gallery to purchase this add-on
+#LOCALIZATION NOTE (cmd.purchaseAddon.label) displayed on a button in the detail
+# view, %S is the price of the add-on including currency symbol
+cmd.purchaseAddon.label=Purchase for %S…
+cmd.purchaseAddon.accesskey=u
--- a/toolkit/chrome/mozapps/extensions/update.dtd
+++ b/toolkit/chrome/mozapps/extensions/update.dtd
@@ -1,63 +1,61 @@
-<!ENTITY  updateWizard.title              "&brandShortName; Update">
-
-<!ENTITY  offline.title                   "&brandShortName; is working offline">
-<!ENTITY  offline.description             "&brandShortName; needs to go online in order to see if updates
-                                           are available for your add-ons to make them compatible with this
-                                           version.">
-<!ENTITY  offline.toggleOffline.label     "Go online now.">
-<!ENTITY  offline.toggleOffline.accesskey "G">
-
-<!ENTITY  mismatch.win.title              "Incompatible Add-ons">
-<!ENTITY  mismatch.top.label              "The following add-ons are not compatible with this version of
-                                           &brandShortName; and have been disabled:">
-<!ENTITY  mismatch.bottom.label           "&brandShortName; can check if there are compatible versions
-                                           of these add-ons available.">
-
-<!ENTITY  checking.wizard.title           "Checking for Compatible Add-ons">
-<!ENTITY  checking.top.label              "Checking your incompatible add-ons for updates…">
-<!ENTITY  checking.status                 "This may take a few minutes…">
-
-<!ENTITY  found.wizard.title               "Found Compatible Add-ons">
-<!ENTITY  found.top.label                 "Select the add-ons you would like to install:">
-<!ENTITY  found.disabledXPinstall.label   "These updates can't be installed because software installation is currently
-                                           disabled. You can change this setting below.">
-<!ENTITY  found.enableXPInstall.label     "Allow web sites to install software">
-<!ENTITY  found.enableXPInstall.accesskey "A">
-
-<!ENTITY  installing.wizard.title         "Installing Compatible Add-ons">
-<!ENTITY  installing.top.label            "Downloading and installing updates to your add-ons…">
-
-<!ENTITY  noupdates.wizard.title          "No Compatible Add-ons Found">
-<!ENTITY  noupdates.intro.desc            "&brandShortName; was unable to find updates to your
-                                           incompatible add-ons.">
-<!ENTITY  noupdates.error.desc            "Some problems were encountered when trying to find updates.">
-<!ENTITY  noupdates.checkEnabled.desc     "&brandShortName; will check periodically and inform you
-                                           when compatible updates for these add-ons are found.">
-
-<!ENTITY  finished.wizard.title           "Compatible Add-ons Installed">
-<!ENTITY  finished.top.label              "&brandShortName; has installed the updates to your add-ons.">
-<!ENTITY  finished.checkDisabled.desc     "&brandShortName; can check periodically and inform you
-                                           when updates for add-ons are found.">
-<!ENTITY  finished.checkEnabled.desc      "&brandShortName; will check periodically and inform you
-                                           when updates for add-ons are found.">
-
-<!ENTITY  adminDisabled.wizard.title      "Unable to Check for Updates">
-<!ENTITY  adminDisabled.warning.label     "It is not possible to check for updates to incompatible add-ons
-                                           because software installation for &brandShortName; has been disabled.
-                                           Please contact your System Administrator for assistance.">
-
-<!ENTITY  versioninfo.wizard.title        "Checking Compatibility of Add-ons">
-<!ENTITY  versioninfo.top.label           "Checking your add-ons for compatibility with this
-                                           version of &brandShortName;.">
-<!ENTITY  versioninfo.waiting             "This may take a few minutes…">
-
-<!ENTITY  installerrors.wizard.title      "Problems Installing Updates">
-<!ENTITY  installerrors.intro.label       "&brandShortName; encountered problems when updating
-                                           some of your add-ons.">
-
-<!-- general strings used by several of the finish pages -->
-<!ENTITY  clickFinish.label               "Click Finish to continue starting &brandShortName;.">
-<!ENTITY  clickFinish.labelMac            "Click Done to continue starting &brandShortName;.">
-<!ENTITY  enableChecking.label            "Allow &brandShortName; to check for updates.">
-<!ENTITY  details.label                   "Details…">
-<!ENTITY  details.accesskey               "D">
+<!ENTITY  updateWizard.title              "&brandShortName; Update">
+
+<!ENTITY  offline.title                   "&brandShortName; is working offline">
+<!ENTITY  offline.description             "&brandShortName; needs to go online in order to see if updates
+                                           are available for your add-ons to make them compatible with this
+                                           version.">
+<!ENTITY  offline.toggleOffline.label     "Go online now.">
+<!ENTITY  offline.toggleOffline.accesskey "G">
+
+<!ENTITY  mismatch.win.title              "Incompatible Add-ons">
+<!ENTITY  mismatch.top.label              "The following add-ons are not compatible with this version of
+                                           &brandShortName; and have been disabled:">
+<!ENTITY  mismatch.bottom.label           "&brandShortName; can check if there are compatible versions
+                                           of these add-ons available.">
+
+<!ENTITY  checking.wizard.title           "Checking for Compatible Add-ons">
+<!ENTITY  checking.top.label              "Checking your incompatible add-ons for updates…">
+<!ENTITY  checking.status                 "This may take a few minutes…">
+
+<!ENTITY  found.wizard.title               "Found Compatible Add-ons">
+<!ENTITY  found.top.label                 "Select the add-ons you would like to install:">
+<!ENTITY  found.disabledXPinstall.label   "These updates can't be installed because software installation is currently
+                                           disabled. You can change this setting below.">
+<!ENTITY  found.enableXPInstall.label     "Allow web sites to install software">
+<!ENTITY  found.enableXPInstall.accesskey "A">
+
+<!ENTITY  installing.wizard.title         "Installing Compatible Add-ons">
+<!ENTITY  installing.top.label            "Downloading and installing updates to your add-ons…">
+
+<!ENTITY  noupdates.wizard.title          "No Compatible Add-ons Found">
+<!ENTITY  noupdates.intro.desc            "&brandShortName; was unable to find updates to your
+                                           incompatible add-ons.">
+<!ENTITY  noupdates.error.desc            "Some problems were encountered when trying to find updates.">
+<!ENTITY  noupdates.checkEnabled.desc     "&brandShortName; will check periodically and inform you
+                                           when compatible updates for these add-ons are found.">
+
+<!ENTITY  finished.wizard.title           "Compatible Add-ons Installed">
+<!ENTITY  finished.top.label              "&brandShortName; has installed the updates to your add-ons.">
+<!ENTITY  finished.checkDisabled.desc     "&brandShortName; can check periodically and inform you
+                                           when updates for add-ons are found.">
+<!ENTITY  finished.checkEnabled.desc      "&brandShortName; will check periodically and inform you
+                                           when updates for add-ons are found.">
+
+<!ENTITY  adminDisabled.wizard.title      "Unable to Check for Updates">
+<!ENTITY  adminDisabled.warning.label     "It is not possible to check for updates to incompatible add-ons
+                                           because software installation for &brandShortName; has been disabled.
+                                           Please contact your System Administrator for assistance.">
+
+<!ENTITY  versioninfo.wizard.title        "Checking Compatibility of Add-ons">
+<!ENTITY  versioninfo.top.label           "Checking your add-ons for compatibility with this
+                                           version of &brandShortName;.">
+<!ENTITY  versioninfo.waiting             "This may take a few minutes…">
+
+<!ENTITY  installerrors.wizard.title      "Problems Installing Updates">
+<!ENTITY  installerrors.intro.label       "&brandShortName; encountered problems when updating
+                                           some of your add-ons.">
+
+<!-- general strings used by several of the finish pages -->
+<!ENTITY  clickFinish.label               "Click Finish to continue starting &brandShortName;.">
+<!ENTITY  clickFinish.labelMac            "Click Done to continue starting &brandShortName;.">
+<!ENTITY  enableChecking.label            "Allow &brandShortName; to check for updates.">
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -30,8 +30,10 @@ deleteFiles=Delete Files
 dontDeleteFiles=Don't Delete Files
 
 profileCreationFailed=Profile couldn't be created. Probably the chosen folder isn't writable.
 profileCreationFailedTitle=Profile Creation failed
 profileExists=A profile with this name already exists. Please choose another name.
 profileExistsTitle=Profile Exists
 profileFinishText=Click Finish to create this new profile.
 profileFinishTextMac=Click Done to create this new profile.
+profileMissing=Your %S profile cannot be loaded. It may be missing or inaccessible.
+profileMissingTitle=Profile Missing
deleted file mode 100644
--- a/toolkit/chrome/mozapps/update/incompatible.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<!ENTITY  incompatible.title        "Incompatible Items">
-<!ENTITY  incompatible.intro        "The following items are not compatible with this update to &brandShortName; and
-                                     will be disabled when it is installed:">
-<!ENTITY  incompatible.update       "&brandShortName; will periodically check for updates to them in the event that 
-                                     a compatible version becomes available.">
-<!ENTITY  incompatible.suffix       "&brandShortName; updates contain important security improvements. For your
-                                     protection, it is highly recommended that you update &brandShortName; even 
-                                     if some of your Extensions and Themes become incompatible.">
-                                     
-<!ENTITY  closebutton.label         "Close">
-                                     
-                                     
\ No newline at end of file
--- a/toolkit/chrome/mozapps/update/updates.dtd
+++ b/toolkit/chrome/mozapps/update/updates.dtd
@@ -1,13 +1,10 @@
 <!ENTITY  updateWizard.title              "Software Update">
 
-<!ENTITY  window.width                    "36em">
-<!ENTITY  window.macWidth                 "39em">
-
 <!ENTITY  checking.title                  "Checking for Updates">
 <!ENTITY  updateCheck.label               "Looking for newer versions of &brandShortName;…">
 
 <!ENTITY  pluginupdatesfound.title        "Found Updates for Plugins">
 <!ENTITY  pluginupdatesfound.label        "Newer versions of one or more of your plugins were found.">
 <!ENTITY  pluginupdateslink.label         "See how to upgrade your plugins.">
 
 <!ENTITY  noupdatesfound.title            "No Updates Found">
@@ -16,16 +13,18 @@
 <!ENTITY  noupdatesautodisabled.intro     "There are no updates available. Please check again later or enable
                                            &brandShortName;'s automatic update checking.">
 
 <!ENTITY  manualUpdate.title              "Unable to Update">
 <!ENTITY  manualUpdate.desc               "A recommended security and stability update is available, but you do
                                            not have the system permissions required to install it. Please contact your
                                            system administrator, or try again from an account that has permission to
                                            install software on this computer.">
+<!ENTITY  manualUpdate.space.desc         "A recommended security and stability update is available, but you do
+                                           not have enough space to install it.">
 <!ENTITY  manualUpdateGetMsg.label        "You can always get the latest version of &brandShortName; at:">
 
 <!ENTITY  incompatibleCheck.title         "Checking Add-on Compatibility">
 <!ENTITY  incompatibleCheck.label         "Looking for newer versions of your add-ons…">
 
 <!ENTITY  clickHere.label                 "View more information about this update">
 
 <!ENTITY  evangelism.desc                 "It is strongly recommended that you apply this 
@@ -39,37 +38,45 @@
 <!ENTITY  license.instructionText         "Please read the following licence agreement. Use the scroll bar to view the rest of this agreement.">
 <!ENTITY  license.accept                  "I accept the terms of the Licence Agreement">
 <!ENTITY  license.accept.accesskey        "c">
 <!ENTITY  license.decline                 "I do NOT accept the terms of the Licence Agreement">
 <!ENTITY  license.decline.accesskey       "T">
 
 <!ENTITY  incompatibleList.title          "Incompatible Add-ons Found">
 
-<!ENTITY  downloading.title               "Downloading Update">
+<!ENTITY  downloadPage.title              "Downloading &brandShortName;">
 <!ENTITY  downloading.intro               "Downloading the update…">
 <!ENTITY  connecting.label                "Connecting to the update server…">
 <!ENTITY  verificationFailedText.label    "&brandShortName; was unable to verify the integrity of the 
                                            incremental update it downloaded, so it is now downloading
                                            the complete update package.">
 
 <!ENTITY  viewDetails.tooltip             "View details for this update">
 
 <!ENTITY  details.link                    "Details">
 
+<!ENTITY  error.title                     "Update Failed">
+
 <!ENTITY  error.label                     "There were problems checking for, downloading, or installing this 
                                            update. &brandShortName; could not be updated because:">
                                            
 <!ENTITY  errorManual.label               "You can update &brandShortName; manually by visiting this link
                                            and downloading the latest version:">
                                            
-<!ENTITY  errorpatching.title             "Update Failed">
 <!ENTITY  errorpatching.intro             "The partial Update could not be applied. 
                                            &brandShortName; will try again by downloading a complete Update.">
 
+<!ENTITY  genericBackgroundError.label    "&brandShortName; is unable to determine if there is an update available. Please
+                                           make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY  errorCertAttrNoUpdate2.label    "Something is preventing &brandShortName; from updating securely.
+                                           Please make sure that you have the latest version of &brandShortName; from:">
+<!ENTITY  errorCertAttrHasUpdate.label    "Something is trying to trick &brandShortName; into accepting an
+                                           insecure update. Please contact your network provider and seek help.">
+
 <!ENTITY  finishedPage.title              "Update Ready to Install">
 <!ENTITY  finishedPage.text               "The update will be installed the next time &brandShortName; starts. You 
                                            can restart &brandShortName; now, or continue working and restart later.">
 
 <!ENTITY  finishedBackgroundPage.text     "A security and stability update for &brandShortName; has been
                                            downloaded and is ready to be installed.">
 <!ENTITY  finishedBackground.name         "Update:">
 <!-- LOCALIZATION NOTE (finishedBackground.more): This string describes the button labels defined by restartNowButton and restartLaterButton in updates.properties. -->
--- a/toolkit/chrome/mozapps/update/updates.properties
+++ b/toolkit/chrome/mozapps/update/updates.properties
@@ -4,30 +4,39 @@
 updateFullName=%S (%S)
 
 # LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
 # where update version from the update xml
 # example: MyApplication 10.0.5
 updateName=%S %S
 licenseContentDownloading=Getting licence for %S %S…
 updateMoreInfoContentDownloading=Getting more details about %S %S…
-intro_major_app_and_version=Do you want to upgrade to %S %S now?
 
-# LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
-# and the 3rd %S is brandShortName. where update version from the update xml
-incompatibleAddons_major=Some of your add-ons won't work with %S %S, and will be disabled. As soon as they are made compatible, %S will update and re-enable these add-ons:
+# LOCALIZATION NOTE: When present
+# %1$S is the brandShortName. Ex: MyApplication
+# %2$S is the update version - provided by the update xml. Ex: version 10.0.5
+# %3$S is the build identifier - provided by the update xml. Ex: 20081022033543
+updateNightlyName=%1$S %2$S %3$S nightly
+incompatAddons_major=Some of your add-ons won't work with %1$S %2$S, and will be disabled. As soon as they are made compatible, %1$S will update and re-enable these add-ons:
+incompatAddons_minor=Some of your add-ons won't work with this update, and will be disabled. As soon as they are made compatible, %1$S will update and re-enable these add-ons:
+intro_major=Do you want to upgrade to %1$S %2$S now?
+intro_minor=A security and stability update for %1$S is available:
+
+# LOCALIZATION NOTE:
+# %1$S is the add-on name
+# Example: My Addon
+# %2$S is the add-on version.
+# Example: 2.1.5
+addonLabel=%1$S %2$S
 
 updateType_major=New Version
 updateType_minor=Security Update
 
 # LOCALIZATION NOTE: When present %S is brandShortName
-incompatibleAddons_minor=Some of your add-ons won't work with this update, and must be disabled. As soon as they are made compatible, %S will update and re-enable these add-ons:
-intro_minor_app=A security and stability update for %S is available:
 verificationError=%S could not confirm the integrity of the update package.
-errorsPageHeader=Update Failed
 licenseContentNotFound=The licence file for this version could not be found. Please visit the %S homepage for more information.
 updateMoreInfoContentNotFound=Additional details about this version could not be found. Please visit the %S homepage for more information.
 resumePausedAfterCloseTitle=Software Update
 resumePausedAfterCloseMsg=You have paused downloading this update. Do you want to download the update in the background while you continue to use %S?
 updaterIOErrorTitle=Software Update Failed
 updaterIOErrorMsg=The update could not be installed. Please make sure there are no other copies of %S running on your computer, and then restart %S to try again.
 okButton=OK
 okButton.accesskey=O
@@ -62,30 +71,28 @@ updatesfound_minor.title=Update Availabl
 updatesfound_major.title=New Version Available
 
 installSuccess=The Update was successfully installed
 installPending=Install Pending
 patchApplyFailure=The Update could not be installed (patch apply failed)
 
 # LOCALIZATION NOTE: When present %S is the update name provided by the remote
 # update xml for the following
-downloadingPrefix=Downloading %S…
-pausedName=Paused downloading %S
 updateAvailable_minor.title=%S available
 updateAvailable_minor.text=Download & Install…
 updateAvailable_major.title=%S available
 updateAvailable_major.text=Get the new version…
 updateDownloaded_minor.title=%S available
 updateDownloaded_minor.text=Apply Downloaded Update…
 updateDownloaded_major.title=%S available
 updateDownloaded_major.text=Install the new version…
 
 # LOCALIZATION NOTE: %S is the amount downloaded so far
-# example: Downloaded 879 KB of 2.1 MB
-pausedStatus=Downloaded %S
+# example: Paused —  879 KB of 2.1 MB
+downloadPausedStatus=Paused —  %S
 
 check_error-200=Update XML file malformed (200)
 check_error-403=Access denied (403)
 check_error-404=Update XML file not found (404)
 check_error-500=Internal server error (500)
 check_error-2152398849=Failed (unknown reason)
 check_error-2152398861=Connection refused
 check_error-2152398862=Connection timed out
--- a/toolkit/chrome/passwordmgr/passwordManager.dtd
+++ b/toolkit/chrome/passwordmgr/passwordManager.dtd
@@ -54,8 +54,11 @@
 <!ENTITY      removeall.accesskey             "A">
 
 <!ENTITY      filter.label                    "Search:">
 <!ENTITY      filter.accesskey                "S">
 
 <!ENTITY      windowClose.key                 "w">
 <!ENTITY      focusSearch1.key                "f">
 <!ENTITY      focusSearch2.key                "k">
+
+<!ENTITY      copyPasswordCmd.label           "Copy Password">
+<!ENTITY      copyPasswordCmd.accesskey       "C">
--- a/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -34,35 +34,39 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 rememberValue = Use Password Manager to remember this value.
 rememberPassword = Use Password Manager to remember this password.
 savePasswordTitle = Confirm
-# 1st string is product name, 2nd is the username for the login, 3rd is the
-#   login's hostname. Note that long usernames may be truncated.
-saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S?
-# 1st string is product name, 2nd is the login's hostname
-saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
+# LOCALIZATION NOTE (rememberPasswordText):
+# 1st string is the username for the login, 2nd is the login's hostname. 
+# Note that long usernames may be truncated.
+rememberPasswordText = Remember password for "%1$S" on %2$S?
+# LOCALIZATION NOTE (rememberPasswordTextNoUsername):
+# String is the login's hostname.
+rememberPasswordTextNoUsername = Remember password on %S?
 notNowButtonText = &Not Now
 notifyBarNotNowButtonText = Not Now
 notifyBarNotNowButtonAccessKey = N
 neverForSiteButtonText = Ne&ver for This Site
-notifyBarNeverForSiteButtonText = Never for This Site
-notifyBarNeverForSiteButtonAccessKey = e
+notifyBarNeverRememberButtonText = Never Remember Password for This Site
+notifyBarNeverRememberButtonAccessKey = e
 rememberButtonText = &Remember
-notifyBarRememberButtonText = Remember
-notifyBarRememberButtonAccessKey = R
+notifyBarRememberPasswordButtonText = Remember Password
+notifyBarRememberPasswordButtonAccessKey = R
 passwordChangeTitle = Confirm Password Change
-passwordChangeText = Would you like to change the stored password for %S?
-passwordChangeTextNoUser = Would you like to change the stored password for this login?
-notifyBarChangeButtonText = Change
-notifyBarChangeButtonAccessKey = C
+# LOCALIZATION NOTE (updatePasswordText):
+# String is the username for the login.
+updatePasswordText = Update saved password for "%S"?
+updatePasswordTextNoUser = Update saved password?
+notifyBarUpdateButtonText = Update Password
+notifyBarUpdateButtonAccessKey = U
 notifyBarDontChangeButtonText = Don't Change
 notifyBarDontChangeButtonAccessKey = D
 userSelectText = Please confirm which user you are changing the password for
 hidePasswords=Hide Passwords
 hidePasswordsAccessKey=P
 showPasswords=Show Passwords
 showPasswordsAccessKey=P
 noMasterPasswordPrompt=Are you sure you wish to show your passwords?