Bug 1180656 - Update en-GB for Gecko 40 - Toolkit part r=me
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 07 Jul 2015 12:47:24 +0100
changeset 512 6016293c0df9ab5003c51301febe52d63f23d6a0
parent 511 a7069a8f5e76f2a2cc17b9972527af6502fdeae5
child 513 6b4e30af3de01a2b4e443bb1f8d6fd7d42f3d712
push id102
push useriann_cvs@blueyonder.co.uk
push dateTue, 07 Jul 2015 11:49:20 +0000
reviewersme
bugs1180656
Bug 1180656 - Update en-GB for Gecko 40 - Toolkit part r=me
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/netError.dtd
dom/chrome/security/csp.properties
security/manager/chrome/pipnss/pipnss.properties
toolkit/chrome/global/aboutServiceWorkers.dtd
toolkit/chrome/global/aboutServiceWorkers.properties
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/console.properties
toolkit/chrome/global/devtools/gcli.properties
toolkit/chrome/global/devtools/gclicommands.properties
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/places/places.properties
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -24,13 +24,14 @@ contentEncodingError=The page you are tr
 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the web site owners to inform them of this problem.
 externalProtocolTitle=External Protocol Request
 externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Unknown>
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
+unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 phishingBlocked=The web site at %S has been reported as a web forgery designed to trick users into sharing personal or financial information.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentError=The page you are trying to view cannot be shown because an error in the data transmission was detected.
 remoteXUL=This page uses an unsupported technology that is no longer available by default.
 sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol.
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -158,8 +158,12 @@ Window_ControllersWarning=window.control
 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 (WillChangeBudgetWarning): Do not translate Will-change, %1$S,%2$S,%3$S are numbers.
 WillChangeBudgetWarning=Will-change memory consumption is too high. Surface area covers %1$S pixels, budget is the document surface area multiplied by %2$S (%3$S pixels). All occurences of will-change in the document are ignored when over budget.
 # LOCALIZATION NOTE: Do not translate "ServiceWorker".
 HittingMaxWorkersPerDomain=A ServiceWorker could not be started immediately because other documents in the same origin are already using the maximum number of workers. The ServiceWorker is now queued and will be started after some of the other workers have completed.
+# LOCALIZATION NOTE: Do no translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"
+PannerNodeDopplerWarning=Use of setVelocity on the PannerNode and AudioListener, and speedOfSound and dopplerFactor on the AudioListener are deprecated and those members will be removed. For more help https://developer.mozilla.org/en-US/docs/Web/API/AudioListener#Deprecated_features
+# LOCALIZATION NOTE: Do not translate "Worker".
+EmptyWorkerSourceWarning=Attempting to create a Worker from an empty source. This is probably unintentional.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -1,162 +1,108 @@
 <!-- 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 loadError.label "Page Load Error">
 <!ENTITY retry.label "Try Again">
+
 <!-- Specific error messages -->
 
-
 <!ENTITY connectionFailure.title "Failed to Connect">
-<!ENTITY connectionFailure.longDesc "<p>Though the site seems valid, the browser was unable to establish a connection.</p> 
-<ul> 
-<li>Could the site be temporarily unavailable? Try again later.</li> 
-<li>Are you unable to browse other sites?  Check the computer's network connection.</li> 
-<li>Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.</li> 
-</ul>">
+<!ENTITY connectionFailure.longDesc "<p>Though the site seems valid, the browser was unable to establish a connection.</p><ul><li>Could the site be temporarily unavailable? Try again later.</li><li>Are you unable to browse other sites?  Check the computer's network connection.</li><li>Is your computer or network protected by a firewall or proxy? Incorrect settings can interfere with Web browsing.</li></ul>">
 
 <!ENTITY deniedPortAccess.title "Port Restricted for Security Reasons">
