Bug 1412651 - Update en-GB for Gecko 57 - Toolkit part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 01 Nov 2017 06:13:54 +0000
changeset 736 c256cb77525cdc98f7bf58c5edf31faee8efe829
parent 733 0b2996f2530fd275937b769fc6c766ca430bb86e
child 737 18e839c988496073bd68d7f18b943ce277e0d98c
push id135
push userfrancesco.lodolo@mozillaitalia.org
push dateWed, 01 Nov 2017 07:12:07 +0000
reviewersme
bugs1412651
Bug 1412651 - Update en-GB for Gecko 57 - Toolkit part r=me
devtools/shared/styleinspector.properties
dom/chrome/accessibility/mac/accessible.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/css.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/security/security.properties
security/manager/chrome/pipnss/pipnss.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/deviceManager.dtd
security/manager/chrome/pippki/pippki.properties
toolkit/chrome/global/aboutNetworking.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
toolkit/chrome/global/aboutUrlClassifier.dtd
toolkit/chrome/global/aboutWebrtc.properties
toolkit/chrome/global/extensions.properties
toolkit/chrome/global/headsUpDisplay.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/extensions/update.properties
toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
toolkit/chrome/mozapps/update/history.dtd
toolkit/chrome/passwordmgr/passwordmgr.properties
--- a/devtools/shared/styleinspector.properties
+++ b/devtools/shared/styleinspector.properties
@@ -44,34 +44,46 @@ rule.keyframe=Keyframes %S
 # These styles will not be editable, and will only be visible if the
 # devtools.inspector.showUserAgentStyles pref is true.
 rule.userAgentStyles=(user agent)
 
 # LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
 # pseudo element header
 rule.pseudoElement=Pseudo-elements
 
-# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
-# pseudo element header
+# LOCALIZATION NOTE (rule.selectedElement): Shown for CSS rules element header if
+# pseudo elements are present in the rule view.
 rule.selectedElement=This Element
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
 # the title attribute of the warning icon.
 rule.warning.title=Invalid property value
 
 # LOCALIZATION NOTE (rule.filterProperty.title): Text displayed in the tooltip
 # of the search button that is shown next to a property that has been overridden
 # in the rule view.
 rule.filterProperty.title=Filter rules containing this property
 
 # LOCALIZATION NOTE (ruleView.empty): Text displayed when the highlighter is
 # first opened and there's no node selected in the rule view.
 rule.empty=No element selected.
 
+# LOCALIZATION NOTE (rule.variableValue): Text displayed in a tooltip
+# when the mouse is over a variable use (like "var(--something)") in
+# the rule view.  The first argument is the variable name and the
+# second argument is the value.
+rule.variableValue=%S = %S
+
+# LOCALIZATION NOTE (rule.variableUnset): Text displayed in a tooltip
+# when the mouse is over a variable use (like "var(--something)"),
+# where the variable is not set.  the rule view.  The argument is the
+# variable name.
+rule.variableUnset=%S is not set
+
 # LOCALIZATION NOTE (ruleView.selectorHighlighter.tooltip): Text displayed in a
 # tooltip when the mouse is over a selector highlighter icon in the rule view.
 rule.selectorHighlighter.tooltip=Highlight all elements matching this selector
 
 # LOCALIZATION NOTE (rule.colorSwatch.tooltip): Text displayed in a tooltip
 # when the mouse is over a color swatch in the rule view.
 rule.colorSwatch.tooltip=Click to open the colour picker, shift+click to change the colour format
 
--- a/dom/chrome/accessibility/mac/accessible.properties
+++ b/dom/chrome/accessibility/mac/accessible.properties
@@ -35,16 +35,22 @@ navigation =    navigation
 complementary = complementary
 content =       content
 main    =       main
 # The (spoken) role description for various WAI-ARIA roles
 alert       =      alert
 alertDialog =      alert dialogue
 article     =      article
 document    =      document
+# The (spoken) role description for the WAI-ARIA figure role
+# https://w3c.github.io/aria/core-aam/core-aam.html#role-map-figure
+figure     =      figure
+# The (spoken) role description for the WAI-ARIA heading role
+# https://w3c.github.io/aria/core-aam/core-aam.html#role-map-heading
+heading     =      heading
 log         =      log
 marquee     =      marquee
 math        =      math
 note        =      note
 region      =      region
 status      =      application status
 timer       =      timer
 tooltip     =      tooltip
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-malformedURI=The URL is not valid and cannot be loaded.
+malformedURI2=Please check that the URL is correct and try again.
 fileNotFound=The file %S cannot be found. Please check the location and try again.
 fileAccessDenied=The file at %S is not readable.
-dnsNotFound=%S could not be found. Please check the name and try again.
+dnsNotFound2=%S could not be found. Please check the name and try again.
 unknownProtocolFound=One of the following (%S) is not a registered protocol or is not allowed in this context.
 connectionFailure=The connection was refused when attempting to contact %S.
 netInterrupt=The connection to %S has terminated unexpectedly. Some data may have been transferred.
 netTimeout=The operation timed out when attempting to contact %S.
 redirectLoop=Redirection limit for this URL exceeded.  Unable to load the requested page.  This may be caused by cookies that are blocked.
 confirmRepostPrompt=To display this page, the application must send information that will repeat any action (such as a search or order confirmation) that was performed earlier.
 resendButton.label=Resend
 unknownSocketType=This document cannot be displayed unless you install the Personal Security Manager (PSM). Download and install PSM and try again, or contact your system administrator.
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -1,16 +1,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 KillScriptTitle=Warning: Unresponsive script
 KillScriptMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, or you can continue to see if the script will complete.
 KillScriptWithDebugMessage=A script on this page may be busy, or it may have stopped responding. You can stop the script now, open the script in the debugger, or let the script continue.
 KillScriptLocation=Script: %S
+
+KillAddonScriptTitle=Warning: Unresponsive add-on script
+# LOCALIZATION NOTE (KillAddonScriptMessage): %1$S is the name of an extension.
+# %2$S is the name of the application (e.g., Firefox).
+KillAddonScriptMessage=A script from the extension “%1$S” is running on this page, and making %2$S unresponsive.\n\nIt may be busy, or it may have stopped responding permanently. You can stop the script now, or you can continue to see if it will complete.
+KillAddonScriptGlobalMessage=Prevent the extension script from running on this page until it next reloads
+
 StopScriptButton=Stop script
 DebugScriptButton=Debug script
 WaitForScriptButton=Continue
 DontAskAgain=&Don't ask me again
 JSURLLoadBlockedWarning=Attempt to load a javascript: URL from one host\nin a window displaying content from another host\nwas blocked by the security manager.
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
 OnBeforeUnloadTitle=Are you sure?
 OnBeforeUnloadMessage=This page is asking you to confirm that you want to leave - data you have entered may not be saved.
@@ -28,49 +35,43 @@ FormValidationTextTooLong=Please shorten
 FormValidationTextTooShort=Please use at least %S characters (you are currently using %S characters).
 FormValidationValueMissing=Please fill in this field.
 FormValidationCheckboxMissing=Please tick this box if you want to proceed.
 FormValidationRadioMissing=Please select one of these options.
 FormValidationFileMissing=Please select a file.
 FormValidationSelectMissing=Please select an item in the list.
 FormValidationInvalidEmail=Please enter an email address.
 FormValidationInvalidURL=Please enter a URL.
+FormValidationInvalidDate =Please enter a valid date.
 FormValidationPatternMismatch=Please match the requested format.
 # LOCALIZATION NOTE (FormValidationPatternMismatchWithTitle): %S is the (possibly truncated) title attribute value.
 FormValidationPatternMismatchWithTitle=Please match the requested format: %S.
 # LOCALIZATION NOTE (FormValidationNumberRangeOverflow): %S is a number.
 FormValidationNumberRangeOverflow=Please select a value that is no more than %S.
-# LOCALIZATION NOTE (FormValidationDateRangeOverflow): %S is a date.
-FormValidationDateRangeOverflow=Please select a value that is no later than %S.
-# LOCALIZATION NOTE (FormValidationTimeRangeOverflow): %S is a time.
-FormValidationTimeRangeOverflow=Please select a value that is no later than %S.
+# LOCALIZATION NOTE (FormValidationDateTimeRangeOverflow): %S is a date or a time.
+FormValidationDateTimeRangeOverflow=Please select a value that is no later than %S.
 # LOCALIZATION NOTE (FormValidationNumberRangeUnderflow): %S is a number.
 FormValidationNumberRangeUnderflow=Please select a value that is no less than %S.