-<!ENTITY deniedPortAccess.longDesc "<p>The requested address specified a port (e.g. <q>mozilla.org:80</q> for port 80 on mozilla.org) normally used for 
-purposes <em>other</em> than Web browsing. The browser has cancelled the request for your protection and security.</p>">
+<!ENTITY deniedPortAccess.longDesc "<p>The requested address specified a port (e.g. <q>mozilla.org:80</q> for port 80 on mozilla.org) normally used for purposes <em>other</em> than Web browsing. The browser has cancelled the request for your protection and security.</p>">
 
 <!ENTITY dnsNotFound.title "Address Not Found">
-<!ENTITY dnsNotFound.longDesc "<p>The browser could not find the host server for the provided address.</p> 
-<ul> 
-<li>Did you make a mistake when typing the domain? (e.g. <q><strong>ww</strong>.mozilla.org</q> instead of 
-<q><strong>www</strong>.mozilla.org</q>)</li> 
-<li>Are you certain this domain address exists?  Its registration may have expired.</li> 
-<li>Are you unable to browse other sites?  Check your network connection and DNS server settings.</li> 
-<li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li> 
-</ul>">
+<!ENTITY dnsNotFound.longDesc "<p>The browser could not find the host server for the provided address.</p><ul><li>Did you make a mistake when typing the domain? (e.g. <q><strong>ww</strong>.mozilla.org</q> instead of <q><strong>www</strong>.mozilla.org</q>)</li><li>Are you certain this domain address exists?  Its registration may have expired.</li><li>Are you unable to browse other sites?  Check your network connection and DNS server settings.</li><li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li></ul>">
 
 <!ENTITY fileNotFound.title "File Not Found">
-<!ENTITY fileNotFound.longDesc "<ul> 
-<li>Could the item have been renamed, removed, or relocated?</li> 
-<li>Is there a spelling, capitalisation, or other typographical error in the address?</li> 
-<li>Do you have sufficient access permissions to the requested item?</li> 
-</ul>">
+<!ENTITY fileNotFound.longDesc "<ul><li>Could the item have been renamed, removed, or relocated?</li><li>Is there a spelling, capitalisation, or other typographical error in the address?</li><li>Do you have sufficient access permissions to the requested item?</li></ul>">
 
 <!ENTITY generic.title "Cannot Complete Request">
 <!ENTITY generic.longDesc "<p>Additional information about this problem or error is currently unavailable.</p>">
 
 <!ENTITY malformedURI.title "Invalid Address">
-<!ENTITY malformedURI.longDesc "<p>The provided address is not in a recognised format. Please check the location bar 
-for mistakes and try again.</p>">
+<!ENTITY malformedURI.longDesc "<p>The provided address is not in a recognised format. Please check the location bar for mistakes and try again.</p>">
 
 <!ENTITY netInterrupt.title "Data Transfer Interrupted">
-<!ENTITY netInterrupt.longDesc "<p>The browser connected successfully, but the connection was interrupted while 
-transferring information.  Please try again.</p> 
-<ul> 
-<li>Are you unable to browse other sites? Check the computer's network connection.</li> 
-<li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li> 
-</ul>">
+<!ENTITY netInterrupt.longDesc "<p>The browser connected successfully, but the connection was interrupted while transferring information.  Please try again.</p><ul><li>Are you unable to browse other sites? Check the computer's network connection.</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY notCached.title "Document Expired">
-<!ENTITY notCached.longDesc "<p>The requested document is not available in the browser's cache.</p> 
-<ul> 
-<li>As a security precaution, the browser does not automatically re-request sensitive documents.</li> 
-<li>Click Try Again to re-request the document from the website.</li></ul>">
+<!ENTITY notCached.longDesc "<p>The requested document is not available in the browser's cache.</p><ul><li>As a security precaution, the browser does not automatically re-request sensitive documents.</li><li>Click Try Again to re-request the document from the website.</li></ul>">
 
 <!ENTITY netOffline.title "Offline Mode">
-<!ENTITY netOffline.longDesc2 "<p>The browser is operating in its offline mode and cannot connect to the requested item.</p> 
-<ul> 
-<li>Is the computer connected to an active network?</li> 
-<li>Press &quot;Try Again&quot; to switch to online mode and reload the page.</li> 
-</ul>">
+<!ENTITY netOffline.longDesc2 "<p>The browser is operating in its offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Press &quot;Try Again&quot; to switch to online mode and reload the page.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Content Encoding Error">
-<!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be 
-shown because it uses an invalid or unsupported form of compression.</p> 
-<ul> 
-<li>Please contact the web site owners to inform them of this problem.</li> 
-</ul>">
+<!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
 
 <!ENTITY unsafeContentType.title "Unsafe File Type">
-<!ENTITY unsafeContentType.longDesc "<ul> 
-<li>Please contact the web site owners to inform them of this problem.</li> 
-</ul>">
+<!ENTITY unsafeContentType.longDesc "
+<ul> 
+  <li>Please contact the web site owners to inform them of this problem.</li> 
+</ul>
+">
 
 <!ENTITY netReset.title "Connection Interrupted">
 <!ENTITY netReset.longDesc "<p>The network link was interrupted while negotiating a connection. Please try again.</p>">
 
 <!ENTITY netTimeout.title "Network Timeout">
-<!ENTITY netTimeout.longDesc "<p>The requested site did not respond to a connection request and the browser has stopped waiting for a reply.</p> 
-<ul> 
-<li>Could the server be experiencing high demand or a temporary failure?  Try again later.</li> 
-<li>Are you unable to browse other sites? Check the computer's network connection.</li> 
-<li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li> 
-<li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li> 
-</ul>">
+<!ENTITY netTimeout.longDesc "<p>The requested site did not respond to a connection request and the browser has stopped waiting for a reply.</p><ul><li>Could the server be experiencing high demand or a temporary failure?  Try again later.</li><li>Are you unable to browse other sites? Check the computer's network connection.</li><li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY unknownProtocolFound.title "Unknown Protocol">
-<!ENTITY unknownProtocolFound.longDesc "<p>The address specifies a protocol (e.g. <q>wxyz://</q>) the browser does not recognise, so the browser cannot properly connect to the site.</p> 
-<ul> 
-<li>Are you trying to access multimedia or other non-text services? Check the site for extra requirements.</li> 
-<li>Some protocols may require third-party software or plugins before the browser can recognise them.</li> 
-</ul>">
+<!ENTITY unknownProtocolFound.longDesc "<p>The address specifies a protocol (e.g. <q>wxyz://</q>) the browser does not recognise, so the browser cannot properly connect to the site.</p><ul><li>Are you trying to access multimedia or other non-text services? Check the site for extra requirements.</li><li>Some protocols may require third-party software or plugins before the browser can recognise them.</li></ul>">
 
 <!ENTITY proxyConnectFailure.title "Proxy Server Refused Connection">
-<!ENTITY proxyConnectFailure.longDesc "<p>The browser is configured to use a proxy server, but the proxy refused a connection.</p> 
-<ul> 
-<li>Is the browser's proxy configuration correct? Check the settings and try again.</li> 
-<li>Does the proxy service allow connections from this network?</li> 
-<li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li> 
-</ul>">
+<!ENTITY proxyConnectFailure.longDesc "<p>The browser is configured to use a proxy server, but the proxy refused a connection.</p><ul><li>Is the browser's proxy configuration correct? Check the settings and try again.</li><li>Does the proxy service allow connections from this network?</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY proxyResolveFailure.title "Proxy Server Not Found">
-<!ENTITY proxyResolveFailure.longDesc "<p>The browser is configured to use a proxy server, but the proxy could not be found.</p> 
-<ul> 
-<li>Is the browser's proxy configuration correct? Check the settings and try again.</li> 
-<li>Is the computer connected to an active network?</li> 
-<li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li> 
-</ul>">
+<!ENTITY proxyResolveFailure.longDesc "<p>The browser is configured to use a proxy server, but the proxy could not be found.</p><ul><li>Is the browser's proxy configuration correct? Check the settings and try again.</li><li>Is the computer connected to an active network?</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
 
 <!ENTITY redirectLoop.title "Redirect Loop">