-# LOCALIZATION NOTE (FormValidationDateRangeUnderflow): %S is a date.
-FormValidationDateRangeUnderflow=Please select a value that is no earlier than %S.
-# LOCALIZATION NOTE (FormValidationTimeRangeUnderflow): %S is a time.
-FormValidationTimeRangeUnderflow=Please select a value that is no earlier than %S.
+# LOCALIZATION NOTE (FormValidationDateTimeRangeUnderflow): %S is a date or a time.
+FormValidationDateTimeRangeUnderflow=Please select a value that is no earlier than %S.
 # LOCALIZATION NOTE (FormValidationStepMismatch): both %S can be a number, a date or a time.
 FormValidationStepMismatch=Please select a valid value. The two nearest valid values are %S and %S.
 # LOCALIZATION NOTE (FormValidationStepMismatchOneValue): %S can be a number, a date or a time. This is called instead of FormValidationStepMismatch when the second value is the same as the first.
 FormValidationStepMismatchOneValue=Please select a valid value. The nearest valid value is %S.
 FormValidationBadInputNumber=Please enter a number.
 GetAttributeNodeWarning=Use of getAttributeNode() is deprecated. Use getAttribute() instead.
 SetAttributeNodeWarning=Use of setAttributeNode() is deprecated. Use setAttribute() instead.
 GetAttributeNodeNSWarning=Use of getAttributeNodeNS() is deprecated. Use getAttributeNS() instead.
 SetAttributeNodeNSWarning=Use of setAttributeNodeNS() is deprecated. Use setAttributeNS() instead.
 RemoveAttributeNodeWarning=Use of removeAttributeNode() is deprecated. Use removeAttribute() instead.
 CreateAttributeWarning=Use of document.createAttribute() is deprecated. Use element.setAttribute() instead.
 CreateAttributeNSWarning=Use of document.createAttributeNS() is deprecated. Use element.setAttributeNS() instead.
 NodeValueWarning=Use of attributes' nodeValue attribute is deprecated. Use value instead.
 TextContentWarning=Use of attributes' textContent attribute is deprecated. Use value instead.
 EnablePrivilegeWarning=Use of enablePrivilege is deprecated.  Please use code that runs with the system principal (e.g. an extension) instead.
-nsIJSONDecodeDeprecatedWarning=nsIJSON.decode is deprecated.  Please use JSON.parse instead.
-nsIJSONEncodeDeprecatedWarning=nsIJSON.encode is deprecated.  Please use JSON.stringify instead.
-nsIDOMWindowInternalWarning=Use of nsIDOMWindowInternal is deprecated. Use nsIDOMWindow instead.
 FullscreenDeniedDisabled=Request for fullscreen was denied because Fullscreen API is disabled by user preference.
 FullscreenDeniedFocusedPlugin=Request for fullscreen was denied because a windowed plugin is focused.
 FullscreenDeniedHidden=Request for fullscreen was denied because the document is no longer visible.
 FullscreenDeniedContainerNotAllowed=Request for fullscreen was denied because at least one of the document's containing elements is not an iframe or does not have an "allowfullscreen" attribute.
 FullscreenDeniedNotInputDriven=Request for fullscreen was denied because Element.requestFullscreen() was not called from inside a short running user-generated event handler.
 FullscreenDeniedNotHTMLSVGOrMathML=Request for fullscreen was denied because requesting element is not <svg>, <math>, or an HTML element.
 FullscreenDeniedNotInDocument=Request for fullscreen was denied because requesting element is no longer in its document.
 FullscreenDeniedMovedDocument=Request for fullscreen was denied because requesting element has moved document.
@@ -148,54 +149,48 @@ MediaStreamStopDeprecatedWarning=MediaSt
 # LOCALIZATION NOTE: %S is the URL of the web page which is not served on HTTPS and thus is not encrypted and considered insecure.
 MediaEMEInsecureContextDeprecatedWarning=Using Encrypted Media Extensions at %S on an insecure (i.e. non-HTTPS) context is deprecated and will soon be removed. You should consider switching to a secure origin such as HTTPS.
 # LOCALIZATION NOTE: %S is the URL of the web page which is calling web APIs without passing data (either an audioCapabilities or a videoCapabilities) that will soon be required. See https://bugzilla.mozilla.org/show_bug.cgi?id=1368583#c21 for explanation of this string.
 MediaEMENoCapabilitiesDeprecatedWarning=Calling navigator.requestMediaKeySystemAccess() (at %S) without passing a candidate MediaKeySystemConfiguration containing audioCapabilities or videoCapabilities is deprecated and will soon become unsupported.
 # LOCALIZATION NOTE: %S is the URL of the web page which is calling web APIs without passing data (a "codecs" string in the "contentType") that will soon be required. See https://bugzilla.mozilla.org/show_bug.cgi?id=1368583#c21 for explanation of this string.
 MediaEMENoCodecsDeprecatedWarning=Calling navigator.requestMediaKeySystemAccess() (at %S) passing a candidate MediaKeySystemConfiguration containing audioCapabilities or videoCapabilities without a contentType with a “codecs” string is deprecated and will soon become unsupported.
 # LOCALIZATION NOTE: Do not translate "DOMException", "code" and "name"
 DOMExceptionCodeWarning=Use of DOMException's code attribute is deprecated. Use name instead.
-# LOCALIZATION NOTE: Do not translate "__exposedProps__"
-NoExposedPropsWarning=Exposing chrome JS objects to content without __exposedProps__ is insecure and deprecated. See https://developer.mozilla.org/en/XPConnect_wrappers for more information.
 # LOCALIZATION NOTE: Do not translate "Mutation Event" and "MutationObserver"
 MutationEventWarning=Use of Mutation Events is deprecated. Use MutationObserver instead.
 # LOCALIZATION NOTE: Do not translate "Components"
 ComponentsWarning=The Components object is deprecated. It will soon be removed.
 PluginHangUITitle=Warning: Unresponsive plugin
 PluginHangUIMessage=%S may be busy, or it may have stopped responding. You can stop the plugin now, or you can continue to see if the plugin will complete.
 PluginHangUIWaitButton=Continue
 PluginHangUIStopButton=Stop plugin
 PrefixedFullscreenAPIWarning=Prefixed Fullscreen API is deprecated. Please use unprefixed API for fullscreen. For more help https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API
 # LOCALIZATION NOTE: Do not translate "NodeIterator" or "detach()".
 NodeIteratorDetachWarning=Calling detach() on a NodeIterator no longer has an effect.
 # LOCALIZATION NOTE: Do not translate "LenientThis" and "this"
 LenientThisWarning=Ignoring get or set of property that has [LenientThis] because the "this" object is incorrect.
-# LOCALIZATION NOTE: Do not translate "nsIDOMWindowUtils", "getWindowWithOuterId", or "nsIWindowMediator"
-GetWindowWithOuterIdWarning=Use of nsIDOMWindowUtils.getOuterWindowWithId() is deprecated.  Instead, use the nsIWindowMediator method of the same name.
 # LOCALIZATION NOTE: Do not translate "getPreventDefault" or "defaultPrevented".
 GetPreventDefaultWarning=Use of getPreventDefault() is deprecated.  Use defaultPrevented instead.
 # LOCALIZATION NOTE: Do not translate "getUserData", "setUserData", "WeakMap", or "element.dataset".
 GetSetUserDataWarning=Use of getUserData() or setUserData() is deprecated.  Use WeakMap or element.dataset instead.
 # LOCALIZATION NOTE: Do not translate "mozGetAsFile" or "toBlob"
 MozGetAsFileWarning=The non-standard mozGetAsFile method is deprecated and will soon be removed.  Use the standard toBlob method instead.
 # LOCALIZATION NOTE: Do not translate "captureEvents()" or "addEventListener()"
 UseOfCaptureEventsWarning=Use of captureEvents() is deprecated. To upgrade your code, use the DOM 2 addEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.addEventListener
 # LOCALIZATION NOTE: Do not translate "releaseEvents()" or "removeEventListener()"
 UseOfReleaseEventsWarning=Use of releaseEvents() is deprecated. To upgrade your code, use the DOM 2 removeEventListener() method. For more help http://developer.mozilla.org/en/docs/DOM:element.removeEventListener
 # LOCALIZATION NOTE: Do not translate "document.load()" or "XMLHttpRequest"
 UseOfDOM3LoadMethodWarning=Use of Document.load() is deprecated. To upgrade your code, use the DOM XMLHttpRequest object. For more help https://developer.mozilla.org/en/XMLHttpRequest
 # LOCALIZATION NOTE: Do not translate "window.showModalDialog()" or "window.open()"
 ShowModalDialogWarning=Use of window.showModalDialog() is deprecated. Use window.open() instead. For more help https://developer.mozilla.org/en-US/docs/Web/API/Window.open