-<!ENTITY redirectLoop.longDesc "<p>The browser has stopped trying to retrieve the requested item. The site is 
-redirecting the request in a way that will never complete.</p> 
-<ul> 
-<li>Have you disabled or blocked cookies required by this site?</li> 
-<li><em>NOTE</em>: If accepting the site's cookies does not resolve the problem, it is probably a server configuration 
-issue and not your computer.</li> 
-</ul>">
+<!ENTITY redirectLoop.longDesc "<p>The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.</p><ul><li>Have you disabled or blocked cookies required by this site?</li><li><em>NOTE</em>: If accepting the site's cookies does not resolve the problem, it is probably a server configuration issue and not your computer.</li></ul>">
 
 <!ENTITY unknownSocketType.title "Incorrect Response">
-<!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and the browser 
-cannot continue.</p>">
+<!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and the browser cannot continue.</p>">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p> 
-<ul> 
-<li>Please contact the web site owners to inform them of this problem.</li> 
-</ul>">
+<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "<ul> 
 <li>This could be a problem with the server's configuration, or it could be someone trying to impersonate the server.</li> 
 <li>If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.</li> 
 </ul>">
 
 <!ENTITY malwareBlocked.title "Suspected Attack Site!">
-<!ENTITY malwareBlocked.longDesc "<p>Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.</p> 
-<p>Web site owners who believe their site has been reported as an attack site in error may <a href='http://www.stopbadware.org/home/reviewinfo' >request a review</a>.</p>">
+<!ENTITY malwareBlocked.longDesc "
+<p>Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.</p> 
+<p>Web site owners who believe their site has been reported as an attack site in error may <a href='http://www.stopbadware.org/home/reviewinfo' >request a review</a>.</p>
+">
+
+<!ENTITY unwantedBlocked.title "Suspected Unwanted Software Site!">
+<!ENTITY unwantedBlocked.longDesc "
+<p>Unwanted software pages try to install software that can be deceptive and affect your system in unexpected ways.</p>
+">
 
 <!ENTITY phishingBlocked.title "Suspected Web Forgery!">
-<!ENTITY phishingBlocked.longDesc "<p>Entering any personal information on this page may result in identity theft or other fraud.</p> 
-<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">
+<!ENTITY phishingBlocked.longDesc "
+<p>Entering any personal information on this page may result in identity theft or other fraud.</p> 
+<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>
+">
 
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>The browser prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentError.title "Corrupted Content Error">
-<!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p> 
-<ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
+<!ENTITY corruptedContentError.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY remoteXUL.title "Remote XUL">
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul></p>">
+
 <!-- Include app-specific error messages - do not change this in localization!
      Some applications might override netErrorApp.dtd with their specific version,
      this inclusion needs to be intact for that approach to work correctly.
      Please, try to keep this at the end of the file. -->
-
 <!ENTITY % netErrorAppDTD SYSTEM "chrome://global/locale/netErrorApp.dtd">
 %netErrorAppDTD;
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -24,16 +24,23 @@ triedToSendReport = Tried to send report
 # %1$S is the report URI that could not be parsed
 couldNotParseReportURI = couldn't parse report URI: %1$S
 # LOCALIZATION NOTE (couldNotProcessUnknownDirective):
 # %1$S is the unknown directive
 couldNotProcessUnknownDirective = Couldn't process unknown directive '%1$S'
 # LOCALIZATION NOTE (ignoringUnknownOption):
 # %1$S is the option that could not be understood
 ignoringUnknownOption = Ignoring unknown option %1$S