-# LOCALIZATION NOTE: Do not translate "window._content" or "window.content"
-Window_ContentWarning=window._content is deprecated.  Please use window.content instead.
 # LOCALIZATION NOTE: Do not translate "XMLHttpRequest"
 SyncXMLHttpRequestWarning=Synchronous XMLHttpRequest on the main thread is deprecated because of its detrimental effects to the end user's experience. For more help http://xhr.spec.whatwg.org/
 ImplicitMetaViewportTagFallback=No meta-viewport tag found. Please explicitly specify one to prevent unexpected behavioural changes in future versions. For more help https://developer.mozilla.org/en/docs/Mozilla/Mobile/Viewport_meta_tag
-# LOCALIZATION NOTE: Do not translate "window.controllers"
-Window_ControllersWarning=window.controllers is deprecated. Do not use it for UA detection.
+# LOCALIZATION NOTE: Do not translate "window.controllers/Controllers"
+Window_Cc_ontrollersWarning=window.controllers/Controllers is deprecated. Do not use it for UA detection.
 ImportXULIntoContentWarning=Importing XUL nodes into a content document is deprecated. This functionality may be removed soon.
 XMLDocumentLoadPrincipalMismatch=Use of document.load forbidden on Documents that come from other Windows. Only the Window in which a Document was created is allowed to call .load on that Document. Preferably, use XMLHttpRequest instead.
 # LOCALIZATION NOTE: Do not translate "IndexedDB".
 IndexedDBTransactionAbortNavigation=An IndexedDB transaction that was not yet complete has been aborted due to page navigation.
 # LOCALIZATION NOTE: Do not translate Will-change, %1$S,%2$S are numbers.
 IgnoringWillChangeOverBudgetWarning=Will-change memory consumption is too high. Budget limit is the document surface area multiplied by %1$S (%2$S px). Occurrences of will-change over the budget will be ignored.
 # LOCALIZATION NOTE: Do not translate "Worker".
 HittingMaxWorkersPerDomain2=A Worker could not be started immediately because other documents in the same origin are already using the maximum number of workers. The Worker is now queued and will be started after some of the other workers have completed.
@@ -304,18 +299,16 @@ PushMessageBadCryptoError=The ServiceWorker for scope ‘%1$S’ failed to decrypt a push message. For help with encryption, please see https://developer.mozilla.org/docs/Web/API/Push_API/Using_the_Push_API#Encryption
 # LOCALIZATION NOTE: %1$S is the type of a DOM event. 'passive' is a literal parameter from the DOM spec.
 PreventDefaultFromPassiveListenerWarning=Ignoring ‘preventDefault()’ call on event of type ‘%1$S’ from a listener registered as ‘passive’.
 FileLastModifiedDateWarning=File.lastModifiedDate is deprecated. Use File.lastModified instead.
 # LOCALIZATION NOTE: 'ImageBitmapRenderingContext.transferImageBitmap' and 'ImageBitmapRenderingContext.transferFromImageBitmap' should not be translated
 ImageBitmapRenderingContext_TransferImageBitmap=ImageBitmapRenderingContext.transferImageBitmap is deprecated and will be removed soon. Use ImageBitmapRenderingContext.transferFromImageBitmap instead.
 ChromeScriptedDOMParserWithoutPrincipal=Creating DOMParser without a principal is deprecated.
 IIRFilterChannelCountChangeWarning=IIRFilterNode channel count changes may produce audio glitches.
 BiquadFilterChannelCountChangeWarning=BiquadFilterNode channel count changes may produce audio glitches.
-# LOCALIZATION NOTE: %1$S is the unanimatable paced property.
-UnanimatablePacedProperty=Paced property ‘%1$S’ is not an animatable property.
 # LOCALIZATION NOTE: Do not translate ".jpeg"
 GenericImageNameJPEG=image.jpeg
 # LOCALIZATION NOTE: Do not translate ".gif"
 GenericImageNameGIF=image.gif
 # LOCALIZATION NOTE: Do not translate ".png"
 GenericImageNamePNG=image.png
 GenericFileName=file
 # LOCALIZATION NOTE: Do not translate "Large-Allocation", as it is a literal header name
@@ -332,22 +325,28 @@ LargeAllocationNonWin32=This page would 
 # LOCALIZATION NOTE: Do not translate URL.createObjectURL(MediaStream).
 URLCreateObjectURL_MediaStreamWarning=URL.createObjectURL(MediaStream) is deprecated and will be removed soon.
 # LOCALIZATION NOTE: Do not translate MozAutoGainControl or autoGainControl.
 MozAutoGainControlWarning=mozAutoGainControl is deprecated. Use autoGainControl instead.
 # LOCALIZATION NOTE: Do not translate mozNoiseSuppression or noiseSuppression.
 MozNoiseSuppressionWarning=mozNoiseSuppression is deprecated. Use noiseSuppression instead.
 # LOCALIZATION NOTE: Do not translate xml:base.
 XMLBaseAttributeWarning=Use of xml:base attribute is deprecated and will be removed soon. Please remove any use of it.
+# LOCALIZATION NOTE: Do not translate "content", "Window", and "window.top"
+WindowContentUntrustedWarning=The ‘content’ attribute of Window objects is deprecated.  Please use ‘window.top’ instead.
 # LOCALIZATION NOTE: %S is the tag name of the element that starts the loop
 SVGReferenceLoopWarning=There is an SVG <%S> reference loop in this document, which will prevent the document rendering correctly.
 # LOCALIZATION NOTE: %S is the tag name of the element that starts the chain
 SVGReferenceChainLengthExceededWarning=There is an SVG <%S> reference chain which is too long in this document, which will prevent the document rendering correctly.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceEmpty=‘%S’ attribute of <script> element is empty.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceInvalidUri=‘%S’ attribute of <script> element is not a valid URI: “%S”
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceLoadFailed=Loading failed for the <script> with source “%S”.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceMalformed=<script> source URI is malformed: “%S”.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceNotAllowed=<script> source URI is not allowed in this document: “%S”.
+# LOCALIZATION NOTE: %1$S is the invalid property value and %2$S is the property name.
+InvalidKeyframePropertyValue=Keyframe property value “%1$S” is invalid according to the syntax for “%2$S”.
+# LOCALIZATION NOTE: Do not translate "ReadableStream".
+ReadableStreamReadingFailed=Failed to read data from the ReadableStream: “%S”.
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -3,21 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Reset=Reset
 Submit=Submit Query
 Browse=Browse…
 FileUpload=File Upload
 DirectoryUpload=Select Folder to Upload
 DirectoryPickerOkButtonLabel=Upload
-# LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
-# should be a space (U+0020) in most locales. The prompt is followed by an 
-# input field. The space needs be escaped in the property file to avoid 
-# trimming.
-IsIndexPromptWithSpace=This is a searchable index. Enter search keywords:\u0020
 ForgotPostWarning=Form contains enctype=%S, but does not contain method=post.  Submitting normally with method=GET and no enctype instead.
 ForgotFileEnctypeWarning=Form contains a file input, but is missing method=POST and enctype=multipart/form-data on the form.  The file will not be sent.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
 DefaultFormSubject=Form Post from %S
 CannotEncodeAllUnicode=A form was submitted in the %S encoding which cannot encode all Unicode characters, so user input may get corrupted. To avoid this problem, the page should be changed so that the form is submitted in the UTF-8 encoding either by changing the encoding of the page itself to UTF-8 or by specifying accept-charset=utf-8 on the form element.
 AllSupportedTypes=All Supported Types
 # LOCALIZATION NOTE (NoFileSelected): this string is shown on a
 # <input type='file'> when there is no file selected yet.
--- a/dom/chrome/layout/css.properties
+++ b/dom/chrome/layout/css.properties
@@ -97,17 +97,16 @@ PEColorEOF=colour
 PEColorNotColor=Expected colour but found '%1$S'.
 PEColorComponentEOF=colour component
 PEExpectedPercent=Expected a percentage but found '%1$S'.
 PEExpectedInt=Expected an integer but found '%1$S'.
 PEExpectedNumberOrAngle=Expected a number or an angle but found ‘%1$S’.
 PEExpectedNumberOrPercent=Expected a number or a percentage but found ‘%1$S’.
 PEColorBadRGBContents=Expected number or percentage in rgb() but found '%1$S'.
 PEColorComponentBadTerm=Expected '%2$S' but found '%1$S'.
-PEColorHueEOF=hue
 PEExpectedComma=Expected ',' but found '%1$S'.
 PEColorSaturationEOF=saturation
 PEColorLightnessEOF=lightness
 PEColorOpacityEOF=opacity in colour value
 PEExpectedNumber=Expected a number but found '%1$S'.
 PEPositionEOF=<position>
 PEExpectedPosition=Expected <position> but found '%1$S'.
 PEExpectedRadius=Expected radius but found '%1$S'.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -99,17 +99,16 @@ errNonSpaceInColgroupInFragment=Non-space in “colgroup” when parsing fragment.
 errNonSpaceInNoscriptInHead=Non-space character inside “noscript” inside “head”.
 errFooBetweenHeadAndBody=“%1$S” element between “head” and “body”.
 errStartTagWithoutDoctype=Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
 errNoSelectInTableScope=No “select” in table scope.
 errStartSelectWhereEndSelectExpected=“select” start tag where end tag expected.
 errStartTagWithSelectOpen=“%1$S” start tag with “select” open.
 errBadStartTagInHead2=Bad start tag “%1$S” in “head”.
 errImage=Saw a start tag “image”.
-errIsindex=“isindex” seen.
 errFooSeenWhenFooOpen=An “%1$S” start tag seen but an element of the same type was already open.
 errHeadingWhenHeadingOpen=Heading cannot be a child of another heading.
 errFramesetStart=“frameset” start tag seen.
 errNoCellToClose=No cell to close.
 errStartTagInTable=Start tag “%1$S” seen in “table”.
 errFormWhenFormOpen=Saw a “form” start tag, but there was already an active “form” element. Nested forms are not allowed. Ignoring the tag.
 errTableSeenWhileTableOpen=Start tag for “table” seen but the previous “table” is still open.
 errStartTagInTableBody=“%1$S” start tag in table body.
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -76,8 +76,11 @@ WeakCipherSuiteWarning=This site uses th
 
 #XCTO: nosniff
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options: nosniff".
 MimeTypeMismatch=The resource from “%1$S” was blocked due to MIME type mismatch (X-Content-Type-Options: nosniff).
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not translate "nosniff".
 XCTOHeaderValueMissing=X-Content-Type-Options header warning: value was “%1$S”; did you mean to send “nosniff”?
 
 BlockScriptWithWrongMimeType=Script from “%1$S” was blocked because of a disallowed MIME type.
+
+# LOCALIZATION NOTE: Do not translate "data: URI".
+BlockTopLevelDataURINavigation=Navigation to toplevel data: URI not allowed (Blocked loading of: “%1$S”)
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -1,14 +1,17 @@
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CertPassPrompt=Please enter the master password for the %S.
+
+CertPassPromptDefault=Please enter your master password.
+
 # the following strings have special requirements:
 # they must fit in a 32 or 64 byte buffer after being translated
 # to UTF8.  Note to translator. It's not easy for you to figure
 # whether the escaped unicode string you produce will fit in 
 # the space allocated.
 #
 # 64 bytes long after conversion to UTF8
 RootCertModuleName=Builtin Roots Module
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -5,21 +5,21 @@
 <!ENTITY certmgr.title                       "Certificate Manager">
 
 <!ENTITY certmgr.tab.mine                     "Your Certificates">
 <!ENTITY certmgr.tab.others2                  "People">
 <!ENTITY certmgr.tab.websites3                "Servers">
 <!ENTITY certmgr.tab.ca                       "Authorities">
 <!ENTITY certmgr.tab.orphan2                  "Others">
 
-<!ENTITY certmgr.mine                         "You have certificates from these organisations that identify you:">
-<!ENTITY certmgr.others                       "You have certificates on file that identify these people:">
-<!ENTITY certmgr.websites2                    "You have certificates on file that identify these servers:">
-<!ENTITY certmgr.cas                          "You have certificates on file that identify these certificate authorities:">
-<!ENTITY certmgr.orphans                      "You have certificates on file that do not fit in any of the other categories:">
+<!ENTITY certmgr.mine2                        "You have certificates from these organisations that identify you">
+<!ENTITY certmgr.others2                      "You have certificates on file that identify these people">
+<!ENTITY certmgr.websites3                    "You have certificates on file that identify these servers">
+<!ENTITY certmgr.cas2                         "You have certificates on file that identify these certificate authorities">
+<!ENTITY certmgr.orphans2                     "You have certificates on file that do not fit in any of the other categories">
 
 <!ENTITY certmgr.detail.general_tab.title     "General">
 <!ENTITY certmgr.detail.general_tab.accesskey "G">
 <!ENTITY certmgr.detail.prettyprint_tab.title "Details">
 <!ENTITY certmgr.detail.prettyprint_tab.accesskey "D">
 
 <!ENTITY certmgr.pending.label                "Currently verifying certificate…">
 <!ENTITY certmgr.subjectinfo.label            "Issued To">
--- a/security/manager/chrome/pippki/deviceManager.dtd
+++ b/security/manager/chrome/pippki/deviceManager.dtd
@@ -20,17 +20,17 @@
 <!ENTITY devmgr.button.changepw.accesskey       "P">
 <!ENTITY devmgr.button.load.label               "Load">
 <!ENTITY devmgr.button.load.accesskey           "L">
 <!ENTITY devmgr.button.unload.label             "Unload">
 <!ENTITY devmgr.button.unload.accesskey         "U">
 <!ENTITY devmgr.button.fips.accesskey           "F">
 
 <!ENTITY loaddevice.info                        "Enter the information for the module you want to add.">
-<!ENTITY loaddevice.modname                     "Module Name:">
-<!ENTITY loaddevice.modname.accesskey           "M">
+<!ENTITY loaddevice.modname2                    "Module Name">
+<!ENTITY loaddevice.modname2.accesskey          "M">
 <!ENTITY loaddevice.modname.default             "New PKCS#11 Module">
-<!ENTITY loaddevice.filename                    "Module filename:">
-<!ENTITY loaddevice.filename.accesskey          "f">
+<!ENTITY loaddevice.filename2                   "Module filename">
+<!ENTITY loaddevice.filename2.accesskey         "f">
 <!ENTITY loaddevice.browse                      "Browse…">
 <!ENTITY loaddevice.browse.accesskey            "B">
 
 <!ENTITY loaddevice.title2                      "Load PKCS#11 Device Driver">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -1,14 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-CertPassPrompt=Please enter the Personal Security Password for the PSM Private Keys security device.
-
 # LOCALIZATION NOTE(certWithSerial): Used for semi-uniquely representing a cert.
 # %1$S is the serial number of the cert in AA:BB:CC hex format.
 certWithSerial=Certificate with serial number: %1$S
 
 # Download Cert dialog
 # LOCALIZATION NOTE(newCAMessage1):
 # %S is a string representative of the certificate being downloaded/imported.
 newCAMessage1=Do you want to trust "%S" for the following purposes?
@@ -182,8 +180,13 @@ addExceptionExpiredLong2=The certificate
 addExceptionUnverifiedOrBadSignatureShort=Unknown Identity
 addExceptionUnverifiedOrBadSignatureLong2=The certificate is not trusted because it hasn't been verified as issued by a trusted authority using a secure signature.
 addExceptionValidShort=Valid Certificate
 addExceptionValidLong=This site provides valid, verified identification.  There is no need to add an exception.
 addExceptionCheckingShort=Checking Information
 addExceptionCheckingLong2=Attempting to identify this site…
 addExceptionNoCertShort=No Information Available
 addExceptionNoCertLong2=Unable to obtain identification status for this site.
+
+# Load Module Dialog
+loadModuleHelp_emptyModuleName=The module name cannot be empty.
+# LOCALIZATION NOTE(loadModuleHelp_rootCertsModuleName): Do not translate 'Root Certs'
+loadModuleHelp_rootCertsModuleName=‘Root Certs‘ is reserved and cannot be used as the module name.
--- a/toolkit/chrome/global/aboutNetworking.dtd
+++ b/toolkit/chrome/global/aboutNetworking.dtd
@@ -41,8 +41,18 @@
 <!ENTITY aboutNetworking.dnsLookupButton       "Resolve">
 <!ENTITY aboutNetworking.dnsDomain             "Domain">
 <!ENTITY aboutNetworking.dnsLookupTableColumn  "IPs">
 <!ENTITY aboutNetworking.rcwn                  "RCWN Stats">
 <!ENTITY aboutNetworking.rcwnStatus            "RCWN Status">
 <!ENTITY aboutNetworking.rcwnCacheWonCount     "Cache won count">
 <!ENTITY aboutNetworking.rcwnNetWonCount       "Net won count">
 <!ENTITY aboutNetworking.totalNetworkRequests  "Total network request count">