+# LOCALIZATION NOTE (ignoringDuplicateSrc):
+# %1$S defines the duplicate src
+ignoringDuplicateSrc = Ignoring duplicate source %1$S
+# LOCALIZATION NOTE (ignoringSrcWithinScriptSrc):
+# %1$S is the ignored src
+# script-src is a directive name and should not be localized
+ignoringSrcWithinScriptSrc = Ignoring "%1$S" within script-src: nonce-source or hash-source specified
 # LOCALIZATION NOTE (reportURInotHttpsOrHttp2):
 # %1$S is the ETLD of the report URI that is not HTTP or HTTPS
 reportURInotHttpsOrHttp2 = The report URI (%1$S) should be an HTTP or HTTPS URI.
 # LOCALIZATION NOTE (reportURInotInReportOnlyHeader):
 # %1$S is the ETLD of the page with the policy
 reportURInotInReportOnlyHeader = This site (%1$S) has a Report-Only policy without a report URI. CSP will not block and cannot report violations of this policy.
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -105,16 +105,20 @@ CertDumpCertPolicies=Certificate Policie
 CertDumpPolicyMappings=Certificate Policy Mappings
 CertDumpPolicyConstraints=Certificate Policy Constraints
 CertDumpAuthKeyID=Certificate Authority Key Identifier
 CertDumpExtKeyUsage=Extended Key Usage
 CertDumpAuthInfoAccess=Authority Information Access
 CertDumpAnsiX9DsaSignature=ANSI X9.57 DSA Signature
 CertDumpAnsiX9DsaSignatureWithSha1=ANSI X9.57 DSA Signature with SHA1 Digest
 CertDumpAnsiX962ECDsaSignatureWithSha1=ANSI X9.62 ECDSA Signature with SHA1
+CertDumpAnsiX962ECDsaSignatureWithSha224=ANSI X9.62 ECDSA Signature with SHA224
+CertDumpAnsiX962ECDsaSignatureWithSha256=ANSI X9.62 ECDSA Signature with SHA256
+CertDumpAnsiX962ECDsaSignatureWithSha384=ANSI X9.62 ECDSA Signature with SHA384
+CertDumpAnsiX962ECDsaSignatureWithSha512=ANSI X9.62 ECDSA Signature with SHA512
 CertDumpKUSign=Signing
 CertDumpKUNonRep=Non-repudiation
 CertDumpKUEnc=Key Encipherment
 CertDumpKUDEnc=Data Encipherment
 CertDumpKUKA=Key Agreement
 CertDumpKUCertSign=Certificate Signer
 CertDumpKUCRLSigner=CRL Signer
 CertDumpCritical=Critical
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutServiceWorkers.dtd
@@ -0,0 +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/. -->
+
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.title                     "About Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.maintitle                 "Registered Service Workers">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_not_enabled       "Service Workers are not enabled.">
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutServiceWorkers.warning_no_serviceworkers "No Service Workers registered.">
new file mode 100644
--- /dev/null
+++ b/toolkit/chrome/global/aboutServiceWorkers.properties
@@ -0,0 +1,36 @@
+# 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/.
+
+title = Origin: %S
+
+# LOCALIZATION NOTE: %1$S is brandShortName, %2$2 is the application ID, and $%$3 is true/false value.
+# LOCALIZATION NOTE: the term "InBrowserElement" should not be translated
+b2gtitle = %1$S Application ID %2$S - InBrowserElement %3$S
+
+scope = Scope:
+
+scriptSpec = Script Spec:
+
+# LOCALIZATION NOTE: the term "Worker" should not be translated.
+currentWorkerURL = Current Worker URL:
+
+activeCacheName = Active Cache Name:
+
+waitingCacheName = Waiting Cache Name:
+
+true = true
+
+false = false
+
+# LOCALIZATION NOTE this term is used as a button label (verb, not noun).
+update = Update
+
+unregister = Unregister
+
+waiting = Waiting…
+
+# LOCALIZATION NOTE: the term "Service Worker" should not translated.
+unregisterError = Failed to unregister this Service Worker.
+
+pushEndpoint = Push Endpoint:
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -49,16 +49,19 @@ This is the Windows- and Mac-specific va
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "Profile Folder">
 
 <!ENTITY aboutSupport.appBasicsEnabledPlugins "Enabled Plugins">
 <!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
 <!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Memory Use">
 