+<!ENTITY aboutNetworking.rcwnOperation         "Cache Operation">
+<!ENTITY aboutNetworking.rcwnPerfOpen          "Open">
+<!ENTITY aboutNetworking.rcwnPerfRead          "Read">
+<!ENTITY aboutNetworking.rcwnPerfWrite         "Write">
+<!ENTITY aboutNetworking.rcwnPerfEntryOpen     "Entry Open">
+<!ENTITY aboutNetworking.rcwnAvgShort          "Short Average">
+<!ENTITY aboutNetworking.rcwnAvgLong           "Long Average">
+<!ENTITY aboutNetworking.rcwnStddevLong        "Long Standard Deviation">
+<!ENTITY aboutNetworking.rcwnCacheSlow         "Cache slow count">
+<!ENTITY aboutNetworking.rcwnCacheNotSlow      "Cache not slow count">
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -1,15 +1,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
 <!ENTITY rights.locale-direction "ltr">
-<!ENTITY rights.pagetitle       "about:rights">
-<!ENTITY rights.intro-header    "About Your Rights">
+<!ENTITY rights.title "About Your Rights">
 <!ENTITY rights.intro "&brandFullName; is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:">
 <!-- Note on pointa / pointb / pointc form:
      These points each have an embedded link in the HTML, so each point is
      split into chunks for text before the link, the link text, and the text
      after the link. If a localized grammar doesn't need the before or after
      chunk, it can be left blank.
 
      Also note the leading/trailing whitespace in strings here, which is
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -63,16 +63,18 @@ Windows/Mac use the term "Folder" instea
 
 <!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
 <!ENTITY aboutSupport.appBasicsServiceWorkers "Registered Service Workers">
 
 <!ENTITY aboutSupport.appBasicsProfiles "Profiles">
 
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
 
+<!ENTITY aboutSupport.appBasicsProcessCount "Web Content Processes">
+
 <!ENTITY aboutSupport.appBasicsKeyGoogle "Google Key">
 <!ENTITY aboutSupport.appBasicsKeyMozilla "Mozilla Location Service Key">
 
 <!ENTITY aboutSupport.appBasicsSafeMode "Safe Mode">
 
 <!ENTITY aboutSupport.showDir.label "Open Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
 variant of aboutSupport.showDir.label.  This allows us to use the preferred
@@ -101,16 +103,18 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.placeDatabaseVerifyIntegrity "Verify Integrity">
 
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "Incremental GC">
 
 <!ENTITY aboutSupport.a11yTitle "Accessibility">
 <!ENTITY aboutSupport.a11yActivated "Activated">
 <!ENTITY aboutSupport.a11yForceDisabled "Prevent Accessibility">
+<!ENTITY aboutSupport.a11yHandlerUsed "Accessible Handler Used">
+<!ENTITY aboutSupport.a11yInstantiator "Accessibility Instantiator">
 
 <!ENTITY aboutSupport.libraryVersionsTitle "Library Versions">
 
 <!ENTITY aboutSupport.installationHistoryTitle "Installation History">
 <!ENTITY aboutSupport.updateHistoryTitle "Update History">
 
 <!ENTITY aboutSupport.copyTextToClipboard.label "Copy text to clipboard">
 <!ENTITY aboutSupport.copyRawDataToClipboard.label "Copy raw data to clipboard">
@@ -131,8 +135,21 @@ variant of aboutSupport.showDir.label. -
 <!ENTITY aboutSupport.graphicsFeaturesTitle "Features">
 <!ENTITY aboutSupport.graphicsDiagnosticsTitle "Diagnostics">
 <!ENTITY aboutSupport.graphicsFailureLogTitle "Failure Log">
 <!ENTITY aboutSupport.graphicsGPU1Title "GPU #1">
 <!ENTITY aboutSupport.graphicsGPU2Title "GPU #2">
 <!ENTITY aboutSupport.graphicsDecisionLogTitle "Decision Log">
 <!ENTITY aboutSupport.graphicsCrashGuardsTitle "Crash Guard Disabled Features">
 <!ENTITY aboutSupport.graphicsWorkaroundsTitle "Workarounds">
+
+<!ENTITY aboutSupport.mediaTitle "Media">
+<!ENTITY aboutSupport.mediaOutputDevicesTitle "Output Devices">
+<!ENTITY aboutSupport.mediaInputDevicesTitle "Input Devices">
+<!ENTITY aboutSupport.mediaDeviceName "Name">
+<!ENTITY aboutSupport.mediaDeviceGroup "Group">
+<!ENTITY aboutSupport.mediaDeviceVendor "Vendor">
+<!ENTITY aboutSupport.mediaDeviceState "State">
+<!ENTITY aboutSupport.mediaDevicePreferred "Preferred">
+<!ENTITY aboutSupport.mediaDeviceFormat "Format">
+<!ENTITY aboutSupport.mediaDeviceChannels "Channels">
+<!ENTITY aboutSupport.mediaDeviceRate "Rate">
+<!ENTITY aboutSupport.mediaDeviceLatency "Latency">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -52,17 +52,16 @@ blockedMismatchedVersion = Blocked for y
 
 # LOCALIZATION NOTE In the following strings, "Direct2D", "DirectWrite" and "ClearType"
 # are proper nouns and should not be translated. Feel free to leave english strings if
 # there are no good translations, these are only used in about:support
 clearTypeParameters = ClearType Parameters
 
 compositing = Compositing
 hardwareH264 = Hardware H264 Decoding
-audioBackend = Audio Backend
 mainThreadNoOMTC = main thread, no OMTC
 yes = Yes
 no = No
 # LOCALIZATION NOTE The following strings indicate if an API key has been found.
 # In some development versions, it's expected for some API keys that they are
 # not found.
 found = Found
 missing = Missing
@@ -95,16 +94,23 @@ bugLink = bug %1$S
 # string that can be searched on DXR/MXR or grepped in the source tree.
 unknownFailure = Blocklisted; failure code %1$S
 d3d11layersCrashGuard = D3D11 Compositor
 d3d11videoCrashGuard = D3D11 Video Decoder
 d3d9videoCrashGuard = D3D9 Video Decoder
 glcontextCrashGuard = OpenGL
 resetOnNextRestart = Reset on Next Restart
 gpuProcessKillButton = Terminate GPU Process
+gpuDeviceResetButton = Trigger Device Reset
+offMainThreadPaintEnabled = Off Main Thread Painting Enabled
+
+audioBackend = Audio Backend
+maxAudioChannels = Max Channels
+channelLayout = Preferred Channel Layout
+sampleRate = Preferred Sample Rate
 
 minLibVersions = Expected minimum version
 loadedLibVersions = Version in use
 
 hasSeccompBPF = Seccomp-BPF (System Call Filtering)
 hasSeccompTSync = Seccomp Thread Synchronisation
 hasUserNamespaces = User Namespaces
 hasPrivilegedUserNamespaces = User Namespaces for privileged processes
@@ -132,12 +138,21 @@ multiProcessStatus.8 = Disabled forcibly
 multiProcessStatus.9 = Disabled by graphics hardware acceleration on Windows XP
 multiProcessStatus.unknown = Unknown status
 
 asyncPanZoom = Asynchronous Pan/Zoom
 apzNone = none
 wheelEnabled = wheel input enabled
 touchEnabled = touch input enabled
 dragEnabled = scrollbar drag enabled
+keyboardEnabled = keyboard enabled
+autoscrollEnabled = autoscroll enabled
 
 # LOCALIZATION NOTE %1 will be replaced with the key of a preference.
 wheelWarning = async wheel input disabled due to unsupported pref: %S
 touchWarning = async touch input disabled due to unsupported pref: %S