+<!-- LOCALIZATION NOTE the term "Service Workers" should not be translated. -->
+<!ENTITY aboutSupport.appBasicsServiceWorkers "Registered Service Workers">
+
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
 
 <!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
 "Finder" terminology on Mac. -->
 <!ENTITY aboutSupport.showMac.label "Show in Finder">
 <!-- LOCALIZATION NOTE (aboutSupport.showWin.label): This is the Windows-specific
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -32,16 +32,18 @@ pendingReports=All Crash Reports (includ
 # 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
 
+supportsHardwareH264 = Supports Hardware H264 Decoding
+
 # LOCALIZATION NOTE (rawDataCopied) Text displayed in a mobile "Toast" to user when the
 # raw data is successfully copied to the clipboard via button press.
 rawDataCopied=Raw data copied to clipboard
 
 # LOCALIZATION NOTE (textCopied) Text displayed in a mobile "Toast" to user when the
 # text is successfully copied to the clipboard via button press.
 textCopied=Text copied to clipboard
 
@@ -91,14 +93,15 @@ canSandboxContent = Content Process Sand
 canSandboxMedia = Media Plugin Sandboxing
 
 # LOCALIZATION NOTE %1$S and %2$S will be replaced with the number of remote and the total number
 # of windows, respectively, while %3$S will indicate whether windows are remote by default ('true'
 # or 'false')
 multiProcessStatus = %1$S/%2$S (default: %3$S)
 
 asyncPanZoom = Asynchronous Pan/Zoom
+apzNone = none
 wheelEnabled = wheel input enabled
 touchEnabled = touch input 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
--- a/toolkit/chrome/global/console.properties
+++ b/toolkit/chrome/global/console.properties
@@ -1,14 +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/.
 
 typeError=Error:
 typeWarning=Warning:
+typeMessage=Message:
 errFile=Source File: %S
 errLine=Line: %S
 errLineCol=Line: %S, Column: %S
 errCode=Source Code:
 errTime=Timestamp: %S
 
 # LOCALIZATION NOTE (evaluationContextChanged): The message displayed when the
 # browser console's evaluation context (window against which input is evaluated)
rename from browser/chrome/browser/devtools/gcli.properties
rename to toolkit/chrome/global/devtools/gcli.properties
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/toolkit/chrome/global/devtools/gcli.properties
@@ -46,17 +46,17 @@ cliEvalJavascript=Enter JavaScript direc
 cliUnusedArg=Too many arguments
 
 # LOCALIZATION NOTE: The title of the dialog which displays the options that
 # are available to the current command.
 cliOptions=Available Options
 
 # LOCALIZATION NOTE: The error message when the user types a command that
 # isn't registered
-cliUnknownCommand=Invalid Command
+cliUnknownCommand2=Invalid Command: '%1$S'.
 
 # LOCALIZATION NOTE: A parameter should have a value, but doesn't
 cliIncompleteParam=Value required for '%1$S'.
 
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that does not exist, but should (e.g. for use with File->Open) %1$S is a
 # filename
 fileErrNotExists='%1$S' doesn't exist
rename from browser/chrome/browser/devtools/gclicommands.properties
rename to toolkit/chrome/global/devtools/gclicommands.properties
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/toolkit/chrome/global/devtools/gclicommands.properties
@@ -77,16 +77,20 @@ screenshotChromeDesc2=Capture %1$S chrom
 # asks for help on what it does.
 # The argument (%1$S) is the browser name.
 screenshotChromeManual2=True if you want to take the screenshot of the %1$S window rather than the web page's content window.
 
 # LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
 # the screenshot command.
 screenshotGroupOptions=Options
 
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the advanced options of
+# the screenshot command.
+screenshotAdvancedOptions=Advanced Options
+
 # LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
 # the 'delay' parameter to the 'screenshot' command, which is displayed in
 # a dialog when the user is using this command.
 screenshotDelayDesc=Delay (seconds)
 
 # LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
 # 'delay' parameter to the 'screenshot' command, displayed when the user
 # asks for help on what it does.
@@ -127,16 +131,35 @@ screenshotErrorCopying=Error occurred wh
 
 # LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
 # screenshot is successfully copied to the clipboard.
 screenshotCopied=Copied to clipboard.
 
 # LOCALIZATION NOTE (screenshotTooltip) Text displayed as tooltip for screenshot button in devtools ToolBox.
 screenshotTooltip=Take a fullpage screenshot
 
+# LOCALIZATION NOTE (screenshotImgurDesc) A very short string to describe
+# the 'imgur' parameter to the 'screenshot' command, which is displayed in
+# a dialog when the user is using this command.
+screenshotImgurDesc=Upload to imgur.com
+
+# LOCALIZATION NOTE (screenshotImgurManual) A fuller description of the
+# 'imgur' parameter to the 'screenshot' command, displayed when the user
+# asks for help on what it does.
+screenshotImgurManual=Use if you want to upload to imgur.com instead of saving to disk
+
+# LOCALIZATION NOTE (screenshotImgurError) Text displayed to user upon
+# encountering error while uploading the screenshot to imgur.com.
+screenshotImgurError=Could not reach imgur API
+
+# LOCALIZATION NOTE (screenshotImgurUploading) Text displayed to user when the
+# screenshot is successfully sent to Imgur but the program is waiting on a response.
+# The argument (%1$S) is a new image URL at Imgur.
+screenshotImgurUploaded=Uploaded to %1$S
+
 # LOCALIZATION NOTE (highlightDesc) A very short description of the
 # 'highlight' command. See highlightManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 highlightDesc=Highlight nodes
 
 # LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
 # command, displayed when the user asks for help on what it does.
@@ -1523,8 +1546,22 @@ folderOpenProfileDesc=Open profile direc
 # LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
 # of the 'folder open' command with an invalid folder path.
 folderInvalidPath=Please enter a valid path
 
 # LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
 # describe the result of the 'folder open' command.
 # The argument (%1$S) is the folder path.
 folderOpenDirResult=Opened %1$S
+
+# LOCALIZATION NOTE (rulersDesc) A very short description of the
+# 'rulers' command. See rulersManual for a fuller description of what
+# it does. This string is designed to be shown in a menu alongside the
+# command name, which is why it should be as short as possible.
+rulersDesc=Toggle rulers for the page
+
+# LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
+# command, displayed when the user asks for help on what it does.
+rulersManual=Toggle the horizontal and vertical rulers for the current page
+
+# LOCALIZATION NOTE (rulersTooltip) A string displayed as the
+# tooltip of button in devtools toolbox which toggles the rulers.
+rulersTooltip=Toggle rulers for the page
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -99,16 +99,24 @@ ruleView.contextmenu.copyColor.accessKey
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources): Text displayed in the rule view
 # context menu.
 ruleView.contextmenu.showOrigSources=Show original sources
 
 # LOCALIZATION NOTE (ruleView.contextmenu.showOrigSources.accessKey): Access key for
 # the rule view context menu "Show original sources" entry.
 ruleView.contextmenu.showOrigSources.accessKey=o
 
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs): Text displayed in the rule view
+# context menu to display docs from MDN for an item.
+ruleView.contextmenu.showMdnDocs=Show MDN docs
+
+# LOCALIZATION NOTE (ruleView.contextmenu.showMdnDocs.accessKey): Access key for
+# the rule view context menu "Show MDN docs" entry.
+ruleView.contextmenu.showMdnDocs.accessKey=D
+
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule): Text displayed in the
 # rule view context menu for adding a new rule to the element.
 ruleView.contextmenu.addRule=Add rule
 
 # LOCALIZATION NOTE (ruleView.contextmenu.addRule.accessKey): Access key for
 # the rule view context menu "Add rule" entry.
 ruleView.contextmenu.addRule.accessKey=r
 