+
+# LOCALIZATION NOTE Strings explaining why a feature is or is not available.
+disabledByBuild = disabled by build
+enabledByDefault = enabled by default
+disabledByDefault = disabled by default
+enabledByUser = enabled by user
+disabledByUser = disabled by user
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -1,177 +1,51 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY aboutTelemetry.pageTitle "Telemetry Data">
-
-<!ENTITY aboutTelemetry.changeDataChoices "
-  Change
-">
-
-<!ENTITY aboutTelemetry.uploadEnabled "
-  FHR data upload is <span>enabled</span>.
-">
-
-<!ENTITY aboutTelemetry.uploadDisabled "
-  FHR data upload is <span>disabled</span>.
-">
-
-<!ENTITY aboutTelemetry.extendedRecordingEnabled "
-  Extended Telemetry recording is <span>enabled</span>.
-">
-
-<!ENTITY aboutTelemetry.extendedRecordingDisabled "
-  Extended Telemetry recording is <span>disabled</span>.
-">
-
-<!ENTITY aboutTelemetry.pingDataSource "
-Ping data source:
-">
-
-<!ENTITY aboutTelemetry.showCurrentPingData "
-Current ping data
-">
-
-<!ENTITY aboutTelemetry.showArchivedPingData "
-Archived ping data
-">
-
-<!ENTITY aboutTelemetry.pingDataDisplay "
-Ping data display:
-">
-
-<!ENTITY aboutTelemetry.structured "
-Structured
-">
+<!ENTITY aboutTelemetry.pingDataSource "Ping data source:">
+<!ENTITY aboutTelemetry.showCurrentPingData "Current ping data">
+<!ENTITY aboutTelemetry.showArchivedPingData "Archived ping data">
+<!ENTITY aboutTelemetry.showSubsessionData "Show subsession data">
+<!ENTITY aboutTelemetry.choosePing "Choose ping:">
+<!ENTITY aboutTelemetry.archivePingType "Ping Type">
+<!ENTITY aboutTelemetry.archivePingHeader "Ping">
+<!ENTITY aboutTelemetry.optionGroupToday "Today">
+<!ENTITY aboutTelemetry.optionGroupYesterday "Yesterday">
+<!ENTITY aboutTelemetry.optionGroupOlder "Older">
+<!ENTITY aboutTelemetry.payloadChoiceHeader "Payload">
+<!-- LOCALIZATION NOTE(aboutTelemetry.previousPing, aboutTelemetry.nextPing):
+        These strings are displayed when selecting Archived pings, and they’re
+        used to move to the next or previous ping. -->
+<!ENTITY aboutTelemetry.previousPing "&lt;&lt;">
+<!ENTITY aboutTelemetry.nextPing "&gt;&gt;">
 
-<!ENTITY aboutTelemetry.raw "
-Raw JSON
-">
-
-<!ENTITY aboutTelemetry.showSubsessionData "
-Show subsession data
-">
-
-<!ENTITY aboutTelemetry.choosePing "
-Choose ping:
-">
-
-<!ENTITY aboutTelemetry.showNewerPing "
-&lt;&lt; Newer ping
-">
-
-<!ENTITY aboutTelemetry.showOlderPing "
-Older ping &gt;&gt;
-">
-
-<!ENTITY aboutTelemetry.rawPingData "
-Raw ping data ...
-">
-
-<!ENTITY aboutTelemetry.archiveWeekHeader "
-Week
-">
-
-<!ENTITY aboutTelemetry.archivePingHeader "
-Ping
-">
-
-<!ENTITY aboutTelemetry.generalDataSection "
-  General Data
-">
-
-<!ENTITY aboutTelemetry.environmentDataSection "
-  Environment Data
-">
-
-<!ENTITY aboutTelemetry.telemetryLogSection "
-  Telemetry Log
-">
+<!ENTITY aboutTelemetry.pageTitle "Telemetry Data">
+<!ENTITY aboutTelemetry.moreInformations "Looking for more information?">
+<!ENTITY aboutTelemetry.firefoxDataDoc "The <a>Firefox Data Documentation</a> contains guides about how to work with our data tools.">
+<!ENTITY aboutTelemetry.telemetryClientDoc "The <a>Firefox Telemetry client documentation</a> includes definitions for concepts, API documentation and data references.">
+<!ENTITY aboutTelemetry.telemetryDashboard "The <a>Telemetry dashboards</a> allow you to visualise the data Mozilla receives via Telemetry.">
 
-<!ENTITY aboutTelemetry.slowSqlSection "
-  Slow SQL Statements
-">
-
-<!ENTITY aboutTelemetry.chromeHangsSection "
-  Browser Hangs
-">
-
-<!ENTITY aboutTelemetry.threadHangStatsSection "
-  Thread Hangs
-">
-
-<!ENTITY aboutTelemetry.capturedStacksSection "
-  Captured Stacks
-">
-
-<!ENTITY aboutTelemetry.scalarsSection "
-  Scalars
-">
-
-<!ENTITY aboutTelemetry.keyedScalarsSection "
-  Keyed Scalars
-">
-
-<!ENTITY aboutTelemetry.histogramsSection "
-  Histograms
-">
-
-<!ENTITY aboutTelemetry.keyedHistogramsSection "
-  Keyed Histograms
-">
-
-<!ENTITY aboutTelemetry.eventsSection "
-  Events
-">
-
-<!ENTITY aboutTelemetry.simpleMeasurementsSection "
-  Simple Measurements
-">
-
-<!ENTITY aboutTelemetry.addonDetailsSection "
-  Add-on Details
-">
+<!ENTITY aboutTelemetry.showInFirefoxJsonViewer "Open in the JSON viewer">
 
-<!ENTITY aboutTelemetry.lateWritesSection "
-  Late Writes
-">
-
-<!ENTITY aboutTelemetry.sessionInfoSection "
-  Session Information
-">
-
-<!ENTITY aboutTelemetry.addonHistogramsSection "
-  Histograms Collected by Add-ons
-">
-
-<!ENTITY aboutTelemetry.toggle "
-  Click to toggle section
-">
-
-<!ENTITY aboutTelemetry.emptySection "
-  (No data collected)
-">
+<!ENTITY aboutTelemetry.homeSection "Home">
+<!ENTITY aboutTelemetry.generalDataSection "General Data">
+<!ENTITY aboutTelemetry.environmentDataSection "Environment Data">
+<!ENTITY aboutTelemetry.sessionInfoSection "Session Information">
+<!ENTITY aboutTelemetry.scalarsSection "Scalars">
+<!ENTITY aboutTelemetry.keyedScalarsSection "Keyed Scalars">
+<!ENTITY aboutTelemetry.histogramsSection "Histograms">
+<!ENTITY aboutTelemetry.keyedHistogramsSection "Keyed Histograms">
+<!ENTITY aboutTelemetry.eventsSection "Events">
+<!ENTITY aboutTelemetry.simpleMeasurementsSection "Simple Measurements">
+<!ENTITY aboutTelemetry.telemetryLogSection "Telemetry Log">
+<!ENTITY aboutTelemetry.slowSqlSection "Slow SQL Statements">
+<!ENTITY aboutTelemetry.chromeHangsSection "Browser Hangs">
+<!ENTITY aboutTelemetry.addonDetailsSection "Add-on Details">
+<!ENTITY aboutTelemetry.capturedStacksSection "Captured Stacks">
+<!ENTITY aboutTelemetry.lateWritesSection "Late Writes">
+<!ENTITY aboutTelemetry.rawPayloadSection "Raw Payload">
+<!ENTITY aboutTelemetry.raw "Raw JSON">
 
-<!ENTITY aboutTelemetry.fullSqlWarning "
-  NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.
-">
-
-<!ENTITY aboutTelemetry.fetchStackSymbols "
-  Fetch function names for stacks
-">
-
-<!ENTITY aboutTelemetry.hideStackSymbols "
-  Show raw stack data
-">
-
-<!ENTITY aboutTelemetry.filterText "
-  Filter (strings or /regexp/)
-">
-
-<!ENTITY aboutTelemetry.payloadChoiceHeader "
-  Payload
-">
-
-<!ENTITY aboutTelemetry.rawPayload "
-  Raw Payload
-">
+<!ENTITY aboutTelemetry.fullSqlWarning "NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.">
+<!ENTITY aboutTelemetry.fetchStackSymbols "Fetch function names for stacks">
+<!ENTITY aboutTelemetry.hideStackSymbols "Show raw stack data">
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -2,89 +2,114 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Note to translators:
 # - %1$S will be replaced by brandFullName
 # - %2$S will be replaced with the value of the toolkit.telemetry.server_owner preference
 pageSubtitle = This page shows the information about performance, hardware, usage and customisations collected by Telemetry. This information is submitted to %1$S to help improve %2$S.
 
-generalDataTitle = General Data
+# LOCALIZATION NOTE(homeExplanation):
+# - %1$S is either telemetryEnabled or telemetryDisabled
+# - %2$S is either extendedTelemetryEnabled or extendedTelemetryDisabled
+homeExplanation = Telemetry is %1$S and extended telemetry is %2$S.
+telemetryEnabled = enabled
+telemetryDisabled = disabled
+extendedTelemetryEnabled = enabled
+extendedTelemetryDisabled = disabled
 
-environmentDataSubsectionToggle = Click to toggle section
-
-environmentDataSubsectionEmpty = (No data collected)
+# LOCALIZATION NOTE(pingDetails):
+# - %1$S is replaced by a link with pingExplanationLink as text
+# - %2$S is replaced by namedPing
+pingDetails = Each piece of information is sent bundled into “%1$S”. You are looking at the %2$S ping.
+# LOCALIZATION NOTE(namedPing):
+# - %1$S is replaced by the ping localized timestamp, e.g. “2017/07/08 10:40:46”
+# - %2$S is replaced by the ping name, e.g. “saved-session”
+namedPing = %1$S, %2$S
+# LOCALIZATION NOTE(pingDetailsCurrent):
+# - %1$S is replaced by a link with pingExplanationLink as text
+# - %2$S is replaced by currentPing
+pingDetailsCurrent = Each piece of information is sent bundled into “%1$S“. You are looking at the %2$S ping.
+pingExplanationLink = pings
+currentPing = current
 
+# LOCALIZATION NOTE(filterPlaceholder): string used as a placeholder for the
+# search field, %1$S is replaced by the section name from the structure of the
+# ping. More info about it can be found here:
+# https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
+filterPlaceholder = Find in %1$S
+filterAllPlaceholder = Find in all sections
+
+# LOCALIZATION NOTE(resultsForSearch): %1$S is replaced by the searched terms
+resultsForSearch = Results for “%1$S”
+# LOCALIZATION NOTE(noSearchResults):
+# - %1$S is replaced by the section name from the structure of the ping.
+# More info about it can be found here: https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
+# - %2$S is replaced by the current text in the search input
+noSearchResults = Sorry! There are no results in %1$S for “%2$S”
+# LOCALIZATION NOTE(noSearchResultsAll): %S is replaced by the searched terms
+noSearchResultsAll = Sorry! There are no results in any sections for “%S”
+# LOCALIZATION NOTE(noDataToDisplay): %S is replaced by the section name.
+# This message is displayed when a section is empty.
+noDataToDisplay = Sorry! There is currently no data available in “%S”
+# LOCALIZATION NOTE(currentPingSidebar): used as a tooltip for the “current”
+# ping title in the sidebar
+currentPingSidebar = current ping
+# LOCALIZATION NOTE(telemetryPingTypeAll): used in the “Ping Type” select
+telemetryPingTypeAll = all
+
+# LOCALIZATION NOTE(histogram*): these strings are used in the “Histograms” section
+histogramSamples = samples
+histogramAverage = average
+histogramSum = sum
+# LOCALIZATION NOTE(histogramCopy): button label to copy the histogram
+histogramCopy = Copy
+
+# LOCALIZATION NOTE(telemetryLog*): these strings are used in the “Telemetry Log” section
 telemetryLogTitle = Telemetry Log
-
 telemetryLogHeadingId = Id
-
 telemetryLogHeadingTimestamp = Timestamp
-
 telemetryLogHeadingData = Data
 
+# LOCALIZATION NOTE(slowSql*): these strings are used in the “Slow SQL Statements” section
 slowSqlMain = Slow SQL Statements on Main Thread
-
 slowSqlOther = Slow SQL Statements on Helper Threads
-
 slowSqlHits = Hits
-
 slowSqlAverage = Avg. Time (ms)
-
 slowSqlStatement = Statement
 
-# Note to translators:
-# - The %1$S will be replaced with the number of the hang
-# - The %2$S will be replaced with the duration of the hang
-chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
+# LOCALIZATION NOTE(histogram*): these strings are used in the “Add-on Details” section
+addonTableID = Add-on ID
+addonTableDetails = Details
+# LOCALIZATION NOTE(addonProvider):
+# - %1$S is replaced by the name of an Add-on Provider (e.g. “XPI”, “Plugin”)
+addonProvider = %1$S Provider
+
+keysHeader = Property
+namesHeader = Name
+valuesHeader = Value
 
-# Note to translators:
-# - The %1$S will be replaced with the string key for this stack.
-# - The %2$S will be replaced with the number of times this stack was captured.
+# LOCALIZATION NOTE(chrome-hangs-title):
+# - %1$S is replaced by the number of the hang
+# - %2$S is replaced by the duration of the hang
+chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
+# LOCALIZATION NOTE(captured-stacks-title):
+# - %1$S is replaced by the string key for this stack
+# - %2$S is replaced by the number of times this stack was captured
 captured-stacks-title = %1$S (capture count: %2$S)
-
-# Note to translators:
-# - The %1$S will be replaced with the number of the late write
+# LOCALIZATION NOTE(late-writes-title):
+# - %1$S is replaced by the number of the late write
 late-writes-title = Late Write #%1$S
 
 stackTitle = Stack:
-
 memoryMapTitle = Memory map:
 
 errorFetchingSymbols = An error occurred while fetching symbols. Check that you are connected to the Internet and try again.
 
-histogramSamples = samples
-
-histogramAverage = average
-
-histogramSum = sum
-
-histogramCopy = Copy
-
-keysHeader = Property
-
-namesHeader = Name
-
-valuesHeader = Value
-
-addonTableID = Add-on ID
-
-addonTableDetails = Details
-
-# Note to translators:
-# - The %1$S will be replaced with the name of an Add-on Provider (e.g. "XPI", "Plugin")
-addonProvider = %1$S Provider
-
 parentPayload = Parent Payload
-
-# Note to translators:
-# - The %1$S will be replaced with the number of the child payload (e.g. "1", "2")
+# LOCALIZATION NOTE(childPayloadN):
+# - %1$S is replaced by the number of the child payload (e.g. “1”, “2”)
 childPayloadN = Child Payload %1$S
-
 timestampHeader = timestamp
-
 categoryHeader = category
-
 methodHeader = method
-
 objectHeader = object
-
 extraHeader = extra
--- a/toolkit/chrome/global/aboutUrlClassifier.dtd
+++ b/toolkit/chrome/global/aboutUrlClassifier.dtd
@@ -3,16 +3,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!-- LOCALIZATION NOTE the term "url-classifier" should not be translated. -->
 <!ENTITY aboutUrlClassifier.pageTitle                   "Information about the url-classifier">
 <!ENTITY aboutUrlClassifier.providerTitle               "Provider">
 <!ENTITY aboutUrlClassifier.provider                    "Provider">
 <!ENTITY aboutUrlClassifier.providerLastUpdateTime      "Last update time">
 <!ENTITY aboutUrlClassifier.providerNextUpdateTime      "Next update time">
+<!ENTITY aboutUrlClassifier.providerBackOffTime         "Back-off time">
 <!ENTITY aboutUrlClassifier.providerLastUpdateStatus    "Last update status">
 <!ENTITY aboutUrlClassifier.providerUpdateBtn           "Update">
 <!ENTITY aboutUrlClassifier.cacheTitle                  "Cache">
 <!ENTITY aboutUrlClassifier.cacheRefreshBtn             "Refresh">
 <!ENTITY aboutUrlClassifier.cacheClearBtn               "Clear">
 <!ENTITY aboutUrlClassifier.cacheTableName              "Table name">
 <!ENTITY aboutUrlClassifier.cacheNCacheEntries          "Number of negative cache entries">
 <!ENTITY aboutUrlClassifier.cachePCacheEntries          "Number of positive cache entries">
--- a/toolkit/chrome/global/aboutWebrtc.properties
+++ b/toolkit/chrome/global/aboutWebrtc.properties
@@ -57,16 +57,18 @@ rtp_stats_heading = RTP Stats
 # LOCALIZATION NOTE (ice_state, ice_stats_heading): "ICE" is an abbreviation
 # for Interactive Connectivity Establishment, which is an IETF protocol,
 # and should not normally be translated. "Stats" is an abbreviation for
 # Statistics.
 ice_state = ICE State
 ice_stats_heading = ICE Stats
 ice_restart_count_label = ICE restarts
 ice_rollback_count_label = ICE rollbacks
+ice_pair_bytes_sent = Bytes sent
+ice_pair_bytes_received = Bytes received
 
 # LOCALIZATION NOTE (av_sync_label): "A/V" stands for Audio/Video.
 # "sync" is an abbreviation for sychronization. This is used as
 # a data label.
 av_sync_label = A/V sync
 
 # LOCALIZATION NOTE (jitter_buffer_delay_label): A jitter buffer is an
 # element in the processing chain, see http://wikipedia.org/wiki/Jitter