--- a/toolkit/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/chrome/mozapps/extensions/extensions.dtd
@@ -18,16 +18,19 @@
 <!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">
 
 <!ENTITY cmd.back.tooltip                     "Go back one page">
 <!ENTITY cmd.forward.tooltip                  "Go forwards one page">
 
+<!ENTITY showUnsignedExtensions.button.label  "Some extensions could not be verified">
+<!ENTITY showAllExtensions.button.label       "Show all extensions">
+
 <!-- 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">
@@ -98,16 +101,17 @@
 <!ENTITY cmd.neverActivate.label              "Never Activate">
 <!ENTITY cmd.neverActivate.tooltip            "Never use this add-on">
 <!ENTITY cmd.stateMenu.tooltip                "Change when this add-on runs">
 <!ENTITY cmd.installAddon.label               "Install">
 <!ENTITY cmd.installAddon.accesskey           "I">
 <!ENTITY cmd.uninstallAddon.label             "Remove">
 <!ENTITY cmd.uninstallAddon.accesskey         "R">
 <!ENTITY cmd.debugAddon.label                 "Debug">
+<!ENTITY cmd.debugAddon.accesskey             "b">
 <!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">
 
@@ -226,8 +230,23 @@ some of the best and most popular add-on
      to cause this tab to appear. -->
 <!ENTITY experiment.info.label "What's this? Telemetry may install and run experiments from time to time.">
 <!ENTITY experiment.info.learnmore "Learn More">
 <!ENTITY experiment.info.learnmore.accesskey "L">
 <!ENTITY experiment.info.changetelemetry "Telemetry Settings">
 <!ENTITY experiment.info.changetelemetry.accesskey "T">
 
 <!ENTITY setting.learnmore "Learn More…">