--- a/toolkit/chrome/global/extensions.properties
+++ b/toolkit/chrome/global/extensions.properties
@@ -22,8 +22,10 @@ csp.error.illegal-host-wildcard = %2$S: wildcard sources in ‘%1$S’ directives must include at least one non-generic sub-domain (e.g., *.example.com rather than *.com)
 #LOCALIZATION NOTE (uninstall.confirmation.title) %S is the name of the extension which is about to be uninstalled.
 uninstall.confirmation.title = Uninstall %S
 
 #LOCALIZATION NOTE (uninstall.confirmation.message) %S is the name of the extension which is about to be uninstalled.
 uninstall.confirmation.message = The extension “%S” is requesting to be uninstalled. What would you like to do?
 
 uninstall.confirmation.button-0.label = Uninstall
 uninstall.confirmation.button-1.label = Keep Installed
+
+saveaspdf.saveasdialog.title = Save As
deleted file mode 100644
--- a/toolkit/chrome/global/headsUpDisplay.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
-# LOCALIZATION NOTE (stacktrace.anonymousFunction):
-# This string is used to display JavaScript functions that have no given name -
-# they are said to be anonymous. See stacktrace.outputMessage.
-stacktrace.anonymousFunction=<anonymous>
-
-# LOCALIZATION NOTE (stacktrace.outputMessage):
-# This string is used in the Web Console output to identify a web developer call
-# to console.trace(). The stack trace of JavaScript function calls is displayed.
-# In this minimal message we only show the last call.
-stacktrace.outputMessage=Stack trace from %S, function %S, line %S.
--- a/toolkit/chrome/global/mozilla.dtd
+++ b/toolkit/chrome/global/mozilla.dtd
@@ -1,11 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY mozilla.title.15.1 "The Book of Mozilla, 15:1">
+<!ENTITY mozilla.title.11.14
+'The Book of Mozilla, 11:14'>
 
-<!ENTITY mozilla.quote.15.1 "The <em>twins</em> of Mammon quarrelled. Their warring plunged the world into a <em>new darkness</em>, and the beast 
-abhorred the darkness. So it began to move <em>swiftly</em>, and grew more powerful, and went forth and multiplied. 
-And the beasts brought <em>fire</em> and light to the darkness.">
+<!ENTITY mozilla.quote.11.14
+'The Beast adopted <em>new raiment</em> and studied the ways of <em>Time</em> and <em>Space</em> 
+and <em>Light</em> and the <em>Flow</em> of energy through the Universe. From its studies, 
+the Beast fashioned new structures from <em>oxidised metal</em> and proclaimed their glories. 
+And the Beast’s followers rejoiced, finding renewed purpose in these <em>teachings</em>.'>
 
-<!ENTITY mozilla.from.15.1 "from <strong>The Book of Mozilla,</strong> 15:1">
+<!ENTITY mozilla.from.11.14
+'from <strong>The Book of Mozilla,</strong> 11:14'>
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -253,13 +253,12 @@ some of the best and most popular add-on
      being a link to an external site. -->
 <!ENTITY disabledUnsigned.devInfo.start "Developers interested in getting their add-ons verified can continue by reading our ">
 <!ENTITY disabledUnsigned.devInfo.linkToManual "manual">
 <!ENTITY disabledUnsigned.devInfo.end ".">
 
 <!ENTITY pluginDeprecation.description "Missing something? Some plugins are no longer supported by &brandShortName;.">
 <!ENTITY pluginDeprecation.learnMore "Learn More.">
 
-<!ENTITY legacyWarning.description "Missing something? Some extensions are no longer supported by &brandShortName;.">
 <!ENTITY legacyWarning.showLegacy "Show legacy extensions">
 <!ENTITY legacyExtensions.title "Legacy Extensions">
 <!ENTITY legacyExtensions.description "These extensions do not meet current &brandShortName; standards so they have been deactivated.">
 <!ENTITY legacyExtensions.learnMore "Learn about the changes to add-ons">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -177,16 +177,21 @@ addon.purchase.tooltip=Visit the add-ons
 # view, %S is the price of the add-on including currency symbol
 cmd.purchaseAddon.label=Purchase for %S…
 cmd.purchaseAddon.accesskey=u
 
 #LOCALIZATION NOTE (eulaHeader) %S is name of the add-on asking the user to agree to the EULA
 eulaHeader=%S requires that you accept the following End User Licence Agreement before installation can proceed:
 
 type.extension.name=Extensions
-type.theme.name=Appearance
+type.themes.name=Themes
 type.locale.name=Languages
 type.plugin.name=Plugins
 type.dictionary.name=Dictionaries
 type.service.name=Services
 type.experiment.name=Experiments
 type.legacy.name=Legacy Extensions
 type.unsupported.name=Unsupported
+
+#LOCALIZATION NOTE(legacyWarning.description) %S is the brandShortName
+legacyWarning.description=Missing something? Some extensions are no longer supported by %S.
+#LOCALIZATION NOTE(legacyThemeWarning.description) %S is the brandShortName
+legacyThemeWarning.description=Missing something? Some themes are no longer supported by %S.
deleted file mode 100644
--- a/toolkit/chrome/mozapps/extensions/update.dtd
+++ /dev/null
@@ -1,65 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY  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/extensions/update.properties
+++ b/toolkit/chrome/mozapps/extensions/update.properties
@@ -1,21 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-mismatchCheckNow=Check Now
-mismatchCheckNowAccesskey=C
-mismatchDontCheck=Don't Check
-mismatchDontCheckAccesskey=D
-installButtonText=Install Now
-installButtonTextAccesskey=I
-nextButtonText=Next >
-nextButtonTextAccesskey=N
-cancelButtonText=Cancel
-cancelButtonTextAccesskey=C
-statusPrefix=Finished checking %S
-downloadingPrefix=Downloading: %S
-installingPrefix=Installing: %S
-closeButton=Close
-installErrors=%S was unable to install updates for the following add-ons:
-checkingErrors=%S was unable to check for updates for the following add-ons:
-installErrorItemFormat=%S (%S)
+# LOCALIZATION NOTE (addonUpdateHeader)
+# %S will be replace with the localized name of the application
+addonUpdateTitle=%S Update
+
+# LOCALIZATION NOTE (addonUpdateMessage)
+# %S will be replace with the localized name of the application
+addonUpdateMessage=%S is updating your extensions…
+
+addonUpdateCancelMessage=Still updating. Want to wait?
+
+# LOCALIZATION NOTE (addonUpdateCancelButton)
+# %S will be replace with the localized name of the application
+addonUpdateCancelButton=Stop update and launch %S
--- a/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
+++ b/toolkit/chrome/mozapps/extensions/xpinstallConfirm.properties
@@ -1,11 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-unverified=(Author not verified)
-signed=(%S)
-
 itemWarnIntroMultiple=You have asked to install the following %S items:
 itemWarnIntroSingle=You have asked to install the following item:
 installButtonDisabledLabel=Install (%S)
 installButtonLabel=Install Now
--- a/toolkit/chrome/mozapps/update/history.dtd
+++ b/toolkit/chrome/mozapps/update/history.dtd
@@ -1,15 +1,15 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY  history.title             "Update History">
-<!ENTITY  history.intro             "The following updates have been installed:">
+<!ENTITY  history2.intro            "The following updates have been installed">
 <!ENTITY  closebutton.label         "Close">
                                      
 <!ENTITY  noupdates.label           "No updates installed yet">
 
 <!ENTITY  name.header               "Update Name">
 <!ENTITY  date.header               "Install Date">
 <!ENTITY  type.header               "Type">
 <!ENTITY  state.header              "State">
--- a/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -54,17 +54,17 @@ hidePasswords=Hide Passwords
 hidePasswordsAccessKey=P
 showPasswords=Show Passwords
 showPasswordsAccessKey=P
 noMasterPasswordPrompt=Are you sure you wish to show your passwords?
 removeAllPasswordsPrompt=Are you sure you wish to remove all passwords?
 removeAllPasswordsTitle=Remove all passwords
 removeLoginPrompt=Are you sure you wish to remove this login?
 removeLoginTitle=Remove login
-loginsDescriptionAll=Logins for the following sites are stored on your computer:
+loginsDescriptionAll2=Logins for the following sites are stored on your computer
 loginsDescriptionFiltered=The following logins match your search:
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
 loginHostAge=%1$S (%2$S)
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=No username