+
+<!ENTITY disabledUnsigned.heading "Some add-ons have been disabled">
+<!-- LOCALIZATION NOTE (disabledUnsigned.description.start, disabledUnsigned.description.findAddonsLink, disabledUnsigned.description.end):
+     These entities form a sentence, with
+     disabledUnsigned.description.findAddonsLink being a link to an external site. -->
+<!ENTITY disabledUnsigned.description.start "The following add-ons have not been verified for use in &brandShortName;. You can ">
+<!ENTITY disabledUnsigned.description.findAddonsLink "find replacements">
+<!ENTITY disabledUnsigned.description.end " or ask the developer to get them verified.">
+<!ENTITY disabledUnsigned.learnMore "Learn more about our efforts to help keep you safe online.">
+<!-- LOCALIZATION NOTE (disabledUnsigned.devInfo.start, disabledUnsigned.devInfo.linkToManual, disabledUnsigned.devInfo.end):
+     These entities form a sentence, with disabledUnsigned.devInfo.linkToManual
+     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 ".">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -18,16 +18,20 @@ uninstallNotice=%S has been removed.
 # #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
 
 #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.unsigned, notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+notification.unsigned.link=More Information
 #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.
@@ -69,16 +73,20 @@ installVerifying=Verifying
 installInstalling=Installing
 installEnablePending=Restart to enable
 installDisablePending=Restart to disable
 installFailed=Error installing
 installCancelled=Install cancelled
 
 #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.unsigned, details.notification.unsignedAndDisabled) %1$S is the add-on name, %2$S is brand name
+details.notification.unsignedAndDisabled=%1$S could not be verified for use in %2$S and has been disabled.
+details.notification.unsigned=%1$S could not be verified for use in %2$S. Proceed with caution.
+details.notification.unsigned.link=More Information
 #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.
--- a/toolkit/chrome/places/places.properties
+++ b/toolkit/chrome/places/places.properties
@@ -24,13 +24,8 @@ finduri-MonthYear=%1$S %2$S
 # This is used to generate local files container when history is grouped by site
 localhost=(local files)
 
 # LOCALIZATION NOTE
 # The string is used for showing file size of each backup in the "fileRestorePopup" popup
 # %1$S is the file size
 # %2$S is the file size unit
 backupFileSizeText=%1$S %2$S
-
-# LOCALIZATION NOTE (windows8TouchTitle): this is the name of the folder used
-# to store bookmarks created in Metro mode and share bookmarks between Metro
-# and Desktop.
-windows8TouchTitle=Windows 8 Touch