[en-GB] update from Pootle (firefox)
authoren-GB team [Pootle] <https://wiki.mozilla.org/L10n:Teams:en-GB>
Fri, 07 Nov 2014 14:58:29 +0000
changeset 442 1736e29a7d9308c00bbfc5239fc9e3cd812f9ae7
parent 441 baafa8ae5a232fc942c0158940bde52d5d654cc5
child 443 d069802a8dc7e2d816be0db4f62b0dcdfd2f769e
push id85
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 11 Nov 2014 19:21:28 +0000
[en-GB] update from Pootle (firefox)
browser/chrome/browser/aboutCertError.dtd
browser/chrome/browser/aboutDialog.dtd
browser/chrome/browser/aboutHealthReport.dtd
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/aboutRobots.dtd
browser/chrome/browser/aboutSessionRestore.dtd
browser/chrome/browser/aboutSyncTabs.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/devtools/VariablesView.dtd
browser/chrome/browser/devtools/canvasdebugger.dtd
browser/chrome/browser/devtools/connection-screen.dtd
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/font-inspector.dtd
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/inspector.dtd
browser/chrome/browser/devtools/inspector.properties
browser/chrome/browser/devtools/layoutview.dtd
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/projecteditor.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/shadereditor.dtd
browser/chrome/browser/devtools/sourceeditor.dtd
browser/chrome/browser/devtools/sourceeditor.properties
browser/chrome/browser/devtools/storage.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/styleinspector.dtd
browser/chrome/browser/devtools/tilt.properties
browser/chrome/browser/devtools/timeline.dtd
browser/chrome/browser/devtools/timeline.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webaudioeditor.dtd
browser/chrome/browser/devtools/webaudioeditor.properties
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/devtools/webide.dtd
browser/chrome/browser/devtools/webide.properties
browser/chrome/browser/downloads/downloads.dtd
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/engineManager.dtd
browser/chrome/browser/engineManager.properties
browser/chrome/browser/feeds/subscribe.dtd
browser/chrome/browser/feeds/subscribe.properties
browser/chrome/browser/loop/loop.properties
browser/chrome/browser/newTab.dtd
browser/chrome/browser/openLocation.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/places/moveBookmarks.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/aboutPermissions.dtd
browser/chrome/browser/preferences/aboutPermissions.properties
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/fonts.dtd
browser/chrome/browser/preferences/main.dtd
browser/chrome/browser/preferences/preferences.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/privacy.dtd
browser/chrome/browser/preferences/security.dtd
browser/chrome/browser/preferences/selectBookmark.dtd
browser/chrome/browser/preferences/sync.dtd
browser/chrome/browser/safeMode.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/shellservice.properties
browser/chrome/browser/syncCustomize.dtd
browser/chrome/browser/syncGenericChange.properties
browser/chrome/browser/syncProgress.dtd
browser/chrome/browser/syncSetup.dtd
browser/chrome/browser/syncSetup.properties
browser/chrome/browser/tabbrowser.dtd
browser/chrome/browser/translation.dtd
browser/chrome/browser/translation.properties
browser/chrome/overrides/netError.dtd
browser/chrome/overrides/settingsChange.dtd
browser/crashreporter/crashreporter-override.ini
browser/defines.inc
browser/pdfviewer/viewer.properties
browser/profile/bookmarks.inc
browser/profile/chrome/userContent-example.css
browser/updater/updater.ini
dom/chrome/accessibility/AccessFu.properties
dom/chrome/layout/HtmlForm.properties
dom/chrome/layout/MediaDocument.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/printing.properties
dom/chrome/layout/xmlparser.properties
dom/chrome/netError.dtd
dom/chrome/netErrorApp.dtd
dom/chrome/security/csp.properties
dom/chrome/security/security.properties
dom/chrome/svg/svg.properties
dom/chrome/xml/prettyprint.dtd
dom/chrome/xslt/xslt.properties
netwerk/necko.properties
security/manager/chrome/pipnss/nsserrors.properties
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
services/sync/errors.properties
services/sync/sync.properties
toolkit/chrome/alerts/notificationNames.properties
toolkit/chrome/global-platform/mac/platformKeys.properties
toolkit/chrome/global-platform/unix/platformKeys.properties
toolkit/chrome/global-platform/win/platformKeys.properties
toolkit/chrome/global/about.dtd
toolkit/chrome/global/aboutAbout.dtd
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/aboutSupport.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/appPicker.dtd
toolkit/chrome/global/autocomplete.properties
toolkit/chrome/global/charsetMenu.dtd
toolkit/chrome/global/charsetMenu.properties
toolkit/chrome/global/config.dtd
toolkit/chrome/global/datetimepicker.dtd
toolkit/chrome/global/devtools/csscoverage.dtd
toolkit/chrome/global/devtools/styleinspector.properties
toolkit/chrome/global/dialogOverlay.dtd
toolkit/chrome/global/editMenuOverlay.dtd
toolkit/chrome/global/findbar.dtd
toolkit/chrome/global/finddialog.dtd
toolkit/chrome/global/finddialog.properties
toolkit/chrome/global/languageNames.properties
toolkit/chrome/global/mozilla.dtd
toolkit/chrome/global/notification.dtd
toolkit/chrome/global/printPageSetup.dtd
toolkit/chrome/global/printPreviewProgress.dtd
toolkit/chrome/global/printProgress.dtd
toolkit/chrome/global/printdialog.dtd
toolkit/chrome/global/printjoboptions.dtd
toolkit/chrome/global/regionNames.properties
toolkit/chrome/global/resetProfile.dtd
toolkit/chrome/global/resetProfile.properties
toolkit/chrome/global/videocontrols.dtd
toolkit/chrome/global/viewSource.dtd
toolkit/chrome/global/webapps.properties
toolkit/chrome/global/xpinstall/xpinstall.properties
toolkit/chrome/mozapps/downloads/downloads.dtd
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/chrome/mozapps/downloads/settingsChange.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/extensions/extensions.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/extensions/newaddon.dtd
toolkit/chrome/mozapps/extensions/update.dtd
toolkit/chrome/mozapps/extensions/xpinstallConfirm.dtd
toolkit/chrome/mozapps/handling/handling.dtd
toolkit/chrome/mozapps/handling/handling.properties
toolkit/chrome/mozapps/help/help.dtd
toolkit/chrome/mozapps/plugins/plugins.dtd
toolkit/chrome/mozapps/plugins/plugins.properties
toolkit/chrome/mozapps/preferences/preferences.properties
toolkit/chrome/mozapps/profile/createProfileWizard.dtd
toolkit/chrome/mozapps/profile/profileSelection.dtd
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/chrome/mozapps/update/updates.dtd
toolkit/chrome/mozapps/update/updates.properties
toolkit/crashreporter/crashes.dtd
toolkit/crashreporter/crashes.properties
toolkit/crashreporter/crashreporter.ini
toolkit/defines.inc
webapprt/webapprt/downloads/downloads.dtd
webapprt/webapprt/getUserMediaDialog.dtd
webapprt/webapprt/webapp.dtd
--- a/browser/chrome/browser/aboutCertError.dtd
+++ b/browser/chrome/browser/aboutCertError.dtd
@@ -1,44 +1,43 @@
 <!-- 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 % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
-
 <!-- These strings are used by Firefox's custom about:certerror page,
 a replacement for the standard security certificate errors produced
 by NSS/PSM via netError.xhtml. -->
 
+
 <!ENTITY certerror.pagetitle  "Untrusted Connection">
 <!ENTITY certerror.longpagetitle "This Connection is Untrusted">
-
 <!-- Localization note (certerror.introPara1) - The string "#1" will
 be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
-<!ENTITY certerror.introPara1 "You have asked &brandShortName; to connect
+
+<!ENTITY certerror.introPara1 "You have asked &brandShortName; to connect 
 securely to <b>#1</b>, but we can't confirm that your connection is secure.">
-<!ENTITY certerror.introPara2 "Normally, when you try to connect securely,
-sites will present trusted identification to prove that you are
+<!ENTITY certerror.introPara2 "Normally, when you try to connect securely, 
+sites will present trusted identification to prove that you are 
 going to the right place. However, this site's identity can't be verified.">
 
 <!ENTITY certerror.whatShouldIDo.heading "What Should I Do?">
-<!ENTITY certerror.whatShouldIDo.content "If you usually connect to
-this site without problems, this error could mean that someone is
+<!ENTITY certerror.whatShouldIDo.content "If you usually connect to 
+this site without problems, this error could mean that someone is 
 trying to impersonate the site, and you shouldn't continue.">
-<!ENTITY certerror.whatShouldIDo.badStsCertExplanation "This site uses HTTP
-Strict Transport Security (HSTS) to specify that &brandShortName; only connect
-to it securely. As a result, it is not possible to add an exception for this
+<!ENTITY certerror.whatShouldIDo.badStsCertExplanation "This site uses HTTP 
+Strict Transport Security (HSTS) to specify that &brandShortName; only connect 
+to it securely. As a result, it is not possible to add an exception for this 
 certificate.">
 <!ENTITY certerror.getMeOutOfHere.label "Get me out of here!">
 
 <!ENTITY certerror.expert.heading "I Understand the Risks">
-<!ENTITY certerror.expert.content "If you understand what's going on, you
-can tell &brandShortName; to start trusting this site's identification.
-<b>Even if you trust the site, this error could mean that someone is
+<!ENTITY certerror.expert.content "If you understand what's going on, you 
+can tell &brandShortName; to start trusting this site's identification. 
+<b>Even if you trust the site, this error could mean that someone is 
 tampering with your connection.</b>">
-<!ENTITY certerror.expert.contentPara2 "Don't add an exception unless
+<!ENTITY certerror.expert.contentPara2 "Don't add an exception unless 
 you know there's a good reason why this site doesn't use trusted identification.">
 <!ENTITY certerror.addException.label "Add Exception…">
 
 <!ENTITY certerror.technical.heading "Technical Details">
--- a/browser/chrome/browser/aboutDialog.dtd
+++ b/browser/chrome/browser/aboutDialog.dtd
@@ -1,32 +1,32 @@
 <!-- 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 aboutDialog.title          "About &brandFullName;">
-
 <!-- LOCALIZATION NOTE (update.checkForUpdatesButton.*, update.updateButton.*, update.applyButtonBillboard.*):
 # Only one button is present at a time.
 # The button when displayed is located directly under the Firefox version in
 # the about dialog (see bug 596813 for screenshots).
 -->
+
 <!ENTITY update.checkForUpdatesButton.label       "Check for updates">
 <!ENTITY update.checkForUpdatesButton.accesskey   "C">
-<!ENTITY update.updateButton.label2               "Restart &brandShortName; to Update">
+<!ENTITY update.updateButton.label2                "Restart &brandShortName; to Update">
 <!ENTITY update.updateButton.accesskey            "R">
 <!ENTITY update.applyButtonBillboard.label        "Apply Update…">
 <!ENTITY update.applyButtonBillboard.accesskey    "A">
+<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 
 
-<!-- LOCALIZATION NOTE (warningDesc.version): This is a warning about the experimental nature of Nightly and Aurora builds. It is only shown in those versions. -->
 <!ENTITY warningDesc.version        "&brandShortName; is experimental and may be unstable.">
 <!-- LOCALIZATION NOTE (warningDesc.telemetryDesc): This is a notification that Nightly/Aurora builds automatically send Telemetry data back to Mozilla. It is only shown in those versions. "It" refers to brandShortName. -->
 <!ENTITY warningDesc.telemetryDesc  "It automatically sends information about performance, hardware, usage and customisations back to &vendorShortName; to help make &brandShortName; better.">
+<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 
-<!-- LOCALIZATION NOTE (community.exp.*) This paragraph is shown in "experimental" builds, i.e. Nightly and Aurora builds, instead of the other "community.*" strings below. -->
 <!ENTITY community.exp.start        "">
 <!-- LOCALIZATION NOTE (community.exp.mozillaLink): This is a link title that links to http://www.mozilla.org/. -->
 <!ENTITY community.exp.mozillaLink  "&vendorShortName;">
 <!ENTITY community.exp.middle       " is a ">
 <!-- LOCALIZATION NOTE (community.exp.creditslink): This is a link title that links to about:credits. -->
 <!ENTITY community.exp.creditsLink  "global community">
 <!ENTITY community.exp.end          " working together to keep the Web open, public and accessible to all.">
 
@@ -37,68 +37,68 @@
 <!-- LOCALIZATION NOTE (community.creditsLink): This is a link title that links to about:credits. -->
 <!ENTITY community.creditsLink      "global community">
 <!ENTITY community.end3             " working together to keep the Web open, public and accessible to all.">
 
 <!ENTITY contribute.start           "Sound interesting? ">
 <!-- LOCALIZATION NOTE (contribute.getInvolvedLink): This is a link title that links to http://www.mozilla.org/contribute/. -->
 <!ENTITY contribute.getInvolvedLink "Get involved!">
 <!ENTITY contribute.end             "">
+<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.license): This is a link title that links to about:license. -->
 <!ENTITY bottomLinks.license        "Licensing Information">
+<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.rights): This is a link title that links to about:rights. -->
 <!ENTITY bottomLinks.rights         "End-User Rights">
+<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to https://www.mozilla.org/legal/privacy/. -->
 
-<!-- LOCALIZATION NOTE (bottomLinks.privacy): This is a link title that links to http://www.mozilla.com/legal/privacy/. -->
 <!ENTITY bottomLinks.privacy        "Privacy Policy">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 
-<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.checkingForUpdates  "Checking for updates…">
 <!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
 <!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
 <!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
 <!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
 <!ENTITY update.otherInstanceHandlingUpdates "&brandShortName; is being updated by another instance">
-
 <!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
      update.failed.start, update.failed.linkText, and update.failed.end all go into
      one line with linkText being wrapped in an anchor that links to a site to download
      the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
      one line, try to make the localized text short (see bug 596813 for screenshots). -->
+
 <!ENTITY update.failed.start        "Update failed. ">
 <!ENTITY update.failed.linkText     "Download the latest version">
 <!ENTITY update.failed.end          "">
-
 <!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
      all go into one line and have an anchor in between with text that is the same as the link to a site
      to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
      try to make the localized text short (see bug 596813 for screenshots). -->
+
 <!ENTITY update.manual.start        "Updates available at ">
 <!ENTITY update.manual.end          "">
-
 <!-- LOCALIZATION NOTE (update.unsupported.start,update.unsupported.linkText,update.unsupported.end):
      update.unsupported.start, update.unsupported.linkText, and
      update.unsupported.end all go into one line with linkText being wrapped in
      an anchor that links to a site to provide additional information regarding
      why the system is no longer supported. As this is all in one line, try to
      make the localized text short (see bug 843497 for screenshots). -->
+
 <!ENTITY update.unsupported.start    "You can not perform further updates on this system. ">
 <!ENTITY update.unsupported.linkText "Learn more">
 <!ENTITY update.unsupported.end      "">
-
 <!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
+
 <!ENTITY update.downloading.start   "Downloading update — ">
 <!ENTITY update.downloading.end     "">
 
 <!ENTITY update.applying            "Applying update…">
-
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
+
 <!ENTITY channel.description.start  "You are currently on the ">
 <!ENTITY channel.description.end    " update channel. ">
--- a/browser/chrome/browser/aboutHealthReport.dtd
+++ b/browser/chrome/browser/aboutHealthReport.dtd
@@ -1,6 +1,6 @@
 <!-- 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 (abouthealth.pagetitle): Firefox Health Report is a proper noun in en-US, please keep this in mind. -->
 
-<!-- LOCALIZATION NOTE (abouthealth.pagetitle): Firefox Health Report is a proper noun in en-US, please keep this in mind. -->
 <!ENTITY abouthealth.pagetitle "&brandShortName; Health Report">
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,26 +1,26 @@
 <!-- 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
+%brandDTD;
 <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
-  %syncBrandDTD;
+%syncBrandDTD;
+<!-- These strings are used in the about:home page -->
 
-<!-- These strings are used in the about:home page -->
 
 <!ENTITY abouthome.pageTitle "&brandFullName; Start Page">
 
 <!ENTITY abouthome.searchEngineButton.label "Search">
-
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
      text in <a/> will be linked to the Firefox features page on mozilla.com
 -->
+
 <!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
 <!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
      text in <a/> will be linked to the featured add-ons on addons.mozilla.org
 -->
 <!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customise your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
 <!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
 <!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
 
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -12,12 +12,12 @@
 
 <!ENTITY aboutPrivateBrowsing.notPrivate       "You are currently not in a private window.">
 
 <!ENTITY aboutPrivateBrowsing.moreInfo         "While this computer won't have a record of your browsing history, your employer or internet service provider can still track the pages you visit.">
 <!ENTITY aboutPrivateBrowsing.learnMore        "Learn More.">
 
 <!ENTITY privatebrowsingpage.openPrivateWindow.label "Open a Private Window">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">
+<!-- TO BE REMOVED POST-AUSTRALIS --> 
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
 
-<!-- TO BE REMOVED POST-AUSTRALIS -->
-<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
 <!ENTITY privatebrowsingpage.howToStart3               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &newPrivateWindow.label;.">
--- a/browser/chrome/browser/aboutRobots.dtd
+++ b/browser/chrome/browser/aboutRobots.dtd
@@ -1,20 +1,18 @@
 <!-- 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/. -->
-
 <!-- These strings are used in the about:robots page, which ties in with the
-     robots theme used in the Firefox 3 Beta 2/3 first run pages...
-         https://www.mozilla.com/en-US/firefox/3.0b2/firstrun/
-         https://www.mozilla.com/en-US/firefox/3.0b3/firstrun/
+     robots theme used in the Firefox 3 Beta 2/3 first run pages.
      They're just meant to be fun and whimsical, with references to some geeky
      but well-known robots in movies and books. Be creative with translations! -->
+<!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
 
-<!-- Nonsense line from the movie "The Day The Earth Stood Still". No translation needed. -->
+
 <!ENTITY robots.pagetitle  "Gort! Klaatu barada nikto!">
 <!-- Movie: Logan's Run... Box (cybog): "Welcome Humans! I am ready for you." -->
 <!ENTITY robots.errorTitleText "Welcome Humans!">
 <!-- Movie: The Day The Earth Stood Still. Spoken by Klaatu. -->
 <!ENTITY robots.errorShortDescText "We have come to visit you in peace and with goodwill!">
 <!-- Various books by Isaac Asimov. http://en.wikipedia.org/wiki/Three_Laws_of_Robotics -->
 <!ENTITY robots.errorLongDesc1 "Robots may not injure a human being or, through inaction, allow a human being to come to harm.">
 <!-- Movie: Blade Runner. Batty: "I've seen things you people wouldn't believe..." -->
--- a/browser/chrome/browser/aboutSessionRestore.dtd
+++ b/browser/chrome/browser/aboutSessionRestore.dtd
@@ -1,34 +1,39 @@
 <!-- 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 restorepage.tabtitle       "Restore Session">
-
 <!-- LOCALIZATION NOTE: The title is intended to be apologetic and disarming, expressing dismay
      and regret that we are unable to restore the session for the user -->
+
 <!ENTITY restorepage.errorTitle     "Well, this is embarrassing.">
 <!ENTITY restorepage.problemDesc    "&brandShortName; is having trouble recovering your windows and tabs. This is usually caused by a recently opened web page.">
 <!ENTITY restorepage.tryThis        "You can try:">
 <!ENTITY restorepage.restoreSome    "Removing one or more tabs that you think may be causing the problem">
 <!ENTITY restorepage.startNew       "Starting an entirely new browsing session">
 
 <!ENTITY restorepage.tryagainButton "Restore">
 <!ENTITY restorepage.restore.access "R">
 <!ENTITY restorepage.closeButton    "Close">
 <!ENTITY restorepage.close.access   "C">
 
 <!ENTITY restorepage.restoreHeader  "Restore">
 <!ENTITY restorepage.listHeader     "Windows and Tabs">
 <!-- LOCALIZATION NOTE: &#37;S will be replaced with a number. -->
-<!ENTITY restorepage.windowLabel    "Window &#37;S">
+<!ENTITY restorepage.windowLabel    "Window &#037;S">
+<!-- LOCALIZATION NOTE: The following 'welcomeback2' strings are for about:welcomeback,
+     not for about:sessionstore -->
+
+
+
+
 
 
-<!-- LOCALIZATION NOTE: The following 'welcomeback' strings are for about:welcomeback,
-     not for about:sessionstore -->
-<!ENTITY welcomeback.tabtitle       "Welcome Back!">
+<!-- LOCALIZATION NOTE (welcomeback2.beforelink.pageInfo2,
+welcomeback2.afterlink.pageInfo2): these two string are used respectively
+before and after the the "learn more" link (welcomeback2.link.pageInfo2).
+Localizers can use one of them, or both, to better adapt this sentence to
+their language.
+-->
+<!ENTITY welcomeback2.afterlink.pageInfo2   "">
 
-<!-- LOCALIZATION NOTE: The title is intended to be welcoming and congratulatory,
-     expressing joy that the user has successfully migrated their stuff and hope
-     that now they have a better experience.  -->
-<!ENTITY welcomeback.pageTitle      "Welcome Back!">
-<!ENTITY welcomeback.pageInfo       "&brandShortName; successfully reset your profile. Below is a list of windows and tabs you had open; you can restore them or start with a clean slate.">
--- a/browser/chrome/browser/aboutSyncTabs.dtd
+++ b/browser/chrome/browser/aboutSyncTabs.dtd
@@ -1,19 +1,19 @@
 <!-- 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 (tabs.otherDevices.label): Keep this in sync with syncTabsMenu2.label from browser.dtd -->
 
-<!-- LOCALIZATION NOTE (tabs.otherDevices.label): Keep this in sync with syncTabsMenu2.label from browser.dtd -->
 <!ENTITY tabs.otherDevices.label               "Tabs From Other Devices">
 
 <!ENTITY tabs.searchText.label                   "Type here to find tabs…">
-
 <!-- LOCALIZATION NOTE (tabs.context.openTab.accesskey, tabs.context.openMultipleTabs.accesskey):
      Only one of these will show at a time (based on selection), so reusing accesskey is ok. -->
+
 <!ENTITY tabs.context.openTab.label                   "Open This Tab">
 <!ENTITY tabs.context.openTab.accesskey               "O">
 <!ENTITY tabs.context.openMultipleTabs.label          "Open Selected Tabs">
 <!ENTITY tabs.context.openMultipleTabs.accesskey      "O">
 <!ENTITY tabs.context.bookmarkSingleTab.label         "Bookmark This Tab…">
 <!ENTITY tabs.context.bookmarkSingleTab.accesskey     "B">
 <!ENTITY tabs.context.bookmarkMultipleTabs.label      "Bookmark Selected Tabs…">
 <!ENTITY tabs.context.bookmarkMultipleTabs.accesskey  "B">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -1,46 +1,46 @@
 <!-- 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 : FILE This file contains the browser main menu items -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys --> 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
 
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+
 <!ENTITY mainWindow.title "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifier "&brandFullName;">
 <!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
 <!ENTITY mainWindow.titlemodifiermenuseparator " - ">
 <!-- LOCALIZATION NOTE (mainWindow.titlePrivateBrowsingSuffix): This will be appended to the window's title
                                                                 inside the private browsing mode -->
 <!ENTITY mainWindow.titlePrivateBrowsingSuffix "(Private Browsing)">
 
 <!ENTITY appmenu.tooltip                     "Open menu">
 <!ENTITY navbarOverflow.label                "More tools…">
+<!-- Tab context menu -->
 
-<!-- Tab context menu -->
 <!ENTITY  reloadTab.label                    "Reload Tab">
 <!ENTITY  reloadTab.accesskey                "R">
 <!ENTITY  reloadAllTabs.label                "Reload All Tabs">
 <!ENTITY  reloadAllTabs.accesskey            "A">
 <!-- LOCALIZATION NOTE (closeTabsToTheEnd.label): This should indicate the
 direction in which tabs are closed, i.e. locales that use RTL mode should say
 left instead of right. -->
 <!ENTITY  closeTabsToTheEnd.label            "Close Tabs to the Right">
 <!ENTITY  closeTabsToTheEnd.accesskey        "i">
 <!ENTITY  closeOtherTabs.label               "Close Other Tabs">
 <!ENTITY  closeOtherTabs.accesskey           "o">
-
 <!-- LOCALIZATION NOTE (pinTab.label, unpinTab.label): "Pin" is being
 used as a metaphor for expressing the fact that these tabs are "pinned" to the
 left edge of the tabstrip. Really we just want the string to express the idea
 that this is a lightweight and reversible action that keeps your tab where you
 can reach it easily. -->
+
 <!ENTITY  pinTab.label                       "Pin Tab">
 <!ENTITY  pinTab.accesskey                   "P">
 <!ENTITY  unpinTab.label                     "Unpin Tab">
 <!ENTITY  unpinTab.accesskey                 "b">
 <!ENTITY  moveToGroup.label                  "Move to Group">
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "New Group">
 <!ENTITY  moveToNewWindow.label              "Move to New Window">
@@ -65,17 +65,17 @@ when there are no windows but Firefox is
 <!ENTITY openFileCmd.accesskey "O">
 <!ENTITY openFileCmd.commandkey "o">
 <!ENTITY printSetupCmd.label "Page Setup…">
 <!ENTITY printSetupCmd.accesskey "u">
 <!ENTITY printPreviewCmd.label "Print Preview">
 <!ENTITY printPreviewCmd.accesskey "v">
 <!ENTITY printCmd.label "Print…">
 <!ENTITY printCmd.accesskey "P">
-<!ENTITY printCmd.commandkey "p">
+
 
 <!ENTITY goOfflineCmd.label "Work Offline">
 <!ENTITY goOfflineCmd.accesskey "k">
 
 <!ENTITY menubarCmd.label "Menu Bar">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Navigation Toolbar">
 <!ENTITY personalbarCmd.label "Bookmarks Toolbar">
@@ -135,27 +135,30 @@ These should match what Safari and other
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "Bookmark This Page">
 <!ENTITY editThisBookmarkCmd.label "Edit This Bookmark">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 <!ENTITY markPageCmd.commandkey "l">
+<!-- LOCALIZATION NOTE (findShareServices.label):
+  -  Use the unicode ellipsis char, \u2026,
+  -  or use "..." if \u2026 doesn't suit traditions in your locale. -->
 <!ENTITY sharePageCmd.label "Share This Page">
 <!ENTITY sharePageCmd.commandkey "S">
 <!ENTITY sharePageCmd.accesskey "S">
-<!ENTITY shareLinkCmd.label "Share This Link">
-<!ENTITY shareLinkCmd.accesskey "S">
-<!ENTITY shareImageCmd.label "Share This Image">
-<!ENTITY shareImageCmd.accesskey "S">
-<!ENTITY shareSelectCmd.label "Share Selection">
-<!ENTITY shareSelectCmd.accesskey "S">
-<!ENTITY shareVideoCmd.label "Share This Video">
-<!ENTITY shareVideoCmd.accesskey "S">
+<!-- LOCALIZATION NOTE (shareLink.accesskey): must be different than the following share access keys -->
+
+
+
+
+
+
+
 <!ENTITY feedsMenu.label "Subscribe">
 <!ENTITY subscribeToPageMenupopup.label "Subscribe to This Page">
 <!ENTITY subscribeToPageMenuitem.label "Subscribe to This Page…">
 <!ENTITY addCurPagesCmd.label "Bookmark All Tabs…">
 <!ENTITY showAllBookmarks2.label "Show All Bookmarks">
 <!ENTITY unsortedBookmarksCmd.label "Unsorted Bookmarks">
 <!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks">
 
@@ -171,53 +174,55 @@ These should match what Safari and other
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY goEndCap.tooltip             "Go to the address in the Location Bar">
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
 <!ENTITY locationItem.title           "Location">
 <!ENTITY searchItem.title             "Search">
+<!-- Toolbar items --> 
 
-<!-- Toolbar items --> 
 <!ENTITY homeButton.label             "Home">
 
 <!ENTITY tabGroupsButton.label        "Tab Groups">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
-<!ENTITY bookmarksCmd.commandkey        "b">
+<!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksMenuButton.label          "Bookmarks">
 <!ENTITY bookmarksMenuButton.unsorted.label "Unsorted Bookmarks">
 <!ENTITY viewBookmarksSidebar2.label        "View Bookmarks Sidebar">
 <!ENTITY viewBookmarksToolbar.label         "View Bookmarks Toolbar">
-
 <!-- LOCALIZATION NOTE (bookmarksSidebarGtkCmd.commandkey): This command
   -  key should not contain the letters A-F, since these are reserved
   -  shortcut keys on Linux. -->
-<!ENTITY bookmarksGtkCmd.commandkey     "o">
-<!ENTITY bookmarksWinCmd.commandkey     "i">
+
+<!ENTITY bookmarksGtkCmd.commandkey "o">
+<!ENTITY bookmarksWinCmd.commandkey "i">
 
 <!ENTITY historyButton.label            "History">
-<!ENTITY historySidebarCmd.commandKey   "h">
+
 
 <!ENTITY toolsMenu.label              "Tools">
 <!ENTITY toolsMenu.accesskey          "T"> 
 
 <!ENTITY keywordfield.label           "Add a Keyword for this Search…">
 <!ENTITY keywordfield.accesskey       "K">
 
 <!ENTITY downloads.label              "Downloads">
 <!ENTITY downloads.accesskey          "D">
 <!ENTITY downloads.commandkey         "j">
 <!ENTITY downloadsUnix.commandkey     "y">
 <!ENTITY addons.label                 "Add-ons">
 <!ENTITY addons.accesskey             "A">
 <!ENTITY addons.commandkey            "A">
 
+
+
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY devToolsCmd.keycode          "VK_F12">
 <!ENTITY devToolsCmd.keytext          "F12">
 
 <!ENTITY devtoolsConnect.label        "Connect…">
 <!ENTITY devtoolsConnect.accesskey    "e">
@@ -235,34 +240,34 @@ These should match what Safari and other
 <!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label   "Responsive Design View">
 <!ENTITY responsiveDesignTool.accesskey "R">
 <!ENTITY responsiveDesignTool.commandkey "M">
 
 <!ENTITY eyedropper.label   "Eyedropper">
 <!ENTITY eyedropper.accesskey "y">
-
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
+
 <!ENTITY scratchpad.label             "Scratchpad">
-<!ENTITY scratchpad.accesskey         "s">
+<!ENTITY scratchpad.accesskey         "S">
 <!ENTITY scratchpad.keycode           "VK_F4">
 <!ENTITY scratchpad.keytext           "F4">
-
 <!-- LOCALIZATION NOTE (browserToolboxMenu.label): This is the label for the
   -  application menu item that opens the browser toolbox UI in the Tools menu. -->
+
 <!ENTITY browserToolboxMenu.label     "Browser Toolbox">
 <!ENTITY browserToolboxMenu.accesskey "e">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
 <!ENTITY devToolbarMenu.label              "Developer Toolbar">
 <!ENTITY devToolbarMenu.accesskey          "v">
 <!ENTITY devAppMgrMenu.label               "App Manager">
 <!ENTITY devAppMgrMenu.accesskey           "A">
@@ -373,17 +378,16 @@ These should match what Safari and other
 <!ENTITY customizeMenu.removeFromMenu.accesskey "R">
 <!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
 <!ENTITY customizeMenu.addMoreItems.accesskey "A">
 
 <!ENTITY openCmd.commandkey           "l">
 <!ENTITY urlbar.placeholder2          "Search or enter address">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
-
 <!-- 
   Comment duplicated from browser-sets.inc:
 
   Search Command Key Logic works like this:
 
   Unix: Ctrl+J (0.8, 0.9 support)
         Ctrl+K (cross platform binding)
   Mac:  Cmd+K (cross platform binding)
@@ -394,16 +398,17 @@ These should match what Safari and other
   We support Ctrl+K on all platforms now and advertise it in the menu since it is
   our standard - it is a "safe" choice since it is near no harmful keys like "W" as
   "E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
   system setting to use emacs emulation, and we should respect it. Focus-Search-Box
   is a fundamental keybinding and we are maintaining a XP binding so that it is easy
   for people to switch to Linux.
 
  -->
+
 <!ENTITY searchFocus.commandkey       "k">
 <!ENTITY searchFocus.commandkey2      "e">
 <!ENTITY searchFocusUnix.commandkey   "j">
 
 <!ENTITY tabView.commandkey           "e">
 
 <!ENTITY openLinkCmdInTab.label       "Open Link in New Tab">
 <!ENTITY openLinkCmdInTab.accesskey   "T">
@@ -414,17 +419,17 @@ These should match what Safari and other
 <!ENTITY openLinkCmdInCurrent.label     "Open Link">
 <!ENTITY openLinkCmdInCurrent.accesskey "O">
 <!ENTITY openFrameCmdInTab.label      "Open Frame in New Tab">
 <!ENTITY openFrameCmdInTab.accesskey  "T">
 <!ENTITY openFrameCmd.label           "Open Frame in New Window">
 <!ENTITY openFrameCmd.accesskey       "W">
 <!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
-<!ENTITY reloadCmd.commandkey         "r">
+
 <!ENTITY reloadFrameCmd.label         "Reload Frame">
 <!ENTITY reloadFrameCmd.accesskey     "R">
 <!ENTITY viewPartialSourceForSelectionCmd.label "View Selection Source">
 <!ENTITY viewPartialSourceForMathMLCmd.label    "View MathML Source">
 <!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both 
          viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
 <!ENTITY viewPartialSourceCmd.accesskey "e">
 <!ENTITY viewPageSourceCmd.label      "View Page Source">
@@ -439,17 +444,17 @@ These should match what Safari and other
 <!ENTITY reloadImageCmd.accesskey     "R">
 <!ENTITY viewImageCmd.label           "View Image">
 <!ENTITY viewImageCmd.accesskey       "I">
 <!ENTITY viewImageInfoCmd.label       "View Image Info">
 <!ENTITY viewImageInfoCmd.accesskey   "f">
 <!ENTITY viewImageDescCmd.label       "View Description">
 <!ENTITY viewImageDescCmd.accesskey   "D">
 <!ENTITY viewVideoCmd.label           "View Video">
-<!ENTITY viewVideoCmd.accesskey       "I">
+<!ENTITY viewVideoCmd.accesskey       "i">
 <!ENTITY viewBGImageCmd.label         "View Background Image">
 <!ENTITY viewBGImageCmd.accesskey     "w">
 <!ENTITY setDesktopBackgroundCmd.label      "Set As Desktop Background…">
 <!ENTITY setDesktopBackgroundCmd.accesskey  "S">
 <!ENTITY bookmarkPageCmd2.label       "Bookmark This Page">
 <!ENTITY bookmarkThisLinkCmd.label      "Bookmark This Link">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "L">
 <!ENTITY bookmarkThisFrameCmd.label      "Bookmark This Frame">
@@ -472,16 +477,18 @@ These should match what Safari and other
 <!ENTITY saveVideoCmd.label           "Save Video As…">
 <!ENTITY saveVideoCmd.accesskey       "v">
 <!ENTITY saveAudioCmd.label           "Save Audio As…">
 <!ENTITY saveAudioCmd.accesskey       "v">
 <!ENTITY emailImageCmd.label          "Email Image…">
 <!ENTITY emailImageCmd.accesskey      "a">
 <!ENTITY emailVideoCmd.label          "Email Video…">
 <!ENTITY emailVideoCmd.accesskey      "a">
+
+
 <!ENTITY emailAudioCmd.label          "Email Audio…">
 <!ENTITY emailAudioCmd.accesskey      "a">
 <!ENTITY playPluginCmd.label          "Activate this plugin">
 <!ENTITY playPluginCmd.accesskey      "c">
 <!ENTITY hidePluginCmd.label          "Hide this plugin">
 <!ENTITY hidePluginCmd.accesskey      "H">
 <!ENTITY copyLinkCmd.label            "Copy Link Location">
 <!ENTITY copyLinkCmd.accesskey        "a">
@@ -492,21 +499,21 @@ These should match what Safari and other
 <!ENTITY copyVideoURLCmd.label        "Copy Video Location">
 <!ENTITY copyVideoURLCmd.accesskey    "o">
 <!ENTITY copyAudioURLCmd.label        "Copy Audio Location">
 <!ENTITY copyAudioURLCmd.accesskey    "o">
 <!ENTITY copyEmailCmd.label           "Copy Email Address">
 <!ENTITY copyEmailCmd.accesskey       "E">
 <!ENTITY thisFrameMenu.label              "This Frame">
 <!ENTITY thisFrameMenu.accesskey          "h">
-
 <!-- Media (video/audio) controls -->
 <!-- LOCALIZATION NOTE: The access keys for "Play" and
 "Pause" are the same because the two context-menu
 items are mutually exclusive. -->
+
 <!ENTITY mediaPlay.label             "Play">
 <!ENTITY mediaPlay.accesskey         "P">
 <!ENTITY mediaPause.label            "Pause">
 <!ENTITY mediaPause.accesskey        "P">
 <!-- LOCALIZATION NOTE: The access keys for "Mute" and
 "Unmute" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaMute.label             "Mute">
@@ -517,17 +524,17 @@ items are mutually exclusive. -->
 <!ENTITY mediaPlaybackRate.accesskey "l">
 <!ENTITY mediaPlaybackRate050x.label "Slow Motion (0.5×)">
 <!ENTITY mediaPlaybackRate050x.accesskey "S">
 <!ENTITY mediaPlaybackRate100x.label "Normal Speed">
 <!ENTITY mediaPlaybackRate100x.accesskey "N">
 <!ENTITY mediaPlaybackRate150x.label "High Speed (1.5×)">
 <!ENTITY mediaPlaybackRate150x.accesskey "H">
 <!-- LOCALIZATION NOTE: "Ludicrous Speed" is a reference to the
-     movie "Space Balls" and is meant to say that this speed is very
+movie "Space Balls" and is meant to say that this speed is very
 fast. -->
 <!ENTITY mediaPlaybackRate200x.label "Ludicrous Speed (2×)">
 <!ENTITY mediaPlaybackRate200x.accesskey "L">
 <!-- LOCALIZATION NOTE: The access keys for "Show Controls" and
 "Hide Controls" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY mediaShowControls.label     "Show Controls">
 <!ENTITY mediaShowControls.accesskey "C">
@@ -539,27 +546,28 @@ items are mutually exclusive. -->
 <!ENTITY videoSaveImage.accesskey    "S">
 <!-- LOCALIZATION NOTE: The access keys for "Show Statistics" and
 "Hide Statistics" are the same because the two context-menu
 items are mutually exclusive. -->
 <!ENTITY videoShowStats.label        "Show Statistics">
 <!ENTITY videoShowStats.accesskey    "t">
 <!ENTITY videoHideStats.label        "Hide Statistics">
 <!ENTITY videoHideStats.accesskey    "t">
-
 <!-- LOCALIZATION NOTE :
 fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
 fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
 If shift key is needed with your locale popular keyboard for them,
 you can use these alternative items. Otherwise, their values should be empty.  -->
 
+
 <!ENTITY fullZoomEnlargeCmd.label       "Zoom In">
 <!ENTITY fullZoomEnlargeCmd.accesskey   "I">
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.label        "Zoom Out">
 <!ENTITY fullZoomReduceCmd.accesskey    "O">
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.label         "Reset">
@@ -587,19 +595,19 @@ you can use these alternative items. Oth
 
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 <!ENTITY closeCmd.accesskey             "C">
 
 <!ENTITY pageStyleMenu.label "Page Style">
 <!ENTITY pageStyleMenu.accesskey "y">
 <!ENTITY pageStyleNoStyle.label "No Style">
-<!ENTITY pageStyleNoStyle.accesskey "n">
+<!ENTITY pageStyleNoStyle.accesskey "N">
 <!ENTITY pageStylePersistentOnly.label "Basic Page Style">
-<!ENTITY pageStylePersistentOnly.accesskey "b">
+<!ENTITY pageStylePersistentOnly.accesskey "B">
 
 <!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this web site">
 
 <!ENTITY allowPopups.accesskey "p">
 <!-- On Windows we use the term "Options" to describe settings, but
      on Linux and Mac OS X we use "Preferences" - carry that distinction
      over into this string, which is used in the "popup blocked" info bar . -->
 <!ENTITY editPopupSettingsUnix.label "Edit Popup Blocker Preferences…">
@@ -642,27 +650,27 @@ The layout of the identity dialog preven
 substitution variables.  If it is difficult to translate the sense of the string
 with that structure, consider a translation which ignores the preceding domain and
 just addresses the organization to follow, e.g. "This site is run by " -->
 <!ENTITY identity.runBy "which is run by">
 
 <!ENTITY identity.moreInfoLinkText "More Information…">
 
 <!ENTITY identity.permissions "Permissions">
-
 <!-- LOCALIZATION NOTE (identity.help.tooltip) : This string should be the
      localized title of this SUMO article
      https://support.mozilla.org/kb/how-do-i-tell-if-my-connection-is-secure -->
+
 <!ENTITY identity.help.tooltip "How do I tell if my connection to a web site is secure?">
-
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
-<!ENTITY tabsToolbar.label "Browser tabs">
 
+<!ENTITY tabsToolbar.label "Browser tabs">
 <!-- LOCALIZATION NOTE (syncTabsMenu2.label): This appears in the history menu -->
+
 <!ENTITY syncTabsMenu2.label     "Tabs From Other Devices">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSetup.label              "Set Up &syncBrand.shortName.label;…">
 <!ENTITY syncSetup.accesskey          "Y">
 <!ENTITY syncSyncNowItem.label        "Synchronise Now">
 <!ENTITY syncSyncNowItem.accesskey    "S">
@@ -680,118 +688,125 @@ just addresses the organization to follo
 
 <!ENTITY social.addons.label "Manage Services…">
 
 <!ENTITY social.toggleNotifications.label "Show desktop notifications">
 <!ENTITY social.toggleNotifications.accesskey "n">
 
 <!ENTITY social.activated.description "Services from <label/> have been enabled. You can change your settings for services in the <label class='text-link'>Add-on Manager</label>.">
 <!ENTITY social.activated.undo.label "Oops, undo this!">
-<!ENTITY social.activated.undo.accesskey "U">
+<!ENTITY social.activated.undo.accesskey "u">
 <!ENTITY social.learnMore.label "Learn more…">
-<!ENTITY social.learnMore.accesskey "l">
+<!ENTITY social.learnMore.accesskey "L">
 <!ENTITY social.closeNotificationItem.label "Not Now">
 
 
 
+
+
+
 <!ENTITY customizeMode.tabTitle "Customise &brandShortName;">
 <!ENTITY customizeMode.menuAndToolbars.header2 "Additional Tools and Features">
 <!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
 <!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">
 <!ENTITY customizeMode.restoreDefaults "Restore Defaults">
 <!ENTITY customizeMode.toolbars "Show / Hide Toolbars">
 <!ENTITY customizeMode.titlebar "Title Bar">
 <!ENTITY customizeMode.lwthemes "Themes">
 <!ENTITY customizeMode.lwthemes.myThemes "My Themes">
 <!ENTITY customizeMode.lwthemes.recommended "Recommended">
 <!ENTITY customizeMode.lwthemes.menuManage "Manage">
 <!ENTITY customizeMode.lwthemes.menuManage.accessKey "M">
 <!ENTITY customizeMode.lwthemes.menuGetMore "Get More Themes">
 <!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "G">
 
+
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
 <!ENTITY social.markpageMenu.accesskey "P">
 <!ENTITY social.markpageMenu.label "Save Page To…">
 <!ENTITY social.marklinkMenu.accesskey "L">
 <!ENTITY social.marklinkMenu.label "Save Link To…">
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
+<!-- Bad Content Blocker Doorhanger Notification -->
 
-<!-- Bad Content Blocker Doorhanger Notification -->
 <!ENTITY badContentBlocked.moreinfo "Most web sites will work properly even if content is blocked.">
 
 <!ENTITY mixedContentBlocked2.message "Insecure content">
 <!ENTITY mixedContentBlocked2.moreinfo "Some unencrypted elements on this web site have been blocked.">
 <!ENTITY mixedContentBlocked2.learnMore "Learn More">
 <!ENTITY mixedContentBlocked2.options "Options">
 <!ENTITY mixedContentBlocked2.unblock.label "Disable protection for now">
 <!ENTITY mixedContentBlocked2.unblock.accesskey "D">
-<!ENTITY mixedContentBlocked2.block.label "Enable protection">
-<!ENTITY mixedContentBlocked2.block.accesskey "B">
+
+
 <!ENTITY mixedContentBlocked2.disabled.message "Protection is disabled">
 
 <!ENTITY trackingContentBlocked.message "Tracking">
 <!ENTITY trackingContentBlocked.moreinfo "Parts of the page that track your online activity have been blocked.">
 <!ENTITY trackingContentBlocked.learnMore "Learn More">
 <!ENTITY trackingContentBlocked.options "Options">
-<!ENTITY trackingContentBlocked.unblock.label2 "Disable protection for this site">
-<!ENTITY trackingContentBlocked.block.label "Enable protection">
+
+
+
+
 <!ENTITY trackingContentBlocked.disabled.message "Tracking protection is disabled">
 
 <!ENTITY pointerLock.notification.message "Press ESC at any time to show it again.">
 
 <!ENTITY pluginNotification.showAll.label "Show All">
 <!ENTITY pluginNotification.showAll.accesskey "S">
+<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 
-<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 <!ENTITY pluginActivateNow.label "Allow Now">
 <!ENTITY pluginActivateAlways.label "Allow and Remember">
 <!ENTITY pluginBlockNow.label "Block Plugin">
-
 <!-- LOCALIZATION NOTE: (pluginNotification.width): This is used to determine the
      width of the plugin popup notification that can appear if a plugin has been
      blocked on a page. Should be wide enough to fit the pluginActivateNow.label
      and pluginActivateAlways.label strings above on a single line. This must be
      a CSS length value. -->
+
 <!ENTITY pluginNotification.width "28em">
 
 <!ENTITY tabCrashed.header "Tab crashed">
 <!ENTITY tabCrashed.message "Well, this is embarrassing. We tried to display this Web page, but it's not responding.">
 <!ENTITY tabCrashed.checkSendReport "Tell &vendorShortName; about this crash so they can fix it.">
 <!ENTITY tabCrashed.tryAgain "Try Again">
 
 <!ENTITY uiTour.infoPanel.close "Close">
 
 <!ENTITY appMenuSidebars.label         "Sidebars">
 
 <!ENTITY switchToMetroCmd2.label       "Relaunch in &brandShortName; for Windows 8 Touch">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainTimeframeDesc, panicButton.view.5min, panicButton.view.2hr, panicButton.view.day):
      The .mainTimeframeDesc string combined with any of the 3 others is meant to form a complete sentence, e.g. "Forget the last: Five minutes".
      Please ensure that this remains the case in the translation. -->
+
 <!ENTITY panicButton.view.mainTimeframeDesc       "Forget the last:">
 <!ENTITY panicButton.view.5min                    "Five minutes">
 <!ENTITY panicButton.view.2hr                     "Two hours">
 <!ENTITY panicButton.view.day                     "24 hours">
-
 <!-- LOCALIZATION NOTE: (panicButton.view.mainLabel, panicButton.view.deleteCookies, panicButton.view.deleteHistory, panicButton.view.deleteTabsAndWindows, panicButton.view.openNewWindow):
      The .mainActionDesc string combined with any of the 4 others is meant to form a complete sentence, e.g. "Proceeding will: Delete Recent Cookies".
      Note also that the deleteCookies, deleteHistory and deleteTabsAndWindows strings include <html:strong> tags for emphasis on the words "Cookies", "History", "Tabs" and "Windows".
      The translation should do the same. -->
+
 <!ENTITY panicButton.view.mainActionDesc          "Proceeding will:">
 <!ENTITY panicButton.view.deleteCookies           "Delete Recent <html:strong>Cookies</html:strong>">
 <!ENTITY panicButton.view.deleteHistory           "Delete Recent <html:strong>History</html:strong>">
 <!ENTITY panicButton.view.deleteTabsAndWindows    "Close all <html:strong>Tabs</html:strong> and <html:strong>Windows</html:strong>">
 <!ENTITY panicButton.view.openNewWindow           "Open a new clean Window">
 
 <!ENTITY panicButton.view.undoWarning             "This action cannot be undone.">
 <!ENTITY panicButton.view.forgetButton            "Forget!">
 
 <!ENTITY panicButton.thankyou.msg1                "Your recent history is cleared.">
 <!ENTITY panicButton.thankyou.msg2                "Safe browsing!">
 <!ENTITY panicButton.thankyou.buttonlabel         "Thanks!">
+
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -26,27 +26,27 @@ xpinstallPromptAllowButton=Allow
 # See http://www.mozilla.org/access/keyboard/accesskey for details
 xpinstallPromptAllowButton.accesskey=A
 xpinstallDisabledMessageLocked=Software installation has been disabled by your system administrator.
 xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again.
 xpinstallDisabledButton=Enable
 xpinstallDisabledButton.accesskey=n
 
 # LOCALIZATION NOTE (addonDownloading, addonDownloadCancelled, addonDownloadRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Also see https://bugzilla.mozilla.org/show_bug.cgi?id=570012 for mockups
 addonDownloading=Add-on downloading;Add-ons downloading
 addonDownloadCancelled=Add-on download cancelled.;Add-on downloads cancelled.
 addonDownloadRestart=Restart Download;Restart Downloads
 addonDownloadRestart.accessKey=R
 addonDownloadCancelTooltip=Cancel
 
 # LOCALIZATION NOTE (addonsInstalled, addonsInstalledNeedsRestart):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 first add-on's name, #2 number of add-ons, #3 application name
 addonsInstalled=#1 has been installed successfully.;#2 add-ons have been installed successfully.
 addonsInstalledNeedsRestart=#1 will be installed after you restart #3.;#2 add-ons will be installed after you restart #3.
 addonInstallRestartButton=Restart Now
 addonInstallRestartButton.accesskey=R
 
 # LOCALIZATION NOTE (addonError-1, addonError-2, addonError-3, addonError-4):
@@ -98,28 +98,17 @@ popupWarningDontShowFromMessage=Don't sh
 popupWarningDontShowFromLocationbar=Don't show info bar when popups are blocked
 popupShowPopupPrefix=Show '%S'
 
 # Bad Content Blocker Doorhanger Notification
 # %S is brandShortName
 badContentBlocked.blocked.message=%S is blocking content on this page.
 badContentBlocked.notblocked.message=%S is not blocking any content on this page.
 
-# missing plugin installer
-installPlugin.message = Would you like to install the plugin needed to display the media on this page?
-installPlugin.button.label=Install %S
-installPlugin.button.accesskey=I
-installPlugin.ignoreButton.label=Don't ask again
-installPlugin.ignoreButton.accesskey=N
-
 crashedpluginsMessage.title=The %S plugin has crashed.
-crashedpluginsMessage.reloadButton.label=Reload page
-crashedpluginsMessage.reloadButton.accesskey=R
-crashedpluginsMessage.submitButton.label=Submit a crash report
-crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Learn More…
 
 # Keyword fixup messages
 # LOCALIZATION NOTE (keywordURIFixup.message): Used when the user tries to visit
 # a local host page, by the time the DNS request recognizes it, we have already
 # loaded a search page for the given word.  An infobar then asks to the user
 # whether he rather wanted to visit the host.  %S is the recognized host.
 keywordURIFixup.message=Did you mean to go to %S?
@@ -157,40 +146,28 @@ pluginEnabled.message="%S" is enabled on
 pluginEnabledOutdated.message=Outdated plugin "%S" is enabled on %S.
 pluginEnabledVulnerable.message=Insecure plugin "%S" is enabled on %S.
 pluginInfo.unknownPlugin=Unknown
 
 # LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.dtd
 # LOCALIZATION NOTE (pluginActivateNow.label): This button will enable the
 # plugin in the current session for an short time (about an hour), auto-renewed
 # if the site keeps using the plugin.
-pluginActivateNow.label=Allow Now
-pluginActivateNow.accesskey=N
 # LOCALIZATION NOTE (pluginActivateAlways.label): This button will enable the
 # plugin for a long while (90 days), auto-renewed if the site keeps using the
 # plugin.
-pluginActivateAlways.label=Allow and Remember
-pluginActivateAlways.accesskey=R
-pluginBlockNow.label=Block Plugin
-pluginBlockNow.accesskey=B
-pluginContinue.label=Continue Allowing
-pluginContinue.accesskey=C
 
 # in-page UI
 PluginClickToActivate=Activate %S.
 PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
 PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
 
 # infobar UI
-pluginContinueBlocking.label=Continue Blocking
-pluginContinueBlocking.accesskey=B
 # LOCALIZATION NOTE (pluginActivateTrigger): Use the unicode ellipsis char, \u2026,
 # or use "..." if \u2026 doesn't suit traditions in your locale.
-pluginActivateTrigger.label=Allow…
-pluginActivateTrigger.accesskey=A
 
 # Sanitize
 # LOCALIZATION NOTE (sanitizeDialog2.everything.title): When "Time range to
 # clear" is set to "Everything", the Clear Recent History dialog's title is
 # changed to this.  See UI mockup and comment 11 at bug 480169 -->
 sanitizeDialog2.everything.title=Clear All History
 sanitizeButtonOK=Clear Now
 # LOCALIZATION NOTE (sanitizeButtonClearing): The label for the default
@@ -204,18 +181,16 @@ sanitizeButtonClearing=Clearing
 sanitizeEverythingWarning2=All history will be cleared.
 # LOCALIZATION NOTE (sanitizeSelectedWarning): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has modified the default set of history items to clear.
 sanitizeSelectedWarning=All selected items will be cleared.
 
 # LOCALIZATION NOTE (downloadAndInstallButton.label): %S is replaced by the
 # version of the update: "Update to 28.0".
-update.downloadAndInstallButton.label=Update to %S
-update.downloadAndInstallButton.accesskey=U
 
 # RSS Pretty Print
 feedShowFeedNew=Subscribe to '%S'…
 
 menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
 menuRestoreAllTabs.label=Restore All Tabs
@@ -320,18 +295,16 @@ editBookmarkPanel.editBookmarkTitle=Edit
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
 
 # Post Update Notifications
-pu.notifyButton.label=Details…
-pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S has been updated
 puAlertTitle=%S Updated
 puAlertText=Click here for details
 
 # Geolocation UI
 
 # LOCALIZATION NOTE (geolocation.shareLocation geolocation.alwaysShareLocation geolocation.neverShareLocation):
@@ -363,39 +336,33 @@ pointerLock.neverAllow=Never allow hidin
 pointerLock.neverAllow.accesskey=N
 pointerLock.title2=Would you like to allow the pointer to be hidden on %S?
 pointerLock.autoLock.title2=%S will hide the pointer.
 
 # Phishing/Malware Notification Bar.
 # LOCALIZATION NOTE (notAForgery, notAnAttack)
 # The two button strings will never be shown at the same time, so
 # it's okay for them to have the same access key
-safebrowsing.getMeOutOfHereButton.label=Get me out of here!
-safebrowsing.getMeOutOfHereButton.accessKey=G
 safebrowsing.reportedWebForgery=Reported Web Forgery!
-safebrowsing.notAForgeryButton.label=This isn't a web forgery…
-safebrowsing.notAForgeryButton.accessKey=F
 safebrowsing.reportedAttackSite=Reported Attack Site!
-safebrowsing.notAnAttackButton.label=This isn't an attack site…
-safebrowsing.notAnAttackButton.accessKey=A
 
 # Ctrl-Tab
 # LOCALIZATION NOTE (ctrlTab.showAll.label): #1 represents the number
 # of tabs in the current browser window. It will always be 2 at least.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 ctrlTab.showAll.label=;Show all #1 tabs
 
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Search %S
 
 # TabView
 # LOCALIZATION NOTE (tabview.title): %S is the application name.
 tabview.title=%S - Group Your Tabs
-# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (tabview.moveToUnnamedGroup.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the page title of the first tab in the unnamed group, 
 # #2 is the number of remaining tabs.
 tabview.moveToUnnamedGroup.label=#1 and 1 more;#1 and #2 more
 
 # LOCALIZATION NOTE (tabviewButton.tooltip): %S is the keyboard shortcut for tab groups
 tabviewButton.tooltip=Group your tabs (%S)
 
@@ -434,18 +401,16 @@ syncPromoNotification.addons.description
 # LOCALIZATION NOTE (syncPromoNotification.addons-sync-disabled.label):
 # This appears in the add-on install complete panel when Sync is set
 # but addons sync is not. %S will be replaced by syncBrandShortName.
 # The final space separates this text from the Learn More link.
 syncPromoNotification.addons-sync-disabled.description=You can use your %S account to synchronise add-ons across multiple devices.\u0020
 
 # Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
 dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
-dataReportingNotification.button.label  = Choose What I Share
-dataReportingNotification.button.accessKey  = C
 
 # Webapps notification popup
 webapps.install = Install
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Do you want to install "%1$S" from this site (%2$S)?
 webapps.install.success = Application Installed
 webapps.install.inprogress = Installation in progress
@@ -464,116 +429,91 @@ fullscreen.rememberDecision=Remember dec
 # LOCALIZATION NOTE (fullscreenButton.tooltip): %S is the keyboard shortcut for full screen
 fullscreenButton.tooltip=Display the window in full screen (%S)
 
 service.toolbarbutton.label=Services
 service.toolbarbutton.tooltiptext=Services
 
 # LOCALIZATION NOTE (social.install.description): %1$S is the hostname of the social provider, %2$S is brandShortName (e.g. Firefox)
 service.install.description=Would you like to enable services from %1$S to display in your %2$S toolbar and sidebar?
-service.install.ok.label=Enable Services
-service.install.ok.accesskey=E
 
 # LOCALIZATION NOTE (social.markpageMenu.label): %S is the name of the social provider
 social.markpageMenu.label=Save Page to %S
 # LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
 social.marklinkMenu.label=Save Link to %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S is unable to connect with %2$S right now.
-social.error.tryAgain.label=Try Again
-social.error.tryAgain.accesskey=T
-social.error.closeSidebar.label=Close This Sidebar
-social.error.closeSidebar.accesskey=C
 
 # LOCALIZATION NOTE: %1$S is the label for the toolbar button, %2$S is the associated badge numbering that the social provider may provide.
 social.aria.toolbarButtonBadgeText=%1$S (%2$S)
 
 # Identity notifications popups
 identity.termsOfService = Terms of Service
 identity.privacyPolicy = Privacy Policy
 # LOCALIZATION NOTE (identity.chooseIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.chooseIdentity.description = Sign in to %S
 identity.chooseIdentity.label = Use an existing email
-identity.newIdentity.label = Use a different email
-identity.newIdentity.accessKey = e
 identity.newIdentity.email.placeholder = Email
 # LOCALIZATION NOTE (identity.newIdentity.description): %S is the website origin (e.g. https://www.mozilla.org) shown in popup notifications.
 identity.newIdentity.description = Enter your email address to sign in to %S
 identity.next.label = Next
-identity.next.accessKey = n
+identity.next.accessKey = N
 # LOCALIZATION NOTE: shown in the popup notification when a user successfully logs into a website
 # LOCALIZATION NOTE (identity.loggedIn.description): %S is the user's identity (e.g. user@example.com)
 identity.loggedIn.description = Signed in as: %S
-identity.loggedIn.signOut.label = Sign Out
-identity.loggedIn.signOut.accessKey = O
 
 # LOCALIZATION NOTE (getUserMedia.shareCamera.message, getUserMedia.shareMicrophone.message,
 #                    getUserMedia.shareScreen.message, getUserMedia.shareCameraAndMicrophone.message,
 #                    getUserMedia.shareScreenAndMicrophone.message):
 #  %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.shareCamera.message = Would you like to share your camera with %S?
 getUserMedia.shareMicrophone.message = Would you like to share your microphone with %S?
 getUserMedia.shareScreen.message = Would you like to share your screen with %S?
 getUserMedia.shareCameraAndMicrophone.message = Would you like to share your camera and microphone with %S?
 getUserMedia.shareScreenAndMicrophone.message = Would you like to share your microphone and screen with %S?
-getUserMedia.selectWindow.label=Window to share:
-getUserMedia.selectWindow.accesskey=W
-getUserMedia.selectScreen.label=Screen to share:
-getUserMedia.selectScreen.accesskey=S
-getUserMedia.selectApplication.label=Application to share:
-getUserMedia.selectApplication.accesskey=A
 getUserMedia.noVideo.label = No Video
 getUserMedia.noApplication.label = No Application
 getUserMedia.noScreen.label = No Screen
 getUserMedia.noWindow.label = No Window
 getUserMedia.noAudio.label = No Audio
 getUserMedia.shareEntireScreen.label = Entire screen
 # LOCALIZATION NOTE (getUserMedia.shareApplicationWindowCount.label):
 # Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the name of the application.
 # Replacement for #2 is the number of windows currently displayed by the application.
 getUserMedia.shareApplicationWindowCount.label=#1 (#2 window);#1 (#2 windows)
 # LOCALIZATION NOTE (getUserMedia.shareSelectedDevices.label):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The number of devices can be either one or two.
-getUserMedia.shareSelectedDevices.label = Share Selected Device;Share Selected Devices
-getUserMedia.shareSelectedDevices.accesskey = S
 getUserMedia.shareScreen.label = Share Screen
 getUserMedia.shareApplication.label = Share Selected Application
 getUserMedia.shareWindow.label = Share Selected Window
 getUserMedia.shareSelectedItems.label = Share Selected Items
-getUserMedia.always.label = Always Share
-getUserMedia.always.accesskey = A
-getUserMedia.denyRequest.label = Don't Share
-getUserMedia.denyRequest.accesskey = D
-getUserMedia.never.label = Never Share
-getUserMedia.never.accesskey = N
 getUserMedia.sharingCamera.message2 = You are currently sharing your camera with this page.
 getUserMedia.sharingMicrophone.message2 = You are currently sharing your microphone with this page.
 getUserMedia.sharingCameraAndMicrophone.message2 = You are currently sharing your camera and microphone with this page.
 getUserMedia.sharingApplication.message = You are currently sharing an application with this page.
 getUserMedia.sharingScreen.message = You are currently sharing your screen with this page.
 getUserMedia.sharingWindow.message = You are currently sharing a window with this page.
-getUserMedia.continueSharing.label = Continue Sharing
-getUserMedia.continueSharing.accesskey = C
-getUserMedia.stopSharing.label = Stop Sharing
-getUserMedia.stopSharing.accesskey = S
 
-getUserMedia.sharingMenu.label = Tabs sharing devices
-getUserMedia.sharingMenu.accesskey = d
-# LOCALIZATION NOTE (getUserMedia.sharingMenuCamera, getUserMedia.sharingMenuCamera,
-#                    getUserMedia.sharingMenuMicrophone, getUserMedia.sharingMenuApplication,
-#                    getUserMedia.sharingMenuScreen, getUserMedia.sharingMenuWindow,
+# LOCALIZATION NOTE (getUserMedia.sharingMenuCamera
+#                    getUserMedia.sharingMenuMicrophone,
+#                    getUserMedia.sharingMenuApplication,
+#                    getUserMedia.sharingMenuScreen,
+#                    getUserMedia.sharingMenuWindow,
 #                    getUserMedia.sharingMenuCameraMicrophone,
 #                    getUserMedia.sharingMenuCameraMicrophoneApplication,
 #                    getUserMedia.sharingMenuCameraMicrophoneScreen,
 #                    getUserMedia.sharingMenuCameraMicrophoneWindow,
+#                    getUserMedia.sharingMenuCameraApplication,
+#                    getUserMedia.sharingMenuCameraScreen,
+#                    getUserMedia.sharingMenuCameraWindow,
 #                    getUserMedia.sharingMenuMicrophoneApplication,
 #                    getUserMedia.sharingMenuMicrophoneScreen,
 #                    getUserMedia.sharingMenuMicrophoneWindow):
 # %S is the website origin (e.g. www.mozilla.org)
 getUserMedia.sharingMenuCamera = %S (camera)
 getUserMedia.sharingMenuMicrophone = %S (microphone)
 getUserMedia.sharingMenuApplication = %S (application)
 getUserMedia.sharingMenuScreen = %S (screen)
@@ -586,20 +526,22 @@ getUserMedia.sharingMenuMicrophoneApplic
 getUserMedia.sharingMenuMicrophoneScreen = %S (microphone and screen)
 getUserMedia.sharingMenuMicrophoneWindow = %S (microphone and window)
 # LOCALIZATION NOTE(getUserMedia.sharingMenuUnknownHost): this is used for the website
 # origin for the sharing menu if no readable origin could be deduced from the URL.
 getUserMedia.sharingMenuUnknownHost = Unknown origin
 
 # LOCALIZATION NOTE - %S is brandShortName
 slowStartup.message = %S seems slow… to… start.
-slowStartup.helpButton.label = Learn How to Speed It Up
-slowStartup.helpButton.accesskey = L
-slowStartup.disableNotificationButton.label = Don't Tell Me Again
-slowStartup.disableNotificationButton.accesskey = A
 
 
 # LOCALIZATION NOTE(customizeTips.tip0): %1$S will be replaced with the text defined
 # in customizeTips.tip0.hint, %2$S will be replaced with brandShortName, %3$S will
 # be replaced with a hyperlink containing the text defined in customizeTips.tip0.learnMore.
 customizeTips.tip0 = %1$S: You can customise %2$S to work the way you do. Simply drag any of the above to the menu or toolbar. %3$S about customising %2$S.
 customizeTips.tip0.hint = Hint
 customizeTips.tip0.learnMore = Learn more
+
+# LOCALIZATION NOTE(appmenu.*.description, appmenu.*.label): these are used for
+# the appmenu labels and buttons that appear when an update is staged for
+# installation or a background update has failed and a manual download is required.
+# %S is brandShortName
+appmenu.restartBrowserButton.label = Restart %S
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -79,26 +79,30 @@ paste-button.label = Paste
 paste-button.tooltiptext2 = Paste (%S)
 
 feed-button.label = Subscribe
 feed-button.tooltiptext2 = Subscribe to this page
 
 # LOCALIZATION NOTE (characterencoding-button.label): The \u00ad character at the beginning
 # of the string is used to disable auto hyphenation on the button text when it is displayed
 # in the menu panel.
-characterencoding-button.label = \u00adCharacter Encoding
+characterencoding-button.label = ­Character Encoding
 characterencoding-button.tooltiptext2 = Show character encoding options
 
 email-link-button.label = Email Link
 email-link-button.tooltiptext3 = Email a link to this page
 
 # LOCALIZATION NOTE(quit-button.tooltiptext.linux2): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.linux2 = Quit %1$S (%2$S)
 # LOCALIZATION NOTE(quit-button.tooltiptext.mac): %1$S is the brand name (e.g. Firefox),
 # %2$S is the keyboard shortcut
 quit-button.tooltiptext.mac = Quit %1$S (%2$S)
 
+
+
 panic-button.label = Forget
 panic-button.tooltiptext = Forget about some browsing history
 
-loop-call-button.label = Invite someone to talk
-loop-call-button.tooltiptext = Invite someone to talk
+web-apps-button.label = Apps
+
+# LOCALIZATION NOTE(devtools-webide-button.label, devtools-webide-button.tooltiptext):
+# widget is only visible after WebIDE has been started once (Tools > Web Developers > WebIDE)
--- a/browser/chrome/browser/devtools/VariablesView.dtd
+++ b/browser/chrome/browser/devtools/VariablesView.dtd
@@ -1,12 +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 : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+
 <!ENTITY PropertiesViewWindowTitle "Properties">
 
--- a/browser/chrome/browser/devtools/canvasdebugger.dtd
+++ b/browser/chrome/browser/devtools/canvasdebugger.dtd
@@ -1,45 +1,45 @@
 <!-- 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 : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
   -  on the button that triggers a page refresh. -->
+
+
+
 <!ENTITY canvasDebuggerUI.reloadNotice1   "Reload">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice2): This is the label shown
   -  along with the button that triggers a page refresh. -->
+
 <!ENTITY canvasDebuggerUI.reloadNotice2   "the page to be able to debug &lt;canvas&gt; contexts.">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
+
 <!ENTITY canvasDebuggerUI.emptyNotice1    "Click on the">
 <!ENTITY canvasDebuggerUI.emptyNotice2    "button to record an animation frame's call stack.">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.reloadNotice1): This is the label shown
   -  in the call list view while loading a snapshot. -->
+
 <!ENTITY canvasDebuggerUI.importNotice    "Loading…">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.recordSnapshot): This string is displayed
   -  on a button that starts a new snapshot. -->
+
 <!ENTITY canvasDebuggerUI.recordSnapshot.tooltip "Record the next frame in the animation loop.">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.importSnapshot): This string is displayed
   -  on a button that opens a dialog to import a saved snapshot data file. -->
+
 <!ENTITY canvasDebuggerUI.importSnapshot "Import…">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.clearSnapshots): This string is displayed
   -  on a button that remvoes all the snapshots. -->
+
 <!ENTITY canvasDebuggerUI.clearSnapshots "Clear">
-
 <!-- LOCALIZATION NOTE (canvasDebuggerUI.searchboxPlaceholder): This string is displayed
   -  as a placeholder of the search box that filters the calls list. -->
+
 <!ENTITY canvasDebuggerUI.searchboxPlaceholder "Filter calls">
--- a/browser/chrome/browser/devtools/connection-screen.dtd
+++ b/browser/chrome/browser/devtools/connection-screen.dtd
@@ -1,30 +1,30 @@
 <!-- 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 : FILE This file contains the Remote Connection strings.
   - The Remote Connection window can reached from the "connect…" menuitem
   - in the Web Developer menu.
   - -->
 
+
 <!ENTITY title      "Connect">
 <!ENTITY header     "Connect to remote device">
 <!ENTITY host       "Host:">
 <!ENTITY port       "Port:">
 <!ENTITY connect    "Connect">
 <!ENTITY connecting "Connecting…">
 <!ENTITY availableAddons "Available remote add-ons:">
 <!ENTITY availableTabs "Available remote tabs:">
 <!ENTITY availableProcesses "Available remote processes:">
 <!ENTITY connectionError "Error:">
 <!ENTITY errorTimeout "Error: connection timeout.">
 <!ENTITY errorRefused "Error: connection refused.">
 <!ENTITY errorUnexpected "Unexpected error.">
-
 <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
 these strings will be concatenated in a single label, remoteDocumentation will
 be used as text for a link to MDN. -->
+
 <!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the 'Remote debugging' option in the remote device. For more, see the">
 <!ENTITY remoteDocumentation "documentation">
 <!ENTITY remoteHelpSuffix ".">
 
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -1,200 +1,200 @@
 <!-- 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 : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (debuggerUI.closeButton.tooltip): This is the tooltip for
   -  the button that closes the debugger UI. -->
+
+
+
 <!ENTITY debuggerUI.closeButton.tooltip "Close">
-
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the debugger UI. -->
+
 <!ENTITY debuggerUI.panesButton.tooltip "Toggle panes">
-
 <!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.label): This is the message
   - displayed to users when they select a black boxed source from the sources
   - list in the debugger. -->
+
 <!ENTITY debuggerUI.blackBoxMessage.label "This source is black boxed: its breakpoints are disabled, and stepping skips through it.">
-
 <!-- LOCALIZATION NOTE (debuggerUI.blackBoxMessage.unBlackBoxButton): This is
   - the text displayed in the button to stop black boxing the currently selected
   - source. -->
+
 <!ENTITY debuggerUI.blackBoxMessage.unBlackBoxButton "Stop black boxing this source">
-
 <!-- LOCALIZATION NOTE (debuggerUI.optsButton.tooltip): This is the tooltip for
   -  the button that opens up an options context menu for the debugger UI. -->
+
 <!ENTITY debuggerUI.optsButton.tooltip  "Debugger Options">
-
 <!-- LOCALIZATION NOTE (debuggerUI.sources.blackBoxTooltip): This is the tooltip
   -  for the button that black boxes the selected source. -->
+
 <!ENTITY debuggerUI.sources.blackBoxTooltip "Toggle Black Boxing">
-
 <!-- LOCALIZATION NOTE (debuggerUI.sources.prettyPrint): This is the tooltip for the
   -  button that pretty prints the selected source. -->
+
 <!ENTITY debuggerUI.sources.prettyPrint "Prettify Source">
-
 <!-- LOCALIZATION NOTE (debuggerUI.autoPrettyPrint): This is the label for the
   -  checkbox that toggles auto pretty print. -->
+
 <!ENTITY debuggerUI.autoPrettyPrint     "Auto Prettify Minified Sources">
 <!ENTITY debuggerUI.autoPrettyPrint.accesskey "P">
-
 <!-- LOCALIZATION NOTE (debuggerUI.sources.toggleBreakpoints): This is the tooltip for the
   -  button that toggles all breakpoints for all sources. -->
+
 <!ENTITY debuggerUI.sources.toggleBreakpoints "Enable/disable all breakpoints">
-
 <!-- LOCALIZATION NOTE (debuggerUI.startTracing): This is the text displayed in
   - the button to start execution tracing. -->
+
 <!ENTITY debuggerUI.startTracing "Start Tracing">
-
 <!-- LOCALIZATION NOTE (debuggerUI.clearButton): This is the label for
   -  the button that clears the collected tracing data in the tracing tab. -->
+
 <!ENTITY debuggerUI.clearButton "Clear">
-
 <!-- LOCALIZATION NOTE (debuggerUI.clearButton.tooltip): This is the tooltip for
   -  the button that clears the collected tracing data in the tracing tab. -->
+
 <!ENTITY debuggerUI.clearButton.tooltip "Clear the collected traces">
-
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
+
 <!ENTITY debuggerUI.pauseExceptions           "Pause on Exceptions">
 <!ENTITY debuggerUI.pauseExceptions.accesskey "E">
-
 <!-- LOCALIZATION NOTE (debuggerUI.ignoreCaughtExceptions): This is the label for the
   -  checkbox that toggles ignoring caught exceptions. -->
+
 <!ENTITY debuggerUI.ignoreCaughtExceptions           "Ignore Caught Exceptions">
 <!ENTITY debuggerUI.ignoreCaughtExceptions.accesskey "C">
-
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
+
 <!ENTITY debuggerUI.showPanesOnInit           "Show Panes on Startup">
 <!ENTITY debuggerUI.showPanesOnInit.accesskey "S">
-
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
+
 <!ENTITY debuggerUI.showVarsFilter           "Show Variables Filter Box">
 <!ENTITY debuggerUI.showVarsFilter.accesskey "V">
-
 <!-- LOCALIZATION NOTE (debuggerUI.showOnlyEnum): This is the label for the
   -  checkbox that toggles visibility of hidden (non-enumerable) variables and
   -  properties in stack views. The "enumerable" flag is a state of a property
   -  defined in JavaScript. When in doubt, leave untranslated. -->
+
 <!ENTITY debuggerUI.showOnlyEnum           "Show Only Enumerable Properties">
 <!ENTITY debuggerUI.showOnlyEnum.accesskey "P">
+<!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
+  -  the checkbox that toggles the display of original or sourcemap-derived
+  -  sources. -->
 
-<!-- LOCALIZATION NOTE (debuggerUI.showOriginalSource): This is the label for
-       -  the checkbox that toggles the display of original or sourcemap-derived
-  -  sources. -->
 <!ENTITY debuggerUI.showOriginalSource           "Show Original Sources">
 <!ENTITY debuggerUI.showOriginalSource.accesskey "O">
-
 <!-- LOCALIZATION NOTE (debuggerUI.autoBlackBox): This is the label for
   -  the checkbox that toggles whether sources that we suspect are minified are
   -  automatically black boxed or not. -->
+
 <!ENTITY debuggerUI.autoBlackBox           "Automatically Black Box Minified Sources">
 <!ENTITY debuggerUI.autoBlackBox.accesskey "B">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelOperators): This is the text that
   -  appears in the filter panel popup as a header for the operators part. -->
+
 <!ENTITY debuggerUI.searchPanelOperators    "Operators:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchFile): This is the text that appears
   -  in the source editor's context menu for the scripts search operation. -->
+
 <!ENTITY debuggerUI.searchFile           "Filter Scripts">
 <!ENTITY debuggerUI.searchFile.key       "P">
 <!ENTITY debuggerUI.searchFile.altkey    "O">
 <!ENTITY debuggerUI.searchFile.accesskey "P">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchGlobal): This is the text that appears
   -  in the source editor's context menu for the global search operation. -->
+
 <!ENTITY debuggerUI.searchGlobal           "Search in All Files">
 <!ENTITY debuggerUI.searchGlobal.key       "F">
 <!ENTITY debuggerUI.searchGlobal.accesskey "F">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchFunction): This is the text that appears
   -  in the source editor's context menu for the function search operation. -->
+
 <!ENTITY debuggerUI.searchFunction           "Search for Function Definition">
 <!ENTITY debuggerUI.searchFunction.key       "D">
 <!ENTITY debuggerUI.searchFunction.accesskey "D">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchToken): This is the text that appears
   -  in the source editor's context menu for the token search operation. -->
+
 <!ENTITY debuggerUI.searchToken           "Find">
 <!ENTITY debuggerUI.searchToken.key       "F">
 <!ENTITY debuggerUI.searchToken.accesskey "F">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
+
 <!ENTITY debuggerUI.searchGoToLine           "Go to Line…">
 <!ENTITY debuggerUI.searchGoToLine.key       "L">
 <!ENTITY debuggerUI.searchGoToLine.accesskey "L">
-
 <!-- LOCALIZATION NOTE (debuggerUI.searchVariable): This is the text that appears
   -  in the source editor's context menu for the variables search operation. -->
+
 <!ENTITY debuggerUI.searchVariable           "Filter Variables">
 <!ENTITY debuggerUI.searchVariable.key       "V">
 <!ENTITY debuggerUI.searchVariable.accesskey "V">
-
 <!-- LOCALIZATION NOTE (debuggerUI.focusVariables): This is the text that appears
   -  in the source editor's context menu for the variables focus operation. -->
+
 <!ENTITY debuggerUI.focusVariables           "Focus Variables Tree">
 <!ENTITY debuggerUI.focusVariables.key       "V">
 <!ENTITY debuggerUI.focusVariables.accesskey "V">
-
 <!-- LOCALIZATION NOTE (debuggerUI.condBreakPanelTitle): This is the text that
   -  appears in the conditional breakpoint panel popup as a description. -->
+
 <!ENTITY debuggerUI.condBreakPanelTitle "This breakpoint will stop execution only if the following expression is true">
-
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuBreak): This is the text that
   -  appears in the source editor context menu for adding a breakpoint. -->
+
 <!ENTITY debuggerUI.seMenuBreak     "Add Breakpoint">
 <!ENTITY debuggerUI.seMenuBreak.key "B">
-
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuCondBreak): This is the text that
   -  appears in the source editor context menu for adding a conditional
   -  breakpoint. -->
+
 <!ENTITY debuggerUI.seMenuCondBreak     "Add Conditional Breakpoint">
 <!ENTITY debuggerUI.seMenuCondBreak.key "B">
+<!-- LOCALIZATION NOTE (debuggerUI.tabs.*): This is the text that
+  -  appears in the debugger's side pane tabs. -->
 
-<!-- LOCALIZATION NOTE (debuggerUI.instruments.*): This is the text that
-  -  appears in the debugger's instruments pane tabs. -->
 <!ENTITY debuggerUI.tabs.sources        "Sources">
 <!ENTITY debuggerUI.tabs.traces         "Traces">
 <!ENTITY debuggerUI.tabs.callstack      "Call Stack">
 <!ENTITY debuggerUI.tabs.variables      "Variables">
 <!ENTITY debuggerUI.tabs.events         "Events">
-
 <!-- LOCALIZATION NOTE (debuggerUI.seMenuAddWatch): This is the text that
   -  appears in the source editor context menu for adding an expression. -->
+
 <!ENTITY debuggerUI.seMenuAddWatch      "Selection to Watch Expression">
 <!ENTITY debuggerUI.seMenuAddWatch.key  "E">
-
 <!-- LOCALIZATION NOTE (debuggerUI.addWatch): This is the text that
   -  appears in the watch expressions context menu for adding an expression. -->
+
 <!ENTITY debuggerUI.addWatch            "Add Watch Expression">
 <!ENTITY debuggerUI.addWatch.accesskey  "E">
-
 <!-- LOCALIZATION NOTE (debuggerUI.removeWatch): This is the text that
   -  appears in the watch expressions context menu for removing all expressions. -->
+
 <!ENTITY debuggerUI.removeAllWatch           "Remove All Watch Expressions">
 <!ENTITY debuggerUI.removeAllWatch.key       "E">
 <!ENTITY debuggerUI.removeAllWatch.accesskey "E">
-
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
+
 <!ENTITY debuggerUI.stepping.resume1    "VK_F8">
 <!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
 <!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
 <!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
 <!ENTITY debuggerUI.stepping.stepIn1    "VK_F11">
 <!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
 <!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
 <!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -1,14 +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/.
 
-# LOCALIZATION NOTE These strings are used inside the Script Debugger
-# which is available from the Web Developer sub-menu -> 'Script Debugger'.
+# LOCALIZATION NOTE These strings are used inside the Debugger
+# which is available from the Web Developer sub-menu -> 'Debugger'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (ToolboxDebugger.label):
 # This string is displayed in the title of the tab when the debugger is
@@ -33,21 +33,21 @@ DebuggerWindowScriptTitle=Browser Debugg
 ToolboxDebugger.tooltip=JavaScript Debugger
 
 # LOCALIZATION NOTE (debuggerMenu.commandkey, debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
 debuggerMenu.commandkey=S
 debuggerMenu.accesskey=D
 
 # LOCALIZATION NOTE (collapsePanes): This is the tooltip for the button
-# that collapses the left and right panes in the debugger UI. -->
+# that collapses the left and right panes in the debugger UI.
 collapsePanes=Collapse panes
 
 # LOCALIZATION NOTE (expandPanes): This is the tooltip for the button
-# that expands the left and right panes in the debugger UI. -->
+# that expands the left and right panes in the debugger UI.
 expandPanes=Expand panes
 
 # LOCALIZATION NOTE (pauseLabel): The label that is displayed on the pause
 # button when the debugger is in a running state.
 pauseButtonTooltip=Click to pause (%S)
 
 # LOCALIZATION NOTE (resumeLabel): The label that is displayed on the pause
 # button when the debugger is in a paused state.
@@ -141,17 +141,17 @@ mutationEvents=Mutation
 navigationEvents=Navigation
 pointerLockEvents=Pointer Lock
 sensorEvents=Sensor
 storageEvents=Storage
 timeEvents=Time
 touchEvents=Touch
 otherEvents=Other
 
-# LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
+# LOCALIZATION NOTE (blackBoxCheckboxTooltip): The tooltip text to display when
 # the user hovers over the checkbox used to toggle black boxing its associated
 # source.
 blackBoxCheckboxTooltip=Toggle black boxing
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText=No matches found
 
@@ -207,24 +207,24 @@ breakpointMenuItem.disableOthers=Disable
 breakpointMenuItem.deleteOthers=Remove others
 breakpointMenuItem.enableAll=Enable all breakpoints
 breakpointMenuItem.disableAll=Disable all breakpoints
 breakpointMenuItem.deleteAll=Remove all breakpoints
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the loading process has started but there is no file to display
 # yet.
-loadingText=Loading\u2026
+loadingText=Loading…
 
 # LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
 # viewer when there is an error loading a file
 errorLoadingText=Error loading source:\n
 
-# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
-# expressions list to add a new item.
+# LOCALIZATION NOTE (addWatchExpressionText): The text that is displayed in the
+# watch expressions list to add a new item.
 addWatchExpressionText=Add watch expression
 
 # LOCALIZATION NOTE (addWatchExpressionButton): The button that is displayed in the
 # variables view popup.
 addWatchExpressionButton=Watch
 
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
@@ -258,21 +258,21 @@ variablesViewErrorStacktrace=Stack trace
 # example: 3 more…
 variablesViewMoreObjects=#1 more…;#1 more…
 
 # LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
 # in the variables list on an item with an editable name.
 variablesEditableNameTooltip=Double click to edit
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
-# in the variables list on an item with an editable name.
+# in the variables list on an item with an editable value.
 variablesEditableValueTooltip=Click to change value
 
 # LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
-# in the variables list on an item with which can be removed.
+# in the variables list on an item which can be removed.
 variablesCloseButtonTooltip=Click to remove
 
 # LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
 # in the variables list on a getter or setter which can be edited.
 variablesEditButtonTooltip=Click to set value
 
 # LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
 # in a tooltip on the "open in inspector" button in the the variables list for a
@@ -297,17 +297,17 @@ overriddenTooltip=overridden
 WebIDLTooltip=WebIDL
 
 # LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
 # in the variables list as a separator between the name and value.
 variablesSeparatorLabel=:
 
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
-watchExpressionsSeparatorLabel=\ →
+watchExpressionsSeparatorLabel=\u0020→
 
 # LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
 # in the functions search panel as a separator between function's inferred name
 # and its real name (if available).
 functionSearchSeparatorLabel=←
 
 # LOCALIZATION NOTE (resumptionOrderPanelTitle): This is the text that appears
 # as a description in the notification panel popup, when multiple debuggers are
--- a/browser/chrome/browser/devtools/font-inspector.dtd
+++ b/browser/chrome/browser/devtools/font-inspector.dtd
@@ -1,12 +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 : FILE This file contains the Font Inspector strings.
   - The Font Inspector is the panel accessible in the Inspector sidebar. -->
 
+
 <!ENTITY title "Fonts">
 <!ENTITY showAllFonts "See all the fonts used in the page">
 <!ENTITY usedAs "Used as: ">
 <!ENTITY system "system">
 <!ENTITY remote "remote">
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -136,18 +136,18 @@ nodeParseNone=No matches
 # LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
 # These strings describe the "help" command, used to display a description of
 # a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc=Get help on the available commands
 helpManual=Provide help either on a specific command (if a search string is provided and an exact match is found) or on the available commands (if a search string is not provided, or if no exact match is found).
 helpSearchDesc=Search string
 helpSearchManual3=search string to use in narrowing down the displayed commands. Regular expressions not supported.
 
-# LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
-# displayed in the help page for a command in the console.
+# LOCALIZATION NOTE: These strings are displayed in the help page for a
+# command in the console.
 helpManSynopsis=Synopsis
 
 # LOCALIZATION NOTE: This message is displayed in the help page if the command
 # has no parameters.
 helpManNone=None
 
 # LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
@@ -163,18 +163,18 @@ helpListNone=No commands starting with '
 # LOCALIZATION NOTE (helpManRequired, helpManOptional, helpManDefault): When
 # the 'help x' command wants to show the manual for the 'x' command, it needs
 # to be able to describe the parameters as either required or optional, or if
 # they have a default value.
 helpManRequired=required
 helpManOptional=optional
 helpManDefault=optional, default=%1$S
 
-# LOCALIZATION NOTE (helpIntro): This forms part of the output from the 'help'
-# command. 'GCLI' is a project name and should be left untranslated.
+# LOCALIZATION NOTE: This forms part of the output from the 'help' command.
+# 'GCLI' is a project name and should be left untranslated.
 helpIntro=GCLI is an experiment to create a highly usable command line for web developers.
 
 # LOCALIZATION NOTE: Text shown as part of the output of the 'help' command
 # when the command in question has sub-commands, before a list of the matching
 # sub-commands.
 subCommands=Sub-Commands
 
 # LOCALIZATION NOTE: This error message is displayed when the command line is
@@ -212,18 +212,18 @@ connectMethodDesc=The method of connecti
 connectUrlDesc=The URL to connect to
 connectDupReply=Connection called %S already exists.
 
 # LOCALIZATION NOTE: The output of the 'connect' command, telling the user
 # what it has done. Parameters: %S is the prefix command. See localization
 # comment for 'connect' for an explanation about 'prefix'.
 connectReply=Added %S commands.
 
-# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2, disconnectPrefixDesc,
-# disconnectForceDesc): These strings describe the 'disconnect' command and
+# LOCALIZATION NOTE (disconnectDesc2, disconnectManual2,
+# disconnectPrefixDesc): These strings describe the 'disconnect' command and
 # all its available parameters. See localization comment for 'connect' for an
 # explanation about 'prefix'.
 disconnectDesc2=Disconnect from server
 disconnectManual2=Disconnect from a server currently connected for remote commands execution
 disconnectPrefixDesc=Parent prefix for imported commands
 
 # LOCALIZATION NOTE: This is the output of the 'disconnect' command,
 # explaining the user what has been done. Parameters: %S is the number of
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -523,21 +523,21 @@ dbgStepDesc=Manage stepping
 # set of commands that control stepping.
 dbgStepManual=Commands to step in, out and over lines of code
 
 # LOCALIZATION NOTE (dbgStepOverDesc) A very short string used to describe the
 # function of the dbg step over command.
 dbgStepOverDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call then the debugger executes the whole function, and it stops at the next statement after the function call
 
 # LOCALIZATION NOTE (dbgStepInDesc) A very short string used to describe the
-# function of the dbg step out command.
+# function of the dbg step in command.
 dbgStepInDesc=Executes the current statement and then stops at the next statement. If the current statement is a function call, then the debugger steps into that function, otherwise it stops at the next statement
 
 # LOCALIZATION NOTE (dbgStepOutDesc) A very short string used to describe the
-# function of the dbg step over command.
+# function of the dbg step out command.
 dbgStepOutDesc=Steps out of the current function and up one level if the function is nested. If in the main body, the script is executed to the end, or to the next breakpoint. The skipped statements are executed, but not stepped through
 
 # LOCALIZATION NOTE (dbgListSourcesDesc) A very short string used to describe the
 # function of the dbg list command.
 dbgListSourcesDesc=List the source URLs loaded in the debugger
 
 # LOCALIZATION NOTE (dbgBlackBoxDesc) A very short string used to describe the
 # function of the 'dbg blackbox' command.
@@ -754,45 +754,45 @@ addonPendingUpgrade=upgrade
 
 # LOCALIZATION NOTE (addonNameDesc) A very short description of the
 # name parameter of numerous add-on commands. This string is designed to be shown
 # in a menu alongside the command name, which is why it should be as short as
 # possible.
 addonNameDesc=The name of the add-on
 
 # LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for addons of a particular type were not found.
+# command when a search for add-ons of a particular type were not found.
 addonNoneOfType=There are no add-ons of that type installed.
 
 # LOCALIZATION NOTE (addonEnableDesc) A very short description of the
 # 'addon enable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 addonEnableDesc=Enable the specified add-on
 
 # LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
 # 'addon enable' command when an attempt is made to enable an add-on that is
 # already enabled.
 addonAlreadyEnabled=%S is already enabled.
 
 # LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an addon is enabled.
+# command when an add-on is enabled.
 addonEnabled=%S enabled.
 
 # LOCALIZATION NOTE (addonDisableDesc) A very short description of the
 # 'addon disable <type>' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 addonDisableDesc=Disable the specified add-on
 
 # LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
 # 'addon disable' command when an attempt is made to disable an add-on that is
 # already disabled.
 addonAlreadyDisabled=%S is already disabled.
 
 # LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an addon is disabled.
+# command when an add-on is disabled.
 addonDisabled=%S disabled.
 
 # LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 exportDesc=Export resources
 
 # LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
--- a/browser/chrome/browser/devtools/inspector.dtd
+++ b/browser/chrome/browser/devtools/inspector.dtd
@@ -17,8 +17,9 @@
 <!ENTITY inspectorHTMLDelete.accesskey      "D">
 
 <!ENTITY inspector.selectButton.tooltip     "Select element with mouse">
 
 <!ENTITY inspectorSearchHTML.label          "Search HTML">
 <!ENTITY inspectorSearchHTML.key            "F">
 
 <!ENTITY inspectorCopyImageDataUri.label       "Copy Image Data-URL">
+
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -28,19 +28,17 @@ debuggerPausedWarning.message=Debugger i
 
 # LOCALIZATION NOTE (nodeMenu.tooltiptext)
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Node operations
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
-inspector.label=Inspector
 inspector.commandkey=C
-inspector.accesskey=I
 
 # LOCALIZATION NOTE (inspector.panelLabel.*)
 # Labels applied to the panel and views within the panel in the toolbox
 inspector.panelLabel=Inspector Panel
 inspector.panelLabel.markupView=Markup View
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
--- a/browser/chrome/browser/devtools/layoutview.dtd
+++ b/browser/chrome/browser/devtools/layoutview.dtd
@@ -1,23 +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/. -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the Layout View strings.
   - The Layout View is the panel accessible at the bottom of the Inspector
   - sidebar. -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (*.tooltip): These tooltips are not regular tooltips.
   -  The text appears on the bottom right corner of the layout view when
   -  the corresponding box is hovered. -->
 
+
+
+
 <!ENTITY title                  "Box Model">
 <!ENTITY margin.tooltip         "margin">
 <!ENTITY border.tooltip         "border">
 <!ENTITY padding.tooltip        "padding">
 <!ENTITY content.tooltip        "content">
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -1,270 +1,277 @@
 <!-- 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 : FILE This file contains the Network Monitor strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (netmonitorUI.perfNotice1/2): These are the labels displayed
   -  in the network table when empty to start performance analysis. -->
+
+
+
 <!ENTITY netmonitorUI.perfNotice1         "• Click on the">
 <!ENTITY netmonitorUI.perfNotice2         "button to start performance analysis.">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.reload1/2/3): These are the labels displayed
   -  in the network table when empty to start logging network requests. -->
+
 <!ENTITY netmonitorUI.reloadNotice1       "• Perform a request or">
 <!ENTITY netmonitorUI.reloadNotice2       "Reload">
 <!ENTITY netmonitorUI.reloadNotice3       "the page to see detailed information about network activity.">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status2): This is the label displayed
   -  in the network table toolbar, above the "status" column. -->
+
 <!ENTITY netmonitorUI.toolbar.status2     "✓">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.method): This is the label displayed
   -  in the network table toolbar, above the "method" column. -->
+
 <!ENTITY netmonitorUI.toolbar.method      "Method">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.file): This is the label displayed
   -  in the network table toolbar, above the "file" column. -->
+
 <!ENTITY netmonitorUI.toolbar.file        "File">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.domain): This is the label displayed
   -  in the network table toolbar, above the "domain" column. -->
+
 <!ENTITY netmonitorUI.toolbar.domain      "Domain">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.type): This is the label displayed
   -  in the network table toolbar, above the "type" column. -->
+
 <!ENTITY netmonitorUI.toolbar.type        "Type">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.size): This is the label displayed
   -  in the network table toolbar, above the "size" column. -->
+
 <!ENTITY netmonitorUI.toolbar.size        "Size">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.toolbar.waterfall): This is the label displayed
   -  in the network table toolbar, above the "waterfall" column. -->
+
 <!ENTITY netmonitorUI.toolbar.waterfall   "Timeline">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.headers): This is the label displayed
   -  in the network details pane identifying the headers tab. -->
+
 <!ENTITY netmonitorUI.tab.headers         "Headers">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.cookies): This is the label displayed
   -  in the network details pane identifying the cookies tab. -->
+
 <!ENTITY netmonitorUI.tab.cookies         "Cookies">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.params): This is the label displayed
   -  in the network details pane identifying the params tab. -->
+
 <!ENTITY netmonitorUI.tab.params          "Params">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.response): This is the label displayed
   -  in the network details pane identifying the response tab. -->
+
 <!ENTITY netmonitorUI.tab.response        "Response">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.timings): This is the label displayed
   -  in the network details pane identifying the timings tab. -->
+
 <!ENTITY netmonitorUI.tab.timings         "Timings">
-
 <!-- LOCALIZATION NOTE (debuggerUI.tab.preview): This is the label displayed
   -  in the network details pane identifying the preview tab. -->
+
 <!ENTITY netmonitorUI.tab.preview         "Preview">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterAll): This is the label displayed
   -  in the network details footer for the "All" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterAll    "All">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterHTML): This is the label displayed
   -  in the network details footer for the "HTML" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterHTML   "HTML">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterCSS): This is the label displayed
   -  in the network details footer for the "CSS" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterCSS    "CSS">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterJS): This is the label displayed
   -  in the network details footer for the "JS" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterJS     "JS">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterXHR): This is the label displayed
   -  in the network details footer for the "XHR" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterXHR    "XHR">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFonts): This is the label displayed
   -  in the network details footer for the "Fonts" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterFonts  "Fonts">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterImages): This is the label displayed
   -  in the network details footer for the "Images" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterImages "Images">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterMedia): This is the label displayed
   -  in the network details footer for the "Media" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterMedia  "Media">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterFlash): This is the label displayed
   -  in the network details footer for the "Flash" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterFlash  "Flash">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.filterOther): This is the label displayed
   -  in the network details footer for the "Other" filtering button. -->
+
 <!ENTITY netmonitorUI.footer.filterOther  "Other">
-
 <!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
   -  in the network details footer for the "Clear" button. -->
-<!ENTITY netmonitorUI.footer.clear  "Clear">
 
-<!-- LOCALIZATION NOTE (debuggerUI.footer.perf): This is the label displayed
+<!ENTITY netmonitorUI.footer.clear  "Clear">
+<!-- LOCALIZATION NOTE (debuggerUI.footer.clear): This is the label displayed
   -  in the network details footer for the performance analysis button. -->
+
 <!ENTITY netmonitorUI.footer.perf   "Toggle performance analysis…">
-
 <!-- LOCALIZATION NOTE (debuggerUI.panesButton.tooltip): This is the tooltip for
   -  the button that toggles the panes visible or hidden in the netmonitor UI. -->
+
 <!ENTITY netmonitorUI.panesButton.tooltip "Toggle network info">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.url): This is the label displayed
   -  in the network details headers tab identifying the URL. -->
+
 <!ENTITY netmonitorUI.summary.url         "Request URL:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.method): This is the label displayed
   -  in the network details headers tab identifying the method. -->
+
 <!ENTITY netmonitorUI.summary.method      "Request method:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.status): This is the label displayed
   -  in the network details headers tab identifying the status code. -->
+
 <!ENTITY netmonitorUI.summary.status      "Status code:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.version): This is the label displayed
   -  in the network details headers tab identifying the http version. -->
+
 <!ENTITY netmonitorUI.summary.version     "Version:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.size): This is the label displayed
   -  in the network details headers tab identifying the headers size. -->
+
 <!ENTITY netmonitorUI.summary.size        "Headers size:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.response.name): This is the label displayed
   -  in the network details response tab identifying an image's file name. -->
+
 <!ENTITY netmonitorUI.response.name       "Name:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.response.dimensions): This is the label displayed
   -  in the network details response tab identifying an image's dimensions. -->
+
 <!ENTITY netmonitorUI.response.dimensions "Dimensions:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.response.mime): This is the label displayed
   -  in the network details response tab identifying an image's mime. -->
+
 <!ENTITY netmonitorUI.response.mime       "MIME Type:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.response.encoding): This is the label displayed
   -  in the network details response tab identifying an image's encoding. -->
+
 <!ENTITY netmonitorUI.response.encoding   "Encoding:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.blocked): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "blocked" state. -->
+
 <!ENTITY netmonitorUI.timings.blocked     "Blocked:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.dns): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "dns" state. -->
+
 <!ENTITY netmonitorUI.timings.dns         "DNS resolution:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.connect): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "connect" state. -->
+
 <!ENTITY netmonitorUI.timings.connect     "Connecting:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.send): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "send" state. -->
+
 <!ENTITY netmonitorUI.timings.send        "Sending:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.wait): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "wait" state. -->
+
 <!ENTITY netmonitorUI.timings.wait        "Waiting:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.timings.receive): This is the label displayed
   -  in the network details timings tab identifying the amount of time spent
   -  in a "receive" state. -->
+
 <!ENTITY netmonitorUI.timings.receive     "Receiving:">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools): This is the label displayed
   -  on the context menu that shows the performance analysis tools -->
+
 <!ENTITY netmonitorUI.context.perfTools   "Start Performance Analysis…">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.perfTools.accesskey): This is the access key
   -  for the performance analysis menu item displayed in the context menu for a request -->
+
 <!ENTITY netmonitorUI.context.perfTools.accesskey "S">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
-<!ENTITY netmonitorUI.context.copyUrl      "Copy URL">
 
+<!ENTITY netmonitorUI.context.copyUrl     "Copy URL">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyAsCurl): This is the label displayed
   -  on the context menu that copies the selected request as a cURL command.
   -  The capitalization is part of the official name and should be used throughout all languages.
   -  http://en.wikipedia.org/wiki/CURL -->
+
 <!ENTITY netmonitorUI.context.copyAsCurl    "Copy as cURL">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
 
+<!ENTITY netmonitorUI.context.copyUrl.accesskey "C">
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri): This is the label displayed
   -  on the context menu that copies the selected image as data uri -->
+
 <!ENTITY netmonitorUI.context.copyImageAsDataUri "Copy Image as Data URI">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyImageAsDataUri.accesskey): This is the access key
   -  for the Copy Image As Data URI menu item displayed in the context menu for a request -->
+
 <!ENTITY netmonitorUI.context.copyImageAsDataUri.accesskey  "I">
-
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
   -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
-<!ENTITY netmonitorUI.summary.editAndResend      "Edit and Resend">
 
+<!ENTITY netmonitorUI.summary.editAndResend "Edit and Resend">
 <!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
   -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
 
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey "R">
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders): This is the label displayed
+  -  on the button in the headers tab that toggle view for raw request/response headers
+     from the currently displayed request -->
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.requestHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw request headers textarea -->
+<!-- LOCALIZATION NOTE (debuggerUI.summary.rawHeaders.responseHeaders): This is the label displayed
+  -  in the network details headers tab identifying the raw response headers textarea -->
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container  -->
+
 <!ENTITY netmonitorUI.context.newTab      "Open in New Tab">
-
 <!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  network container -->
-<!ENTITY netmonitorUI.context.newTab.accesskey  "O">
 
+<!ENTITY netmonitorUI.context.newTab.accesskey "O">
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
+
 <!ENTITY netmonitorUI.custom.newRequest   "New Request">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
+
 <!ENTITY netmonitorUI.custom.query        "Query String:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.headers): This is the label displayed
   -  above the request headers entry in the custom request form -->
+
 <!ENTITY netmonitorUI.custom.headers      "Request Headers:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.postData): This is the label displayed
   -  above the request body entry in the custom request form -->
+
 <!ENTITY netmonitorUI.custom.postData     "Request Body:">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.send): This is the label displayed
   -  on the button which sends the custom request -->
+
 <!ENTITY netmonitorUI.custom.send         "Send">
-
 <!-- LOCALIZATION NOTE (debuggerUI.custom.cancel): This is the label displayed
   -  on the button which cancels and closes the custom request form -->
+
 <!ENTITY netmonitorUI.custom.cancel       "Cancel">
-
 <!-- LOCALIZATION NOTE (debuggerUI.backButton): This is the label displayed
   -  on the button which exists the performance statistics view -->
+
 <!ENTITY netmonitorUI.backButton          "Back">
--- a/browser/chrome/browser/devtools/netmonitor.properties
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -8,26 +8,24 @@
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (netmonitor.label):
 # This string is displayed in the title of the tab when the Network Monitor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
-netmonitor.label=Network
 
 # LOCALIZATION NOTE (netmonitor.panelLabel):
 # This is used as the label for the toolbox panel.
 netmonitor.panelLabel=Network Panel
 
 # LOCALIZATION NOTE (netmonitor.commandkey, netmonitor.accesskey)
 # Used for the menuitem in the tool menu
 netmonitor.commandkey=Q
-netmonitor.accesskey=N
 
 # LOCALIZATION NOTE (netmonitor.tooltip):
 # This string is displayed in the tooltip of the tab when the Network Monitor is
 # displayed inside the developer tools window.
 netmonitor.tooltip=Network Monitor
 
 # LOCALIZATION NOTE (collapseDetailsPane): This is the tooltip for the button
 # that collapses the network details pane in the UI.
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -1,48 +1,49 @@
 <!-- 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 : FILE This file contains the Profiler strings -->
-
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (profilerUI.emptyNotice1/2): This is the label shown
   -  in the call list view when empty. -->
+
+
+
 <!ENTITY profilerUI.emptyNotice1    "Click on the">
 <!ENTITY profilerUI.emptyNotice2    "button to start recording JavaScript function calls.">
-
 <!-- LOCALIZATION NOTE (profilerUI.stopNotice1/2): This is the label shown
   -  in the call list view while recording a profile. -->
+
 <!ENTITY profilerUI.stopNotice1    "Click on the">
 <!ENTITY profilerUI.stopNotice2    "button again to stop profiling.">
-
 <!-- LOCALIZATION NOTE (profilerUI.loadingNotice): This is the label shown
   -  in the call list view while loading a profile. -->
+
 <!ENTITY profilerUI.loadingNotice "Loading…">
-
 <!-- LOCALIZATION NOTE (profilerUI.recordButton): This string is displayed
   -  on a button that starts a new profile. -->
+
 <!ENTITY profilerUI.recordButton.tooltip "Record JavaScript function calls.">
-
 <!-- LOCALIZATION NOTE (profilerUI.importButton): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
+
 <!ENTITY profilerUI.importButton "Import…">
-
 <!-- LOCALIZATION NOTE (profilerUI.clearButton): This string is displayed
   -  on a button that remvoes all the recordings. -->
+
 <!ENTITY profilerUI.clearButton "Clear">
-
 <!-- LOCALIZATION NOTE (profilerUI.table.*): These strings are displayed
   -  in the call tree headers for a recording. -->
-<!ENTITY profilerUI.table.duration    "Time (ms)">
-<!ENTITY profilerUI.table.percentage  "Cost">
-<!ENTITY profilerUI.table.invocations "Calls">
-<!ENTITY profilerUI.table.function    "Function">
+
+
 
+
+<!ENTITY profilerUI.table.function        "Function">
 <!-- LOCALIZATION NOTE (profilerUI.newtab.tooltiptext): The tooltiptext shown
   -  on the "+" (new tab) button for a profile when a selection is available. -->
+
 <!ENTITY profilerUI.newtab.tooltiptext "Add new tab from selection">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -1,14 +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/.
 
-# LOCALIZATION NOTE These strings are used inside the Debugger
-# which is available from the Web Developer sub-menu -> 'Debugger'.
+# LOCALIZATION NOTE These strings are used inside the Profiler
+# which is available from the Web Developer sub-menu -> 'Profiler'.
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (profiler.label):
 # This string is displayed in the title of the tab when the profiler is
--- a/browser/chrome/browser/devtools/projecteditor.properties
+++ b/browser/chrome/browser/devtools/projecteditor.properties
@@ -18,17 +18,17 @@ projecteditor.confirmUnsavedTitle=Unsave
 
 # LOCALIZATION NOTE (projecteditor.confirmUnsavedLabel):
 # This string is displayed as the message of the confirm prompt that checks
 # to make sure if the project editor can be closed without saving changes
 projecteditor.confirmUnsavedLabel=You have unsaved changes that will be lost if you exit. Are you sure you want to continue?
 
 # LOCALIZATION NOTE (projecteditor.deleteLabel):
 # This string is displayed as a context menu item for allowing the selected
-# file / folder to be deleted
+# file / folder to be deleted.
 projecteditor.deleteLabel=Delete
 
 # LOCALIZATION NOTE (projecteditor.deletePromptTitle):
 # This string is displayed as as the title of the confirm prompt that checks
 # to make sure if a file or folder should be removed.
 projecteditor.deletePromptTitle=Delete
 
 # LOCALIZATION NOTE (projecteditor.deleteFolderPromptMessage):
@@ -37,47 +37,47 @@ projecteditor.deletePromptTitle=Delete
 projecteditor.deleteFolderPromptMessage=Are you sure you want to delete this folder?
 
 # LOCALIZATION NOTE (projecteditor.deleteFilePromptMessage):
 # This string is displayed as as the message of the confirm prompt that checks
 # to make sure if a file should be removed.
 projecteditor.deleteFilePromptMessage=Are you sure you want to delete this file?
 
 # LOCALIZATION NOTE (projecteditor.newLabel):
-# This string is displayed as a context menu item for adding a new file to
-# the directory
+# This string is displayed as a menu item for adding a new file to
+# the directory.
 projecteditor.newLabel=New…
 
 # LOCALIZATION NOTE (projecteditor.saveLabel):
 # This string is displayed as a menu item for saving the current file.
 projecteditor.saveLabel=Save
 
 # LOCALIZATION NOTE (projecteditor.saveAsLabel):
 # This string is displayed as a menu item for saving the current file
 # with a new name.
 projecteditor.saveAsLabel=Save As…
 
 # LOCALIZATION NOTE (projecteditor.selectFileLabel):
-# This string is displayed as the title on the file picker when saving a file
+# This string is displayed as the title on the file picker when saving a file.
 projecteditor.selectFileLabel=Select a File
 
 # LOCALIZATION NOTE (projecteditor.openFolderLabel):
-# This string is displayed as the title on the file picker when opening a folder
+# This string is displayed as the title on the file picker when opening a folder.
 projecteditor.openFolderLabel=Select a Folder
 
 # LOCALIZATION NOTE (projecteditor.openFileLabel):
-# This string is displayed as the title on the file picker when opening a file
+# This string is displayed as the title on the file picker when opening a file.
 projecteditor.openFileLabel=Open a File
 
 # LOCALIZATION NOTE  (projecteditor.find.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to search
-# text in the files
+# text in the files.
 projecteditor.find.commandkey=F
 
 # LOCALIZATION NOTE  (projecteditor.save.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# save the file.  It is used with accel+shift to "save as"
+# save the file.  It is used with accel+shift to "save as".
 projecteditor.save.commandkey=S
 
 # LOCALIZATION NOTE  (projecteditor.new.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to
-# create a new file
+# create a new file.
 projecteditor.new.commandkey=N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -1,30 +1,30 @@
 <!-- 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 : FILE This file contains the Scratchpad window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
-       - keep it in English, or another language commonly spoken among web developers.
+  - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (scratchpad.title):
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
   -  prototyping, experimentation and convenient scripting.
   -
   -  It's quite possible that you won't have a good analogue for the word
   -  "Scratchpad" in your locale. You should feel free to find a close
   -  approximation to it or choose a word (or words) that means
   -  "simple discardable text editor". -->
+
+
+
 <!ENTITY window.title                 "Scratchpad">
 
 <!ENTITY fileMenu.label               "File">
 <!ENTITY fileMenu.accesskey           "F">
 
 <!ENTITY newWindowCmd.label           "New Window">
 <!ENTITY newWindowCmd.accesskey       "N">
 <!ENTITY newWindowCmd.commandkey      "n">
@@ -85,70 +85,70 @@
 <!ENTITY inspect.accesskey            "I">
 <!ENTITY inspect.key                  "i">
 
 <!ENTITY display.label                "Display">
 <!ENTITY display.accesskey            "D">
 <!ENTITY display.key                  "l">
 
 <!ENTITY pprint.label                 "Pretty Print">
+<!ENTITY pprint.key                   "p">
 <!ENTITY pprint.accesskey             "P">
-<!ENTITY pprint.key                   "p">
-
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
+
 <!ENTITY environmentMenu.label        "Environment">
 <!ENTITY environmentMenu.accesskey    "n">
 
 
 <!ENTITY contentContext.label         "Content">
 <!ENTITY contentContext.accesskey     "C">
-
 <!-- LOCALIZATION NOTE (browserContext.label, accesskey): This menu item is used
   -  to select an execution environment for the browser window itself as opposed
   -  to content. This is a feature for browser and addon developers and only
   -  enabled via the devtools.chrome.enabled preference. Formerly, this label
   -  was called "Chrome".
   -->
+
 <!ENTITY browserContext.label         "Browser">
 <!ENTITY browserContext.accesskey     "B">
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+  -  for the help button in the menubar but Gnome does not.
+  -->
 
-<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
-       -  for the help button in the menubar but Gnome does not.
-  -->
 <!ENTITY helpMenu.label               "Help">
 <!ENTITY helpMenu.accesskey           "H">
 <!ENTITY helpMenuWin.label            "Help">
 <!ENTITY helpMenuWin.accesskey        "H">
 
 <!ENTITY documentationLink.label      "Scratchpad Help on MDN">
 <!ENTITY documentationLink.accesskey  "D">
-
-
 <!-- LOCALIZATION NOTE (resetContext2.label): This command allows the developer
   -  to reset/clear the global object of the environment where the code executes.
   -->
+
+
 <!ENTITY resetContext2.label          "Reset Variables">
 <!ENTITY resetContext2.accesskey      "t">
 
 <!ENTITY reloadAndRun.label           "Reload And Run">
 <!ENTITY reloadAndRun.accesskey       "e">
 <!ENTITY reloadAndRun.key             "r">
 
 <!ENTITY executeMenu.label            "Execute">
 <!ENTITY executeMenu.accesskey        "x">
-
 <!-- LOCALIZATION NOTE (errorConsoleCmd.commandkey): This command key launches
   -  the browser Error Console, the key should be identical to the property of
   -  the same name in browser.dtd.
   -->
+
 <!ENTITY errorConsoleCmd.commandkey   "j">
-
 <!-- LOCALIZATION NOTE (evalFunction.label): This command allows the developer
   -  to evaluate the top-level function that the cursor is currently at.
   -->
+
 <!ENTITY evalFunction.label "Evaluate Current Function">
 <!ENTITY evalFunction.accesskey "v">
 <!ENTITY evalFunction.key "e">
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -27,16 +27,19 @@ scratchpadContext.invalid=Scratchpad can
 # LOCALIZATION NOTE  (openFile.title): This is the file picker title, when you
 # open a file from Scratchpad.
 openFile.title=Open File
 
 # LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
 # open fails.
 openFile.failed=Failed to read the file.
 
+# LOCALIZATION NOTE  (openFile.failed): This is the message displayed when file
+# open fails.
+
 # LOCALIZATION NOTE (clearRecentMenuItems.label): This is the label for the
 # menuitem in the 'Open Recent'-menu which clears all recent files.
 clearRecentMenuItems.label=Clear Items
 
 # LOCALIZATION NOTE  (saveFileAs): This is the file picker title, when you save
 # a file in Scratchpad.
 saveFileAs=Save File As
 
@@ -73,16 +76,21 @@ scratchpad.noargs=Scratchpad was created
 # LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=This scratchpad executes in the Browser context.
 
 # LOCALIZATION NOTE (help.openDocumentationPage): This returns a localized link with
 # documentation for Scratchpad on MDN.
 help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
 
+# LOCALIZATION NOTE (scratchpad.statusBarLineCol): Line, Column
+# information displayed in statusbar when selection is made in
+# Scratchpad.
+scratchpad.statusBarLineCol  = Line %1$S, Col %2$S
+
 # LOCALIZATION NOTE (fileExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=This file no longer exists.
 
 # LOCALIZATION NOTE (propertiesFilterPlaceholder): this is the text that
 # appears in the filter text box for the properties view container.
 propertiesFilterPlaceholder=Filter properties
 
--- a/browser/chrome/browser/devtools/shadereditor.dtd
+++ b/browser/chrome/browser/devtools/shadereditor.dtd
@@ -1,32 +1,32 @@
 <!-- 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 : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (shaderEditorUI.vertexShader): This is the label for
   -  the pane that displays a vertex shader's source. -->
+
+
+
 <!ENTITY shaderEditorUI.vertexShader    "Vertex Shader">
-
 <!-- LOCALIZATION NOTE (shaderEditorUI.fragmentShader): This is the label for
   -  the pane that displays a fragment shader's source. -->
+
 <!ENTITY shaderEditorUI.fragmentShader  "Fragment Shader">
-
 <!-- LOCALIZATION NOTE (shaderEditorUI.reloadNotice1): This is the label shown
   -  on the button that triggers a page refresh. -->
+
 <!ENTITY shaderEditorUI.reloadNotice1   "Reload">
-
 <!-- LOCALIZATION NOTE (shaderEditorUI.reloadNotice2): This is the label shown
   -  along with the button that triggers a page refresh. -->
+
 <!ENTITY shaderEditorUI.reloadNotice2   "the page to be able to edit GLSL code.">
-
 <!-- LOCALIZATION NOTE (shaderEditorUI.emptyNotice): This is the label shown
   -  while the page is refreshing and the tool waits for a WebGL context. -->
+
 <!ENTITY shaderEditorUI.emptyNotice     "Waiting for a WebGL context to be created…">
--- a/browser/chrome/browser/devtools/sourceeditor.dtd
+++ b/browser/chrome/browser/devtools/sourceeditor.dtd
@@ -1,19 +1,19 @@
 <!-- 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 : FILE This file contains the Source Editor component
   - strings. The source editor component is used within the Scratchpad and
   - Style Editor tools. -->
-
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+
+
+
 <!ENTITY gotoLineCmd.label         "Jump to line…">
 <!ENTITY gotoLineCmd.key           "J">
 <!ENTITY gotoLineCmd.accesskey     "J">
--- a/browser/chrome/browser/devtools/sourceeditor.properties
+++ b/browser/chrome/browser/devtools/sourceeditor.properties
@@ -53,35 +53,35 @@ annotation.debugLocation.title=Current s
 # the link inside of the documentation popup.  If you type 'document' in Scratchpad
 # then press Shift+Space you can see the popup.
 autocompletion.docsLink=docs
 
 # LOCALIZATION NOTE  (autocompletion.notFound): This is the text shown in
 # the documentation popup if Tern fails to find a type for the object.
 autocompletion.notFound=not found
 
-# LOCALIZATION NOTE  (jumpToLine.commandkey): This the key to use in
+# LOCALIZATION NOTE  (jumpToLine.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to jump to
 # a specific line in the editor.
 jumpToLine.commandkey=J
 
-# LOCALIZATION NOTE  (toggleComment.commandkey): This the key to use in
+# LOCALIZATION NOTE  (toggleComment.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to either
 # comment or uncomment selected lines in the editor.
 toggleComment.commandkey=/
 
-# LOCALIZATION NOTE  (toolboxPrevTool.commandkey): This the key to use in
+# LOCALIZATION NOTE  (indentLess.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to reduce
 # indentation level in CodeMirror. However, its default value also used by
 # the Toolbox to switch between tools so we disable it.
 #
 # DO NOT translate this key without proper synchronization with toolbox.dtd.
 indentLess.commandkey=[
 
-# LOCALIZATION NOTE  (toolboxPrevTool.commandkey): This the key to use in
+# LOCALIZATION NOTE  (indentMore.commandkey): This is the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to increase
 # indentation level in CodeMirror. However, its default value also used by
 # the Toolbox to switch between tools
 #
 # DO NOT translate this key without proper synchronization with toolbox.dtd.
 indentMore.commandkey=]
 
 # LOCALIZATION NOTE  (moveLineUp.commandkey): This is the key to use to move
--- a/browser/chrome/browser/devtools/storage.properties
+++ b/browser/chrome/browser/devtools/storage.properties
@@ -10,21 +10,19 @@
 # on web development on the web.
 
 # LOCALIZATION NOTE  (storage.commandkey): This the key to use in
 # conjunction with shift to open the storage editor
 storage.commandkey=VK_F9
 
 # LOCALIZATION NOTE (storage.accesskey): The access key used to open the storage
 # editor.
-storage.accesskey=a
 
 # LOCALIZATION NOTE (storage.label):
 # This string is displayed as the label of the tab in the developer tools window
-storage.label=Storage
 
 # LOCALIZATION NOTE (storage.menuLabel):
 # This string is displayed in the Tools menu as a shortcut to open the devtools
 # with the Storage Inspector tab selected.
 storage.menuLabel=Storage Inspector
 
 # LOCALIZATION NOTE (storage.panelLabel):
 # This string is used as the aria-label for the iframe of the Storage Inspector
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -1,63 +1,63 @@
 <!-- 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 : FILE This file contains the Style Editor window strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
 <!-- LOCALIZATION NOTE : The correct localization of this file might be to keep
      it in English, or another language commonly spoken among web developers.
      You want to make that choice consistent across the developer tools.
      A good criteria is the language in which you'd find the best documentation
      on web development on the web. -->
 
+
 <!ENTITY newButton.label            "New">
 <!ENTITY newButton.tooltip          "Create and append a new style sheet to the document">
 <!ENTITY newButton.accesskey        "N">
 
 <!ENTITY importButton.label         "Import…">
 <!ENTITY importButton.tooltip       "Import and append an existing style sheet to the document">
 <!ENTITY importButton.accesskey     "I">
 
 <!ENTITY visibilityToggle.tooltip   "Toggle style sheet visibility">
 
 <!ENTITY saveButton.label           "Save">
 <!ENTITY saveButton.tooltip         "Save this style sheet to a file">
 <!ENTITY saveButton.accesskey       "S">
 
 <!ENTITY optionsButton.tooltip      "Style Editor options">
-
 <!-- LOCALIZATION NOTE  (showOriginalSources.label): This is the label on the context
      menu item to toggle showing original sources in the editor. -->
+
 <!ENTITY showOriginalSources.label     "Show original sources">
-
 <!-- LOCALIZATION NOTE  (showOriginalSources.accesskey): This is the access key for
      the menu item to toggle showing original sources in the editor. -->
+
 <!ENTITY showOriginalSources.accesskey  "o">
-
 <!-- LOCALIZATION NOTE  (showMediaSidebar.label): This is the label on the context
      menu item to toggle showing @media rule shortcuts in a sidebar. -->
+
 <!ENTITY showMediaSidebar.label     "Show @media sidebar">
-
 <!-- LOCALIZATION NOTE  (showMediaSidebar.accesskey): This is the access key for
      the menu item to toggle showing the @media sidebar. -->
+
 <!ENTITY showMediaSidebar.accesskey     "m">
-
 <!-- LOCALICATION NOTE  (mediaRules.label): This is shown above the list of @media rules
      in each stylesheet editor sidebar. -->
+
 <!ENTITY mediaRules.label           "@media rules">
 
 <!ENTITY editorTextbox.placeholder  "Type CSS here.">
-
 <!-- LOCALICATION NOTE  (noStyleSheet.label): This is shown when a page has no
      stylesheet. -->
+
 <!ENTITY noStyleSheet.label         "This page has no style sheet.">
-
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-start.label): This is the start of a
      tip sentence shown when there is no stylesheet. It suggests to create a new
      stylesheet and provides an action link to do so. -->
+
 <!ENTITY noStyleSheet-tip-start.label  "Perhaps you'd like to ">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-action.label): This is text for the
      link that triggers creation of a new stylesheet. -->
 <!ENTITY noStyleSheet-tip-action.label "append a new style sheet">
 <!-- LOCALICATION NOTE  (noStyleSheet-tip-end.label): End of the tip sentence -->
 <!ENTITY noStyleSheet-tip-end.label    "?">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -27,54 +27,54 @@ newStyleSheet=New style sheet #%S
 
 # LOCALIZATION NOTE  (ruleCount.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # This is shown in the style sheets list.
 # #1 rule.
 # example: 111 rules.
 ruleCount.label=#1 rule.;#1 rules.
 
-# LOCALIZATION NOTE  (error-load.label): This is shown when loading fails.
+# LOCALIZATION NOTE  (error-load): This is shown when loading fails.
 error-load=Style sheet could not be loaded.
 
-# LOCALIZATION NOTE  (error-save.label): This is shown when saving fails.
+# LOCALIZATION NOTE  (error-save): This is shown when saving fails.
 error-save=Style sheet could not be saved.
 
 # LOCALIZATION NOTE  (error-compressed): This is shown when we can't show
 # coverage information because the css source is compressed.
 error-compressed=Can't show coverage information for compressed stylesheets
 
 # LOCALIZATION NOTE  (importStyleSheet.title): This is the file picker title,
 # when you import a style sheet into the Style Editor.
 importStyleSheet.title=Import style sheet
 
-# LOCALIZATION NOTE  (importStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (importStyleSheet.filter): This is the *.css filter title
 importStyleSheet.filter=CSS files
 
 # LOCALIZATION NOTE  (saveStyleSheet.title): This is the file picker title,
 # when you save a style sheet from the Style Editor.
 saveStyleSheet.title=Save style sheet
 
-# LOCALIZATION NOTE  (saveStyleSheet.title): This is the *.css filter title
+# LOCALIZATION NOTE  (saveStyleSheet.filter): This is the *.css filter title
 saveStyleSheet.filter=CSS files
 
 # LOCALIZATION NOTE  (open.commandkey): This the key to use in
 # conjunction with shift to open the style editor
 open.commandkey=VK_F7
 
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey=l
 
 # LOCALIZATION NOTE  (saveStyleSheet.commandkey): This the key to use in
 # conjunction with accel (Command on Mac or Ctrl on other platforms) to Save
 saveStyleSheet.commandkey=S
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
-# This string is displayed in the title of the tab when the debugger is
+# This string is displayed in the title of the tab when the style editor is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Style Editor
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.panelLabel):
 # This is used as the label for the toolbox panel.
 ToolboxStyleEditor.panelLabel=Style Editor Panel
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip2):
--- a/browser/chrome/browser/devtools/styleinspector.dtd
+++ b/browser/chrome/browser/devtools/styleinspector.dtd
@@ -1,32 +1,32 @@
 <!-- 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 : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (browserStylesLabel): This is the label for the checkbox
   -  that specifies whether the styles that are not from the user's stylesheet
   -  should be displayed or not. -->
+
+
 <!ENTITY browserStylesLabel    "Browser styles">
-
 <!-- LOCALIZATION NOTE (userStylesSearch): This is the placeholder that goes in
   -  the search box when no search term has been entered. -->
+
 <!ENTITY userStylesSearch      "Search">
-
 <!-- LOCALIZATION NOTE (selectedElementLabel): This is the label for the path of
   -  the highlighted element in the web page. This path is based on the document
   -  tree. -->
+
 <!ENTITY selectedElementLabel  "Selected element:">
-
 <!-- LOCALIZATION NOTE (noPropertiesFound): In the case where there are no CSS
   -  properties to display e.g. due to search criteria this message is
   -  displayed. -->
-<!ENTITY noPropertiesFound     "No CSS properties found.">
 
+<!ENTITY noPropertiesFound     "No CSS properties found.">
 <!-- FIXME: notes -->
+
 <!ENTITY computedViewTitle     "Computed">
 <!ENTITY ruleViewTitle         "Rules">
old mode 100755
new mode 100644
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/timeline.dtd
@@ -0,0 +1,22 @@
+<!-- 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 : FILE This file contains the Timeline strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
+<!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
+  - keep it in English, or another language commonly spoken among web developers.
+  - You want to make that choice consistent across the developer tools.
+  - A good criteria is the language in which you'd find the best
+  - documentation on web development on the web. -->
+<!-- LOCALIZATION NOTE (timelineUI.recordButton): This string is displayed
+  -  on a button that starts a new recording. -->
+<!-- LOCALIZATION NOTE (timelineUI.recordButton): This string is displayed
+  -  as a label to signal that a recording is in progress. -->
+
+<!ENTITY timelineUI.recordLabel "Recording…">
+<!-- LOCALIZATION NOTE (timelineUI.emptyNotice1/2): This is the label shown
+  -  in the timeline view when empty. -->
+
+<!-- LOCALIZATION NOTE (timelineUI.stopNotice1/2): This is the label shown
+  -  in the timeline view while recording. -->
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/timeline.properties
@@ -0,0 +1,35 @@
+# 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 These strings are used inside the Timeline
+# which is available from the Web Developer sub-menu -> 'Timeline'.
+# The correct localization of this file might be to keep it in
+# English, or another language commonly spoken among web developers.
+# You want to make that choice consistent across the developer tools.
+# A good criteria is the language in which you'd find the best
+# documentation on web development on the web.
+
+# LOCALIZATION NOTE (timeline.label):
+# This string is displayed in the title of the tab when the timeline is
+# displayed inside the developer tools window and in the Developer Tools Menu.
+timeline.label=Timeline
+
+# LOCALIZATION NOTE (timeline.panelLabel):
+# This is used as the label for the toolbox panel.
+
+# LOCALIZATION NOTE (timeline.tooltip):
+# This string is displayed in the tooltip of the tab when the timeline is
+# displayed inside the developer tools window.
+
+# LOCALIZATION NOTE (timeline.tick):
+# This string is displayed in the timeline overview, for delimiting ticks
+# by time, in milliseconds.
+timeline.tick=%S ms
+
+# LOCALIZATION NOTE (timeline.records):
+# This string is displayed in the timeline waterfall, as a title for the menu.
+
+# LOCALIZATION NOTE (timeline.label.*):
+# These strings are displayed in the timeline waterfall, identifying markers.
+timeline.label.styles=Styles
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,182 +1,182 @@
 <!-- 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 : FILE This file contains the Toolbox strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate key -->
 
+
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
 <!ENTITY toolboxOptionsButton.key      "O">
 <!ENTITY toolboxNextTool.key           "]">
 <!ENTITY toolboxPreviousTool.key       "[">
 
 <!ENTITY toolboxZoomIn.key             "+">
-<!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
+<!-- + is above this key on many keyboards -->
+<!ENTITY toolboxZoomIn.key2            "="> 
 <!ENTITY toolboxZoomOut.key            "-">
 <!ENTITY toolboxZoomReset.key          "0">
 
 <!ENTITY toolboxReload.key             "r">
-
 <!-- LOCALIZATION NOTE (toolboxFramesButton): This is the label for
   -  the iframes menu list that appears only when the document has some.
   -  It allows you to switch the context of the whole toolbox. -->
 <!ENTITY toolboxFramesTooltip          "Select an iframe as the currently targeted document">
-
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
+
 <!ENTITY options.context.advancedSettings "Advanced settings">
-
 <!-- LOCALIZATION NOTE (options.context.inspector): This is the label for
   -  the heading of the Inspector group in the options panel. -->
+
 <!ENTITY options.context.inspector "Inspector">
-
 <!-- LOCALIZATION NOTE (options.showUserAgentStyles.label): This is the label
   -  for the checkbox option to show user agent styles in the Inspector
   -  panel. -->
+
 <!ENTITY options.showUserAgentStyles.label "Show Browser Styles">
 <!ENTITY options.showUserAgentStyles.tooltip "Turning this on will show default styles that are loaded by the browser.">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.label): This is the label for a
   -  dropdown list that controls the default color unit used in the inspector.
   -  This label is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.label "Default colour unit">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.accesskey): This is the access
   -  key for a dropdown list that controls the default color unit used in the
   -  inspector. This is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.accesskey "u">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.hex): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.hex "Hex">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.hsl): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.hsl "HSL(A)">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.rgb): This is used in the
   -  'Default color unit' dropdown list and is visible in the options panel. -->
+
 <!ENTITY options.defaultColorUnit.rgb "RGB(A)">
-
 <!-- LOCALIZATION NOTE (options.defaultColorUnit.name): This is used in
   -  the 'Default color unit' dropdown list and is visible in the options panel.
   -  -->
+
 <!ENTITY options.defaultColorUnit.name "Colour Names">
-
 <!-- LOCALIZATION NOTE (options.context.triggersPageRefresh): This is the
   -  triggers page refresh footnote under the advanced settings group in the
   -  options panel and is used for settings that trigger page reload. -->
+
 <!ENTITY options.context.triggersPageRefresh  "* Current session only, reloads the page">
-
 <!-- LOCALIZATION NOTE (options.enableChrome.label4): This is the label for the
   -  checkbox that toggles chrome debugging, i.e. devtools.chrome.enabled
   -  boolean preference in about:config, in the options panel. -->
+
 <!ENTITY options.enableChrome.label4    "Enable chrome and addon debugging">
 <!ENTITY options.enableChrome.tooltip2  "Turning this option on will allow you to use various developer tools in browser context and debug addons from the Add-On Manager">
-
 <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the
   -  checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled
   -  boolean preference in about:config, in the options panel. -->
+
 <!ENTITY options.enableRemote.label3    "Enable remote debugging">
 <!ENTITY options.enableRemote.tooltip   "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS">
-
 <!-- LOCALIZATION NOTE (options.disableJavaScript.label,
   -  options.disableJavaScript.tooltip): This is the options panel label and
   -  tooltip for the checkbox that toggles JavaScript on or off. -->
+
 <!ENTITY options.disableJavaScript.label     "Disable JavaScript *">
 <!ENTITY options.disableJavaScript.tooltip   "Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten.">
-
 <!-- LOCALIZATION NOTE (options.disableCache.label2,
   -  options.disableCache.tooltip2): This is the options panel label and
   -  tooltip for the checkbox that toggles the cache on or off. -->
+
 <!ENTITY options.disableCache.label2     "Disable Cache (when toolbox is open)">
 <!ENTITY options.disableCache.tooltip2   "Turning this option on will disable the cache for all tabs that have the toolbox open.">
-
 <!-- LOCALIZATION NOTE (options.selectDefaultTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tools. -->
+
 <!ENTITY options.selectDefaultTools.label     "Default Firefox Developer Tools">
-
 <!-- LOCALIZATION NOTE (options.selectAdditionalTools.label): This is the label for
   -  the heading of group of checkboxes corresponding to the developer tools
   -  added by add-ons. This heading is hidden when there is no developer tool
   -  installed by add-ons. -->
+
 <!ENTITY options.selectAdditionalTools.label  "Developer Tools installed by add-ons">
-
 <!-- LOCALIZATION NOTE (options.selectEnabledToolboxButtons.label): This is the label for
   -  the heading of group of checkboxes corresponding to the default developer
   -  tool buttons. -->
+
 <!ENTITY options.selectEnabledToolboxButtons.label     "Available Toolbox Buttons">
-
 <!-- LOCALIZATION NOTE (options.toolNotSupported.label): This is the label for
   -  the explanation of the * marker on a tool which is currently not supported
   -  for the target of the toolbox. -->
+
 <!ENTITY options.toolNotSupported.label  "* Not supported for current toolbox target">
-
 <!-- LOCALIZATION NOTE (options.selectDevToolsTheme.label): This is the label for
   -  the heading of the radiobox corresponding to the theme of the developer
   -  tools. -->
+
 <!ENTITY options.selectDevToolsTheme.label   "Choose DevTools theme:">
-
 <!-- LOCALIZATION NOTE (options.webconsole.label): This is the label for the
   -  heading of the group of Web Console preferences in the options panel. -->
-<!ENTITY options.webconsole.label            "Web Console">
 
+<!ENTITY options.webconsole.label            "Web Console">
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
-        - label for the checkbox that toggles timestamps in the Web Console -->
+   - label for the checkbox that toggles timestamps in the Web Console -->
+
 <!ENTITY options.timestampMessages.label      "Enable timestamps">
 <!ENTITY options.timestampMessages.tooltip    "If you enable this option commands and output in the Web Console will display a timestamp">
-
 <!-- LOCALIZATION NOTE (options.styleeditor.label): This is the label for the
   -  heading of the group of Style Editor preferences in the options
   -  panel. -->
-<!ENTITY options.styleeditor.label            "Style Editor">
 
+<!ENTITY options.styleeditor.label            "Style Editor">
 <!-- LOCALIZATION NOTE (options.stylesheetSourceMaps.label): This is the
-  - label for the checkbox that toggles showing original sources in the Style Editor -->
+   - label for the checkbox that toggles showing original sources in the Style Editor -->
+
 <!ENTITY options.stylesheetSourceMaps.label      "Show original sources">
 <!ENTITY options.stylesheetSourceMaps.tooltip    "Show original sources (e.g. Sass files) in the Style Editor and Inspector">
+<!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
+   - label for the checkbox that toggles autocompletion of css in the Style Editor -->
 
-<!-- LOCALIZATION NOTE (options.stylesheetAutocompletion.label): This is the
-  -  label for the checkbox that toggles autocompletion of css in the Style Editor -->
 <!ENTITY options.stylesheetAutocompletion.label      "Autocomplete CSS">
 <!ENTITY options.stylesheetAutocompletion.tooltip    "Autocomplete CSS properties, values and selectors in Style Editor as you type">
-
 <!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
   -  heading of the group of JavaScript Profiler preferences in the options
   -  panel. -->
+
 <!ENTITY options.profiler.label            "JavaScript Profiler">
-
 <!-- LOCALICATION NOTE (options.commonprefs): This is the label for the heading
       of all preferences that affect both the Web Console and the Network
       Monitor -->
+
 <!ENTITY options.commonPrefs.label           "Common Preferences">
-
 <!-- LOCALIZATION NOTE (options.enablePersistentLogs.label): This is the
   -  label for the checkbox that toggles persistent logs in the Web Console and
   -  network monitor,  i.e. devtools.webconsole.persistlog a boolean preference in
   -  about:config, in the options panel. -->
+
 <!ENTITY options.enablePersistentLogs.label    "Enable persistent logs">
 <!ENTITY options.enablePersistentLogs.tooltip  "If you enable this option the Web Console and Network Monitor will not clear the output each time you navigate to a new page">
-
 <!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
+
 <!ENTITY options.showPlatformData.label    "Show Gecko platform data">
-<!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include
+<!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include 
 Gecko platform symbols">
-
 <!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
   -  section. -->
 
+
 <!ENTITY options.sourceeditor.label                     "Editor Preferences">
 <!ENTITY options.sourceeditor.detectindentation.label   "Detect indentation">
 <!ENTITY options.sourceeditor.detectindentation.tooltip "Guess indentation based on source content">
 <!ENTITY options.sourceeditor.autoclosebrackets.label   "Autoclose brackets">
 <!ENTITY options.sourceeditor.autoclosebrackets.tooltip "Automatically insert closing brackets">
 <!ENTITY options.sourceeditor.expandtab.label           "Indent using spaces">
 <!ENTITY options.sourceeditor.expandtab.tooltip         "Use spaces intead of the tab character">
 <!ENTITY options.sourceeditor.tabsize.label             "Tab size">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -35,17 +35,17 @@ toolbox.titleTemplate=%1$S - %2$S
 # name when no tool is selected.
 toolbox.defaultTitle=Developer Tools
 
 # LOCALIZATION NOTE (toolbox.label): This is used as the label for the
 # toolbox as a whole
 toolbox.label=Developer Tools
 
 # LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
-# for the optiosn panel tab.
+# for the options panel tab.
 optionsButton.tooltip=Toolbox Options
 
 # LOCALIZATION NOTE (options.label): This is used as the label of the tab in
 # the devtools window.
 options.label=Options
 
 # LOCALIZATION NOTE (options.panelLabel): This is used as the label for the
 # toolbox panel.
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -1,18 +1,18 @@
 <!-- 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 : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+
 <!ENTITY window.title "Web Console">
 <!ENTITY browserConsole.title "Browser Console">
 
 <!ENTITY networkPanel.requestURLColon             "Request URL:">
 <!ENTITY networkPanel.requestMethodColon          "Request Method:">
 <!ENTITY networkPanel.statusCodeColon             "Status Code:">
 
 <!ENTITY networkPanel.requestHeaders              "Request Headers">
@@ -23,31 +23,31 @@
 <!ENTITY networkPanel.responseHeaders             "Response Headers">
 <!ENTITY networkPanel.responseCookie              "Received Cookie">
 <!ENTITY networkPanel.responseBody                "Response Body">
 <!ENTITY networkPanel.responseBodyCached          "Cached Data">
 <!ENTITY networkPanel.responseBodyUnknownType     "Unknown Content Type">
 <!ENTITY networkPanel.responseNoBody              "No Response Body">
 <!ENTITY networkPanel.responseImage               "Received Image">
 <!ENTITY networkPanel.responseImageCached         "Cached Image">
-
 <!-- LOCALIZATION NOTE (saveBodies.label): You can see this string in the Web
    - Console context menu. -->
+
 <!ENTITY saveBodies.label     "Log Request and Response Bodies">
 <!ENTITY saveBodies.accesskey "L">
-
 <!-- LOCALIZATION NOTE (openURL.label): You can see this string in the Web
    - Console context menu. -->
+
 <!ENTITY openURL.label     "Open URL in New Tab">
 <!ENTITY openURL.accesskey "T">
-
 <!-- LOCALIZATION NOTE (btnPageNet.label): This string is used for the menu
   -  button that allows users to toggle the network logging output.
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
+
 <!ENTITY btnPageNet.label   "Net">
 <!ENTITY btnPageNet.tooltip "Log network access">
 <!ENTITY btnPageNet.accesskey "N">
 <!-- LOCALIZATION NOTE (btnPageNet.accesskeyMacOSX): This string is used as
   -  access key for the menu button that allows users to toggle the network
   -  logging output. On MacOSX accesskeys are available with Ctrl-*. Please make
   -  sure you do not use the following letters: A, E, N and P. These are used
   -  for editing commands in text inputs. -->
@@ -56,37 +56,38 @@
 <!ENTITY btnPageCSS.tooltip2 "Log CSS errors and warnings">
 <!ENTITY btnPageCSS.accesskey "C">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Log JavaScript exceptions">
 <!ENTITY btnPageJS.accesskey  "J">
 <!ENTITY btnPageSecurity.label "Security">
 <!ENTITY btnPageSecurity.tooltip "Log security errors and warnings">
 <!ENTITY btnPageSecurity.accesskey "u">
-
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
+
 <!ENTITY btnPageLogging.label   "Logging">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
 <!ENTITY btnPageLogging.accesskey3 "L">
 <!ENTITY btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Info">
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
 <!ENTITY btnConsoleReflows      "Reflows">
 
 <!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
 <!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
+<!-- + is above this key on many keyboards -->
+<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> 
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
--- a/browser/chrome/browser/devtools/webaudioeditor.dtd
+++ b/browser/chrome/browser/devtools/webaudioeditor.dtd
@@ -1,40 +1,40 @@
 <!-- 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 : FILE This file contains the Debugger strings -->
 <!-- LOCALIZATION NOTE : FILE Do not translate commandkey -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice1): This is the label shown
   -  on the button that triggers a page refresh. -->
+
+
+
 <!ENTITY webAudioEditorUI.reloadNotice1   "Reload">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.reloadNotice2): This is the label shown
   -  along with the button that triggers a page refresh. -->
+
 <!ENTITY webAudioEditorUI.reloadNotice2   "the page to view and edit the audio context.">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.emptyNotice): This is the label shown
   -  while the page is refreshing and the tool waits for a audio context. -->
+
 <!ENTITY webAudioEditorUI.emptyNotice     "Waiting for an audio context to be created…">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.tab.properties): This is the label shown
   -  for the properties tab view. -->
+
 <!ENTITY webAudioEditorUI.tab.properties  "Parameters">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorTitle): This is the title for the
   -  AudioNode inspector view. -->
+
 <!ENTITY webAudioEditorUI.inspectorTitle  "AudioNode Inspector">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.inspectorEmpty): This is the title for the
   -  AudioNode inspector view empty message. -->
+
 <!ENTITY webAudioEditorUI.inspectorEmpty  "No AudioNode selected.">
-
 <!-- LOCALIZATION NOTE (webAudioEditorUI.propertiesEmpty): This is the title for the
   -  AudioNode inspector view properties tab empty message. -->
+
 <!ENTITY webAudioEditorUI.propertiesEmpty "Node does not have any properties.">
--- a/browser/chrome/browser/devtools/webaudioeditor.properties
+++ b/browser/chrome/browser/devtools/webaudioeditor.properties
@@ -27,8 +27,9 @@ ToolboxWebAudioEditor1.tooltip=Web Audio
 
 # LOCALIZATION NOTE (collapseInspector): This is the tooltip for the button
 # that collapses the inspector in the web audio tool UI.
 collapseInspector=Collapse inspector
 
 # LOCALIZATION NOTE (expandInspector): This is the tooltip for the button
 # that expands the inspector in the web audio tool UI.
 expandInspector=Expand inspector
+
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -4,35 +4,33 @@
 
 # LOCALIZATION NOTE
 # The correct localization of this file might be to keep it in
 # English, or another language commonly spoken among web developers.
 # You want to make that choice consistent across the developer tools.
 # A good criteria is the language in which you'd find the best
 # documentation on web development on the web.
 
-typeError=Error: 
-typeWarning=Warning: 
-typeNetwork=Network: 
-typeException=Exception:  
-typeCssParser=CSS Parser: 
-typeStrict=Strict Warning: 
-msgCategory=Category: 
+typeError=Error:\u0020
+typeWarning=Warning:\u0020
+typeNetwork=Network:\u0020
+typeException=Exception: \u0020
+typeCssParser=CSS Parser:\u0020
+typeStrict=Strict Warning:\u0020
+msgCategory=Category:\u0020
 errLine=Line: %S
 btnHide=Hide
 btnPrefs=Preferences
 categoryPage=Page:
 categoryConsole=Console:
 btnMutation=DOM Mutation
 tipMutation=Toggle DOM Mutation event logging
 btnGlobal=Global Messages
 tipGlobal=Toggle Global Message logging
 localConsole=Local Console
-clearConsoleCmd.label=Clear Console
-clearConsoleCmd.accesskey=e
 close.button=Close
 close.accesskey=C
 update.button=Update
 update.accesskey=U
 cmd.commandkey=k
 webConsoleCmd.accesskey=W
 
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
@@ -97,17 +95,17 @@ gcliterm.instanceLabel=Instance of %S
 # The 2nd line, from "function" to the end of the line, is a link to the
 # JavaScript debugger.
 reflow.messageWithNoLink=reflow: %Sms
 reflow.messageWithLink=reflow: %Sms\u0020
 reflow.messageLinkText=function %1$S, %2$S line %3$S
 
 # LOCALIZATION NOTE (stacktrace.anonymousFunction): this string is used to
 # display JavaScript functions that have no given name - they are said to be
-# anonymous. See also stacktrace.outputMessage.
+# anonymous. Test console.trace() in the webconsole.
 stacktrace.anonymousFunction=<anonymous>
 
 # LOCALIZATION NOTE (unknownLocation): this string is used to
 # display messages with sources that have an unknown location, eg. from
 # console.trace() calls.
 unknownLocation=<unknown>
 
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
@@ -142,18 +140,18 @@ JSTerm.updateNotInspectable=After your i
 # LOCALIZATION NOTE (remoteWebConsolePromptTitle): the title displayed on the
 # Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptTitle=Remote Connection
 
 # LOCALIZATION NOTE (remoteWebConsolePromptMessage): the message displayed on
 # the Web Console prompt asking for the remote host and port to connect to.
 remoteWebConsolePromptMessage=Enter hostname and port number (host:port)
 
-# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): the title displayed on the
-# Web Console prompt asking the user to pick a tab to attach to.
+# LOCALIZATION NOTE (remoteWebConsoleSelectTabTitle): the title displayed on
+# the Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabTitle=Tab list - Remote Connection
 
 # LOCALIZATION NOTE (remoteWebConsoleSelectTabMessage): the message displayed
 # on the Web Console prompt asking the user to pick a tab to attach to.
 remoteWebConsoleSelectTabMessage=Select one of the tabs you want to attach to, or select the global console.
 
 # LOCALIZATION NOTE (listTabs.globalConsoleActor): the string displayed for
 # the global console in the tabs selection.
--- a/browser/chrome/browser/devtools/webide.dtd
+++ b/browser/chrome/browser/devtools/webide.dtd
@@ -42,64 +42,65 @@
 <!ENTITY viewMenu_accesskey "V">
 <!ENTITY viewMenu_toggleEditor_label "Toggle Editor">
 <!ENTITY viewMenu_toggleEditor_accesskey "E">
 <!ENTITY viewMenu_showAddons_label "Manage Simulators">
 <!ENTITY viewMenu_showAddons_accesskey "M">
 
 <!ENTITY projectButton_label "Open App">
 <!ENTITY runtimeButton_label "Select Runtime">
-
 <!-- We try to repicate Firefox' bindings: -->
 <!-- quit app -->
+
 <!ENTITY key_quit "W">
 <!-- open menu -->
 <!ENTITY key_showProjectPanel "O">
 <!-- reload app -->
 <!ENTITY key_play "R">
 <!-- show toolbox -->
 <!ENTITY key_toggleToolbox "VK_F12">
 <!-- toggle sidebar -->
 <!ENTITY key_toggleEditor "B">
 
 <!ENTITY projectPanel_myProjects "My Projects">
 <!ENTITY projectPanel_runtimeApps "Runtime Apps">
+<!ENTITY projectPanel_tabs "Tabs">
 <!ENTITY runtimePanel_USBDevices "USB Devices">
 <!ENTITY runtimePanel_WiFiDevices "Wi-Fi Devices">
 <!ENTITY runtimePanel_simulators "Simulators">
 <!ENTITY runtimePanel_custom "Custom">
 <!ENTITY runtimePanel_installsimulator "Install Simulator">
 <!ENTITY runtimePanel_noadbhelper "Install ADB Helper">
 <!ENTITY runtimePanel_nousbdevice "Can't see your device?">
+<!-- Lense -->
 
-<!-- Lense -->
 <!ENTITY details_valid_header "valid">
 <!ENTITY details_warning_header "warnings">
 <!ENTITY details_error_header "errors">
 <!ENTITY details_description "Description">
 <!ENTITY details_location "Location">
 <!ENTITY details_manifestURL "App ID">
 <!ENTITY details_removeProject_button "Remove Project">
+<!-- New App -->
 
-<!-- New App -->
 <!ENTITY newAppWindowTitle "New App">
 <!ENTITY newAppHeader "Select template">
 <!ENTITY newAppLoadingTemplate "Loading templates…">
 <!ENTITY newAppProjectName "Project Name:">
+<!-- Decks -->
 
 
-<!-- Decks -->
 
 <!ENTITY deck_close "Close">
+<!-- Addons -->
 
-<!-- Addons -->
 <!ENTITY addons_title "Extra Components">
 <!ENTITY addons_aboutaddons "Open Add-ons Manager">
+<!-- Prefs -->
 
-<!-- Prefs -->
 <!ENTITY prefs_title "Preferences">
 <!ENTITY prefs_editor_title "Editor">
 <!ENTITY prefs_general_title "General">
 <!ENTITY prefs_restore "Restore Defaults">
 <!ENTITY prefs_simulators "Manage Simulators">
 <!ENTITY prefs_options_enablelocalruntime "Enable local runtime">
 <!ENTITY prefs_options_enablelocalruntime_tooltip "Allow WebIDE to connect to its own runtime (running browser instance)">
 <!ENTITY prefs_options_rememberlastproject "Remember last project">
@@ -114,25 +115,25 @@
 <!ENTITY prefs_options_detectindentation "Autoindent">
 <!ENTITY prefs_options_detectindentation_tooltip "Guess indentation based on source content">
 <!ENTITY prefs_options_autocomplete "Autocomplete">
 <!ENTITY prefs_options_autocomplete_tooltip "Enable code autocompletion">
 <!ENTITY prefs_options_autoclosebrackets "Autoclose brackets">
 <!ENTITY prefs_options_autoclosebrackets_tooltip "Automatically insert closing brackets">
 <!ENTITY prefs_options_keybindings "Keybindings">
 <!ENTITY prefs_options_keybindings_default "Default">
+<!-- Permissions Table -->
 
-<!-- Permissions Table -->
 <!ENTITY permissionstable_title "Permissions Table">
 <!ENTITY permissionstable_name_header "Name">
+<!-- Runtime Details -->
 
-<!-- Runtime Details -->
 <!ENTITY runtimedetails_title "Runtime Info">
 <!ENTITY runtimedetails_adbIsRoot "ADB is root: ">
 <!ENTITY runtimedetails_summonADBRoot "root device">
 <!ENTITY runtimedetails_ADBRootWarning "(requires unlocked bootloader)">
 <!ENTITY runtimedetails_restrictedPrivileges "DevTools restricted privileges: ">
 <!ENTITY runtimedetails_requestPrivileges "request higher privileges">
 <!ENTITY runtimedetails_privilegesWarning "(Will reboot device. Requires root access.)">
+<!-- Monitor -->
 
-<!-- Monitor -->
 <!ENTITY monitor_title "Monitor">
 <!ENTITY monitor_help "Help">
--- a/browser/chrome/browser/devtools/webide.properties
+++ b/browser/chrome/browser/devtools/webide.properties
@@ -17,16 +17,20 @@ remote_runtime_promptMessage=hostname:po
 
 importPackagedApp_title=Select Directory
 importHostedApp_title=Open Hosted App
 importHostedApp_header=Enter Manifest URL
 
 notification_showTroubleShooting_label=troubleshooting
 notification_showTroubleShooting_accesskey=t
 
+# LOCALIZATION NOTE (project_tab_loading): This is shown as a temporary tab
+# title for browser tab projects when the tab is still loading.
+project_tab_loading=Loading…
+
 # These messages appear in a notification box when an error occur.
 
 error_cantInstallNotFullyConnected=Can't install project. Not fully connected.
 error_cantInstallValidationErrors=Can't install project. Validation errors.
 error_listRunningApps=Can't get app list from device
 
 # Variable: name of the operation (in english)
 error_operationTimeout=Operation timed out: %1$S
--- a/browser/chrome/browser/downloads/downloads.dtd
+++ b/browser/chrome/browser/downloads/downloads.dtd
@@ -1,48 +1,48 @@
 <!-- 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 (downloads.title):
      Used by screen readers to describe the Downloads Panel.
      -->
+
 <!ENTITY downloads.title                  "Downloads">
-
 <!-- LOCALIZATION NOTE (downloadDetails.width):
      Width of details for a Downloads Panel item (which directly influences the
      width of the Downloads Panel) expressed using a CSS unit. The longest
      labels that should fit in the item width are usually those of in-progress
      downloads and those of blocked downloads.
 
      A good rule of thumb is to try to determine the longest string possible
      that an in-progress download could display, and use that value in ch
      units.
 
      For example, in English, a long string would be:
 
      59 minutes, 59 seconds remaining - 1022 of 1023 KB
 
      That's 50 characters, so we set the width at 50ch.
      -->
+
 <!ENTITY downloadDetails.width            "50ch">
-
 <!-- LOCALIZATION NOTE (downloadsSummary.minWidth2):
      Minimum width for the main description of the downloads summary,
      which is displayed at the bottom of the Downloads Panel if the
      number of downloads exceeds the limit that the panel can display.
 
      A good rule of thumb here is to look at the otherDownloads2 string
      in downloads.properties, and make a reasonable estimate of its
      maximum length. For English, this seems like a reasonable limit:
 
      + 999 other downloads
 
      that's 21 characters, so we set the minimum width to 21ch.
      -->
+
 <!ENTITY downloadsSummary.minWidth2       "21ch">
 
 <!ENTITY cmd.pause.label                  "Pause">
 <!ENTITY cmd.pause.accesskey              "P">
 <!ENTITY cmd.resume.label                 "Resume">
 <!ENTITY cmd.resume.accesskey             "R">
 <!ENTITY cmd.cancel.label                 "Cancel">
 <!ENTITY cmd.cancel.accesskey             "C">
@@ -61,36 +61,59 @@
 <!ENTITY cmd.copyDownloadLink.label       "Copy Download Link">
 <!ENTITY cmd.copyDownloadLink.accesskey   "L">
 <!ENTITY cmd.removeFromHistory.label      "Remove From History">
 <!ENTITY cmd.removeFromHistory.accesskey  "e">
 <!ENTITY cmd.clearList.label              "Clear List">
 <!ENTITY cmd.clearList.accesskey          "a">
 <!ENTITY cmd.clearDownloads.label         "Clear Downloads">
 <!ENTITY cmd.clearDownloads.accesskey     "D">
+<!-- LOCALIZATION NOTE (cmd.unblock.label):
+     This command may be shown in the context menu, as a menu button item, or as
+     a text link when malware or potentially unwanted downloads are blocked.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
 
+<!-- LOCALIZATION NOTE (cmd.removeFile.label):
+     This command may be shown in the context menu or as a menu button label
+     when malware or potentially unwanted downloads are blocked.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+
+<!-- LOCALIZATION NOTE (blocked.label):
+     Shown as a tag before the file name for some types of blocked downloads.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+<!-- LOCALIZATION NOTE (learnMore.label):
+     Shown as a text link for some types of blocked downloads, for example
+     malware, when there is an associated explanation page on the Mozilla site.
+     Note: This string doesn't exist in the UI yet.  See bug 1053890.
+     -->
+
+<!ENTITY learnMore.label                  "Learn More">
 <!-- LOCALIZATION NOTE (downloadsHistory.label, downloadsHistory.accesskey):
      This string is shown at the bottom of the Downloads Panel when all the
      downloads fit in the available space, or when there are no downloads in
      the panel at all.
      -->
+
 <!ENTITY downloadsHistory.label           "Show All Downloads">
 <!ENTITY downloadsHistory.accesskey       "S">
 
 <!ENTITY clearDownloadsButton.label       "Clear Downloads">
 <!ENTITY clearDownloadsButton.tooltip     "Clears completed, cancelled and failed downloads">
-
 <!-- LOCALIZATION NOTE (downloadsListEmpty.label):
      This string is shown when there are no items in the Downloads view, when it
      is displayed inside a browser tab.
      -->
+
 <!ENTITY downloadsListEmpty.label         "There are no downloads.">
-
 <!-- LOCALIZATION NOTE (downloadsPanelEmpty.label):
      This string is shown when there are no items in the Downloads Panel.
      -->
+
 <!ENTITY downloadsPanelEmpty.label        "No downloads for this session.">
-
 <!-- LOCALIZATION NOTE (downloadsListNoMatch.label):
      This string is shown when some search terms are specified, but there are no
      results in the Downloads view.
      -->
+
 <!ENTITY downloadsListNoMatch.label       "Could not find any matching downloads.">
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -33,23 +33,40 @@ stateBlockedParentalControls=Blocked by 
 # provide a reference for the translation of "security zone" in various
 # languages:
 # http://support.microsoft.com/kb/174360
 stateBlockedPolicy=Blocked by your security zone policy
 # LOCALIZATION NOTE (stateDirty):
 # Indicates that the download was blocked after scanning.
 stateDirty=Blocked: May contain a virus or spyware
 
+# LOCALIZATION NOTE (blockedMalware, blockedPotentiallyUnwanted,
+#                    blockedUncommon):
+# These strings are shown in the panel for some types of blocked downloads, and
+# are immediately followed by the "Learn More" link, thus they must end with a
+# period.  You may need to adjust "downloadDetails.width" in "downloads.dtd" if
+# this turns out to be longer than the other existing status strings.
+# Note: These strings don't exist in the UI yet.  See bug 1053890.
+
+# LOCALIZATION NOTE (unblockHeader, unblockTypeMalware,
+#                    unblockTypePotentiallyUnwanted, unblockTypeUncommon,
+#                    unblockTip, unblockButtonContinue, unblockButtonCancel):
+# These strings are displayed in the dialog shown when the user asks a blocked
+# download to be unblocked.  The severity of the threat is expressed in
+# descending order by the unblockType strings, it is higher for files detected
+# as malware and lower for uncommon downloads.
+# Note: These strings don't exist in the UI yet.  See bug 1053890.
+
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
 sizeWithUnits=%1$S %2$S
 sizeUnknown=Unknown size
 
 # LOCALIZATION NOTE (shortTimeLeftSeconds, shortTimeLeftMinutes,
-# shortTimeLeftHours, shortTimeLeftDays):
+#                    shortTimeLeftHours, shortTimeLeftDays):
 # These values are displayed in the downloads indicator in the main browser
 # window, where space is available for three characters maximum.  %1$S is
 # replaced with the time left for the given measurement unit.  Even for days,
 # the value is never longer than two digits.
 shortTimeLeftSeconds=%1$Ss
 shortTimeLeftMinutes=%1$Sm
 shortTimeLeftHours=%1$Sh
 shortTimeLeftDays=%1$Sd
@@ -59,18 +76,18 @@ shortTimeLeftDays=%1$Sd
 # status line of a download item.  As a separator, by default we use the Unicode
 # character U+2014 'EM DASH' (long dash).  Examples of status lines include
 # "Canceled - 222.net", "1.1 MB - website2.com", or "Paused -  1.1 MB".  Note
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
-statusSeparator=%1$S \u2014 %2$S
-statusSeparatorBeforeNumber=%1$S \u2014  %2$S
+statusSeparator=%1$S — %2$S
+statusSeparatorBeforeNumber=%1$S —  %2$S
 
 fileExecutableSecurityWarning="%S" is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch "%S"?
 fileExecutableSecurityWarningTitle=Open Executable File?
 fileExecutableSecurityWarningDontAsk=Don't ask me this again
 
 # LOCALIZATION NOTE (otherDownloads2):
 # This is displayed in an item at the bottom of the Downloads Panel when
 # there are more downloads than can fit in the list in the panel. Use a
--- a/browser/chrome/browser/engineManager.dtd
+++ b/browser/chrome/browser/engineManager.dtd
@@ -1,29 +1,29 @@
 <!-- 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  engineManager.title       "Manage Search Engine List">
-<!ENTITY  engineManager.style       "min-width: 35em;">
-<!ENTITY  engineManager.intro       "You have the following search engines installed:">
-
-<!ENTITY  columnLabel.name          "Name">
-<!ENTITY  columnLabel.keyword       "Keyword">
-
-<!-- Buttons -->
-<!ENTITY  up.label                  "Move Up">
-<!ENTITY  up.accesskey              "U">
-<!ENTITY  dn.label                  "Move Down">
-<!ENTITY  dn.accesskey              "D">
-<!ENTITY  remove.label              "Remove">
-<!ENTITY  remove.accesskey          "R">
-<!ENTITY  edit.label                "Edit Keyword…">
-<!ENTITY  edit.accesskey            "t">
-
-<!ENTITY  addEngine.label           "Get more search engines…">
-<!ENTITY  addEngine.accesskey       "A">
-
-<!ENTITY  enableSuggest.label       "Show search suggestions">
-<!ENTITY  enableSuggest.accesskey   "S">
-
-<!ENTITY  restoreDefaults.label     "Restore Defaults">
-<!ENTITY  restoreDefaults.accesskey "e">
+<!ENTITY  engineManager.title       "Manage Search Engine List">
+<!ENTITY  engineManager.style       "min-width: 35em;">
+<!ENTITY  engineManager.intro       "You have the following search engines installed:">
+
+<!ENTITY  columnLabel.name          "Name">
+<!ENTITY  columnLabel.keyword       "Keyword">
+<!-- Buttons -->
+
+<!ENTITY  up.label                  "Move Up">
+<!ENTITY  up.accesskey              "U">
+<!ENTITY  dn.label                  "Move Down">
+<!ENTITY  dn.accesskey              "D">
+<!ENTITY  remove.label              "Remove">
+<!ENTITY  remove.accesskey          "R">
+<!ENTITY  edit.label                "Edit Keyword…">
+<!ENTITY  edit.accesskey            "t">
+
+<!ENTITY  addEngine.label           "Get more search engines…">
+<!ENTITY  addEngine.accesskey       "a">
+
+<!ENTITY  enableSuggest.label       "Show search suggestions">
+<!ENTITY  enableSuggest.accesskey   "S">
+
+<!ENTITY  restoreDefaults.label     "Restore Defaults">
+<!ENTITY  restoreDefaults.accesskey "e">
--- a/browser/chrome/browser/engineManager.properties
+++ b/browser/chrome/browser/engineManager.properties
@@ -1,9 +1,9 @@
 # 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/.
 
-editTitle=Edit Keyword
-editMsg=Enter a new keyword for "%S":
-duplicateTitle=Duplicate Keyword
-duplicateEngineMsg=You have chosen a keyword that is currently in use by "%S". Please select another.
-duplicateBookmarkMsg=You have chosen a keyword that is currently in use by a bookmark. Please select another.
+editTitle=Edit Keyword
+editMsg=Enter a new keyword for "%S":
+duplicateTitle=Duplicate Keyword
+duplicateEngineMsg=You have chosen a keyword that is currently in use by "%S". Please select another.
+duplicateBookmarkMsg=You have chosen a keyword that is currently in use by a bookmark. Please select another.
--- a/browser/chrome/browser/feeds/subscribe.dtd
+++ b/browser/chrome/browser/feeds/subscribe.dtd
@@ -1,11 +1,7 @@
 <!-- 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 feedPage.title
-  "Viewing Feed">
-<!ENTITY feedSubscribeNow
-  "Subscribe Now">
-<!ENTITY feedLiveBookmarks
-  "Live Bookmarks">
-
+<!ENTITY feedPage.title "Viewing Feed">
+<!ENTITY feedSubscribeNow "Subscribe Now">
+<!ENTITY feedLiveBookmarks "Live Bookmarks">
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -28,19 +28,19 @@ gigabyte=GB
 # LOCALIZATION NOTE: The next three strings explains to the user what they're 
 # doing.
 #   e.g. alwaysUseForVideoPodcasts : "Always use Miro to subscribe to video podcasts."
 #   %S = application to use (Miro, iTunes, ...)
 alwaysUseForFeeds=Always use %S to subscribe to feeds.
 alwaysUseForAudioPodcasts=Always use %S to subscribe to podcasts.
 alwaysUseForVideoPodcasts=Always use %S to subscribe to video podcasts.
 
-subscribeFeedUsing=Subscribe to this feed using 
-subscribeAudioPodcastUsing=Subscribe to this podcast using 
-subscribeVideoPodcastUsing=Subscribe to this video podcast using 
+subscribeFeedUsing=Subscribe to this feed using\u0020
+subscribeAudioPodcastUsing=Subscribe to this podcast using\u0020
+subscribeVideoPodcastUsing=Subscribe to this video podcast using\u0020
 
 feedSubscriptionFeed1=This is a "feed" of frequently changing content on this site.
 feedSubscriptionAudioPodcast1=This is a "podcast" of frequently changing content on this site.
 feedSubscriptionVideoPodcast1=This is a "video podcast" of frequently changing content on this site.
 
 feedSubscriptionFeed2=You can subscribe to this feed to receive updates when this content changes.
 feedSubscriptionAudioPodcast2=You can subscribe to this podcast to receive updates when this content changes.
 feedSubscriptionVideoPodcast2=You can subscribe to this video podcast to receive updates when this content changes.
--- a/browser/chrome/browser/loop/loop.properties
+++ b/browser/chrome/browser/loop/loop.properties
@@ -1,14 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Panel Strings
 
+## LOCALIZATION NOTE(clientShortname2): This should not be localized and
+## should remain "Firefox Hello" for all locales.
+
+## LOCALIZATION_NOTE(first_time_experience.title): clientShortname will be
+## replaced by the brand name
+
 share_link_header_text=Share this link to invite someone to talk:
 
 ## LOCALIZATION NOTE(invitee_name_label): Displayed when obtaining a url.
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#precall-firstrun
 ## Click the label icon at the end of the url field.
 invitee_name_label=Who are you inviting?
 ## LOCALIZATION NOTE(invitee_expire_days_label): Allows the user to adjust
 ## the expiry time. Click the label icon at the end of the url field to see where
@@ -47,20 +53,18 @@ login_expired=Your Login Has Expired
 service_not_available=Service Unavailable At This Time
 problem_accessing_account=There Was A Problem Accessing Your Account
 
 ## LOCALIZATION NOTE(retry_button): Displayed when there is an error to retry
 ## the appropriate action.
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#error for location
 retry_button=Retry
 
-share_email_subject3=You have been invited to a conversation
-## LOCALIZATION NOTE (share_email_body3): In this item, don't translate the
+## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
 ## part between {{..}} and leave the \r\n\r\n part alone
-share_email_body3=To accept this invitation, just copy or click this link to start your conversation:\r\n\r\n{{callUrl}}
 share_button=Email
 copy_url_button=Copy
 copied_url_button=Copied!
 
 panel_footer_signin_or_signup_link=Sign In or Sign Up
 
 settings_menu_item_account=Account
 settings_menu_item_settings=Settings
@@ -80,16 +84,18 @@ contacts_search_placesholder=Search…
 ## for where this appears on the UI
 new_contact_button=New Contact
 ## LOCALIZATION NOTE (new_contact_name_placeholder, new_contact_email_placeholder):
 ## These are the placeholders for the fields for entering a new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 new_contact_name_placeholder=Name
 new_contact_email_placeholder=Email
+
+
 ## LOCALIZATION NOTE (add_contact_button):
 ## This is the button to actually add the new contact
 ## See https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#contacts
 ## and click the 'New Contact' button to see the fields.
 add_contact_button=Add Contact
 ### LOCALIZATION NOTE (valid_email_text_description): This is displayed when
 ### the user enters an invalid email address, preventing the addition of the
 ### contact.
@@ -233,22 +239,25 @@ cancel_button=Cancel
 
 cannot_start_call_session_not_ready=Can't start call, session is not ready.
 network_disconnected=The network connection terminated abruptly.
 connection_error_see_console_notification=Call failed; see console for details.
 
 ## LOCALIZATION NOTE (legal_text_and_links3): In this item, don't translate the
 ## parts between {{..}} because these will be replaced with links with the labels
 ## from legal_text_tos and legal_text_privacy. clientShortname will be replaced
-## by the brand name, or fall back to client_shortname_fallback
-legal_text_and_links3=By using {{clientShortname}} you agree to the {{terms_of_use}} \
-  and {{privacy_notice}}.
+## by the brand name.
+legal_text_and_links3=By using {{clientShortname}} you agree to the {{terms_of_use}} and {{privacy_notice}}.
 legal_text_tos = Terms of Use
 legal_text_privacy = Privacy Notice
-client_shortname_fallback=this product
+
+## LOCALIZATION NOTE (powered_by_beforeLogo, powered_by_afterLogo):
+## These 2 strings are displayed before and after a 'Telefonica'
+## logo.
+powered_by_afterLogo=
 
 feedback_call_experience_heading2=How was your conversation?
 feedback_what_makes_you_sad=What makes you sad?
 feedback_thank_you_heading=Thank you for your feedback!
 feedback_category_audio_quality=Audio quality
 feedback_category_video_quality=Video quality
 feedback_category_was_disconnected=Was disconnected
 feedback_category_confusing=Confusing
@@ -263,8 +272,20 @@ feedback_back_button=Back
 feedback_window_will_close_in2=This window will close in {{countdown}} second;This window will close in {{countdown}} seconds
 ## LOCALIZATION_NOTE (feedback_rejoin_button): Displayed on the feedback form after
 ## a signed-in to signed-in user call.
 ## https://people.mozilla.org/~dhenein/labs/loop-mvp-spec/#feedback
 feedback_rejoin_button=Rejoin
 ## LOCALIZATION NOTE (feedback_report_user_button): Used to report a user in the case of
 ## an abusive user.
 feedback_report_user_button=Report User
+
+help_label=Help
+
+## LOCALIZATION NOTE(rooms_default_room_name_template): {{conversationLabel}}
+## will be replaced by a number. For example "Conversation 1" or "Conversation 12".
+rooms_leave_button_label=Leave
+## LOCALIZATION NOTE (rooms_list_current_conversations):
+## Semicolon-separated list of plural forms. See:
+## http://developer.mozilla.org/en/docs/Localization_and_Plurals
+## We prefer to have no number in the string, but if you need it for your
+## language please use {{num}}.
+rooms_list_deleteConfirmation_label=Are you sure?
--- a/browser/chrome/browser/newTab.dtd
+++ b/browser/chrome/browser/newTab.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- These strings are used in the about:newtab page -->
 
-<!-- These strings are used in the about:newtab page -->
 <!ENTITY newtab.pageTitle "New Tab">
 <!ENTITY newtab.customize.title "Customise your New Tab page">
 <!ENTITY newtab.customize.enhanced "Enhanced">
 <!ENTITY newtab.customize.classic "Classic">
 <!ENTITY newtab.customize.blank "Blank">
 <!ENTITY newtab.customize.what "What is this page?">
 <!ENTITY newtab.intro.header "What is this page?">
 <!ENTITY newtab.undo.removedLabel "Thumbnail removed.">
--- a/browser/chrome/browser/openLocation.dtd
+++ b/browser/chrome/browser/openLocation.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- extracted from content/openLocation.xul -->
 
-<!-- extracted from content/openLocation.xul -->
 
 <!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">  
 <!ENTITY chooseFile.label "Choose File…">
 <!ENTITY newTab.label "New Tab">
 <!ENTITY newWindow.label "New Window">
 <!ENTITY topTab.label "Current Tab">
 <!ENTITY caption.label "Open Web Location">
 <!ENTITY openWhere.label "Open in:">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -19,24 +19,24 @@ mediaBGImg=Background
 mediaBorderImg=Border
 mediaListImg=Bullet
 mediaCursor=Cursor
 mediaObject=Object
 mediaEmbed=Embed
 mediaLink=Icon
 mediaInput=Input
 mediaFileSize=%S kB
-mediaSize=%Spx \u00D7 %Spx
+mediaSize=%Spx × %Spx
 mediaSelectFolder=Select a Folder to Save the Images
 mediaBlockImage=Block Images from %S
 mediaUnknownNotCached=Unknown (not cached)
 mediaImageType=%S Image
 mediaAnimatedImageType=%S Image (animated, %S frames)
-mediaDimensions=%Spx \u00D7 %Spx
-mediaDimensionsScaled=%Spx \u00D7 %Spx (scaled to %Spx \u00D7 %Spx)
+mediaDimensions=%Spx × %Spx
+mediaDimensionsScaled=%Spx × %Spx (scaled to %Spx × %Spx)
 
 generalQuirksMode=Quirks mode
 generalStrictMode=Standards compliance mode
 generalSize=%S kB (%S bytes)
 generalMetaTag=Meta (1 tag)
 generalMetaTags=Meta (%S tags)
 
 feedRss=RSS
--- a/browser/chrome/browser/places/moveBookmarks.dtd
+++ b/browser/chrome/browser/places/moveBookmarks.dtd
@@ -1,9 +1,9 @@
 <!-- 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 window.title              "Choose Folder">
-<!ENTITY window.style              "width: 36em; height: 18em;">
-<!ENTITY moveTo.label              "Move to:">
-<!ENTITY newFolderButton.label     "New Folder">
-<!ENTITY newFolderButton.accesskey "N">
+<!ENTITY window.title              "Choose Folder">
+<!ENTITY window.style              "width: 36em; height: 18em;">
+<!ENTITY moveTo.label              "Move to:">
+<!ENTITY newFolderButton.label     "New Folder">
+<!ENTITY newFolderButton.accesskey "N">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -1,13 +1,13 @@
 <!-- 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 (places.library.title): use "Library", "Archive" or "Repository" -->
 
-<!-- LOCALIZATION NOTE (places.library.title): use "Library", "Archive" or "Repository" -->
 <!ENTITY places.library.title  "Library">
 <!ENTITY places.library.width  "700">
 <!ENTITY places.library.height "500">
 <!ENTITY organize.label        "Organise">
 <!ENTITY organize.accesskey    "O">
 <!ENTITY organize.tooltip      "Organise your bookmarks">
 
 <!ENTITY file.close.label               "Close">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -23,72 +23,53 @@ bookmarksLivemarkFailed=Live Bookmark fe
 menuOpenLivemarkOrigin.label=Open "%S"
 
 sortByName=Sort '%S' by Name
 sortByNameGeneric=Sort by Name
 # LOCALIZATION NOTE (view.sortBy.1.name.label): sortBy properties are versioned.
 # When any of these changes, all of the properties must be bumped, and the
 # change must be annotated here.  Both label and accesskey must be updated.
 # - version 1: changed view.sortBy.1.date.
-view.sortBy.1.name.label=Sort by Name
-view.sortBy.1.name.accesskey=N
-view.sortBy.1.url.label=Sort by Location
-view.sortBy.1.url.accesskey=L
-view.sortBy.1.date.label=Sort by Most Recent Visit
-view.sortBy.1.date.accesskey=V
-view.sortBy.1.visitCount.label=Sort by Visit Count
-view.sortBy.1.visitCount.accesskey=C
-view.sortBy.1.keyword.label=Sort by Keyword
-view.sortBy.1.keyword.accesskey=K
-view.sortBy.1.description.label=Sort by Description
-view.sortBy.1.description.accesskey=D
-view.sortBy.1.dateAdded.label=Sort by Added
-view.sortBy.1.dateAdded.accesskey=e
-view.sortBy.1.lastModified.label=Sort by Last Modified
-view.sortBy.1.lastModified.accesskey=M
-view.sortBy.1.tags.label=Sort by Tags
-view.sortBy.1.tags.accesskey=T
 
 searchBookmarks=Search Bookmarks
 searchHistory=Search History
 searchDownloads=Search Downloads
 
 tabs.openWarningTitle=Confirm open
 tabs.openWarningMultipleBranded=You are about to open %S tabs.  This might slow down %S while the pages are loading.  Are you sure you want to continue?
 tabs.openButtonMultiple=Open tabs
 tabs.openWarningPromptMeBranded=Warn me when opening multiple tabs might slow down %S
 
 SelectImport=Import Bookmarks File
 EnterExport=Export Bookmarks File
 
 detailsPane.noItems=No items
-# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=One item;#1 items
 
 mostVisitedTitle=Most Visited
 recentlyBookmarkedTitle=Recently Bookmarked
 recentTagsTitle=Recent Tags
 
 OrganizerQueryHistory=History
 OrganizerQueryDownloads=Downloads
 OrganizerQueryAllBookmarks=All Bookmarks
 OrganizerQueryTags=Tags
 
-# LOCALIZATION NOTE (tagResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "tag"
-# See createResultLabel() in urlbarBindings.xml 
+# LOCALIZATION NOTE (tagResultLabel, bookmarkResultLabel, switchtabResultLabel,
+# keywordResultLabel, searchengineResultLabel)
+# Noun used to describe the location bar autocomplete result type
+# to users with screen readers
+# See createResultLabel() in urlbarBindings.xml
 tagResultLabel=Tag
-# LOCALIZATION NOTE (bookmarkResultLabel) :
-# This is what we use to form the label (for screen readers)
-# for url bar autocomplete results of type "bookmark"
-# See createResultLabel() in urlbarBindings.xml 
 bookmarkResultLabel=Bookmark
+switchtabResultLabel=Tab
+keywordResultLabel=Keyword
+searchengineResultLabel=Search
+
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
 lockPrompt.title=Browser Startup Error
 lockPrompt.text=The bookmarks and history system will not be functional because one of %S's files is in use by another application. Some security software can cause this problem.
-lockPromptInfoButton.label=Learn More
-lockPromptInfoButton.accessKey=L
--- a/browser/chrome/browser/preferences/aboutPermissions.dtd
+++ b/browser/chrome/browser/preferences/aboutPermissions.dtd
@@ -1,20 +1,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY permissionsManager.title        "Permissions Manager">
 
 <!ENTITY sites.search                    "Search Sites">
 <!ENTITY sites.allSites                  "All Sites">
-
 <!-- LOCALIZATION NOTE (permissions.header.start, permissions.header.end): These strings
      surround the host name of the site to make the header for the permissions page.
      example: "Permissions for mozilla.org" -->
+
 <!ENTITY header.site.start               "Permissions for">
 <!ENTITY header.site.end                 "">
 
 <!ENTITY header.defaults                 "Default Permissions for All Sites">
 
 <!ENTITY permissions.forgetSite          "Forget About This Site">
 
 <!ENTITY permission.alwaysAsk            "Always Ask">
@@ -29,18 +29,18 @@
 <!ENTITY cookie.label                    "Set Cookies">
 <!ENTITY cookie.remove                   "Remove Cookies">
 <!ENTITY cookie.manage                   "Manage Cookies…">
 <!ENTITY cookie.removeAll                "Remove All Cookies">
 
 <!ENTITY geo.label                       "Share Location">
 
 <!ENTITY plugins.label                   "Plugins">
-
 <!-- LOCALIZATION NOTE (indexedDB.label): This is describing indexedDB storage
      using the same language used for the permIndexedDB string in browser/pageInfo.dtd -->
+
 <!ENTITY indexedDB.label                 "Maintain Offline Storage">
 
 <!ENTITY popup.label                     "Open Popup Windows">
 
 <!ENTITY fullscreen.label                "Fullscreen">
 <!ENTITY camera.label                    "Use the Camera">
 <!ENTITY microphone.label                "Use the Microphone">
--- a/browser/chrome/browser/preferences/aboutPermissions.properties
+++ b/browser/chrome/browser/preferences/aboutPermissions.properties
@@ -1,9 +1,13 @@
 # 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 (visitCount): #1 is the number of history visits for a site
+# LOCALIZATION NOTE (visitCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of history visits for a site
 visitCount=#1 visit;#1 visits
 
+# LOCALIZATION NOTE (passwordsCount, cookiesCount): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 passwordsCount=#1 password is stored for this web site.;#1 passwords are stored for this web site.
 cookiesCount=#1 cookie is set for this web site.;#1 cookies are set for this web site.
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- Note: each tab panel must contain unique accesskeys -->
 
-<!-- Note: each tab panel must contain unique accesskeys -->
 
 <!ENTITY generalTab.label                "General">
 
 <!ENTITY accessibility.label             "Accessibility">
 
 <!ENTITY useCursorNavigation.label       "Always use the cursor keys to navigate within pages">
 <!ENTITY useCursorNavigation.accesskey   "c">
 <!ENTITY searchStartTyping.label         "Search for text when I start typing">
@@ -52,23 +52,23 @@
 
 <!ENTITY connectionDesc.label            "Configure how &brandShortName; connects to the Internet">
 <!ENTITY connectionSettings.label        "Settings…">
 <!ENTITY connectionSettings.accesskey    "S">
 
 <!ENTITY httpCache.label                 "Cached Web Content">
 
 <!ENTITY offlineStorage2.label           "Offline Web Content and User Data">
-
 <!-- LOCALIZATION NOTE:
   The entities limitCacheSizeBefore.label and limitCacheSizeAfter.label appear on a single
   line in preferences as follows:
 
   &limitCacheSizeBefore.label [textbox for cache size in MB] &limitCacheSizeAfter.label;
 -->
+
 <!ENTITY limitCacheSizeBefore.label      "Limit cache to">
 <!ENTITY limitCacheSizeBefore.accesskey  "L">
 <!ENTITY limitCacheSizeAfter.label       "MB of space">
 <!ENTITY clearCacheNow.label             "Clear Now">
 <!ENTITY clearCacheNow.accesskey         "C">
 <!ENTITY clearOfflineAppCacheNow.label   "Clear Now">
 <!ENTITY clearOfflineAppCacheNow.accesskey "N">
 <!ENTITY overrideSmartCacheSize.label    "Override automatic cache management">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -27,18 +27,18 @@
 <!ENTITY chooseLanguage.label         "Choose your preferred language for displaying pages">
 <!ENTITY chooseButton.label           "Choose…">
 <!ENTITY chooseButton.accesskey       "o">
 
 <!ENTITY translateWebPages.label      "Translate web content">
 <!ENTITY translateWebPages.accesskey  "T">
 <!ENTITY translateExceptions.label    "Exceptions…">
 <!ENTITY translateExceptions.accesskey "x">
-
 <!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
   -                     translation.options.attribution.afterLogo):
   -  These 2 strings are displayed before and after a 'Microsoft Translator'
   -  logo.
   -  The translations for these strings should match the translations in
   -  browser/translation.dtd
   -->
+
 <!ENTITY translation.options.attribution.beforeLogo "Translations by">
 <!ENTITY translation.options.attribution.afterLogo "">
--- a/browser/chrome/browser/preferences/fonts.dtd
+++ b/browser/chrome/browser/preferences/fonts.dtd
@@ -15,19 +15,19 @@
 <!ENTITY  proportional.accesskey                  "P">
 
 <!ENTITY  serif.label                             "Serif:">
 <!ENTITY  serif.accesskey                         "S">
 <!ENTITY  sans-serif.label                        "Sans Serif:">
 <!ENTITY  sans-serif.accesskey                    "n">
 <!ENTITY  monospace.label                         "Monospace:">
 <!ENTITY  monospace.accesskey                     "M">
-
 <!-- LOCALIZATION NOTE (font.langGroup.latin) :
      Translate "Latin" as the name of Latin (Roman) script, not as the name of the Latin language. -->
+
 <!ENTITY  font.langGroup.latin                    "Latin">
 <!ENTITY  font.langGroup.japanese                 "Japanese">
 <!ENTITY  font.langGroup.trad-chinese             "Traditional Chinese (Taiwan)">
 <!ENTITY  font.langGroup.simpl-chinese            "Simplified Chinese">
 <!ENTITY  font.langGroup.trad-chinese-hk          "Traditional Chinese (Hong Kong)">
 <!ENTITY  font.langGroup.korean                   "Korean">
 <!ENTITY  font.langGroup.cyrillic                 "Cyrillic">
 <!ENTITY  font.langGroup.el                       "Greek">
@@ -50,18 +50,18 @@
 <!ENTITY  font.langGroup.telugu                   "Telugu">
 <!ENTITY  font.langGroup.kannada                  "Kannada">
 <!ENTITY  font.langGroup.sinhala                  "Sinhala">
 <!ENTITY  font.langGroup.tibetan                  "Tibetan">
 <!-- Minimum font size -->
 <!ENTITY minSize.label                            "Minimum font size:">
 <!ENTITY minSize.accesskey                        "o">
 <!ENTITY minSize.none                             "None">
+<!-- default font type -->
 
-<!-- default font type -->
 <!ENTITY  useDefaultFontSerif.label               "Serif">
 <!ENTITY  useDefaultFontSansSerif.label           "Sans Serif">
 
 <!ENTITY  allowPagesToUse.label                   "Allow pages to choose their own fonts, instead of my selections above">
 <!ENTITY  allowPagesToUse.accesskey               "A">
 
 <!ENTITY languages.customize.Fallback.grouplabel  "Character Encoding for Legacy Content">
 <!ENTITY languages.customize.Fallback.label       "Fallback Character Encoding:">
--- a/browser/chrome/browser/preferences/main.dtd
+++ b/browser/chrome/browser/preferences/main.dtd
@@ -27,13 +27,19 @@
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "o">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey "A">
 
 <!ENTITY alwaysCheckDefault.label         "Always check to see if &brandShortName; is the default browser on startup">
-<!ENTITY alwaysCheckDefault2.accesskey    "w">
+
+
 <!ENTITY setAsMyDefaultBrowser.label      "Make &brandShortName; My Default Browser">
 <!ENTITY setAsMyDefaultBrowser.accesskey  "D">
+
+
 <!ENTITY isDefault.label                  "&brandShortName; is currently your default browser">
 <!ENTITY isNotDefault.label               "&brandShortName; is not your default browser">
+
+
+
--- a/browser/chrome/browser/preferences/preferences.dtd
+++ b/browser/chrome/browser/preferences/preferences.dtd
@@ -15,15 +15,15 @@
 
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneTabs.title          "Tabs">
 <!ENTITY  paneContent.title       "Content">
 <!ENTITY  paneApplications.title  "Applications">
 <!ENTITY  panePrivacy.title       "Privacy">
 <!ENTITY  paneSecurity.title      "Security">
 <!ENTITY  paneAdvanced.title      "Advanced">
+<!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 
-<!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Sync">
 <!ENTITY  buttonForward.tooltip   "Go forwards one page">
 <!ENTITY  buttonBack.tooltip      "Go backwards one page">
 
 <!ENTITY  helpButton.label        "Help">
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -121,18 +121,16 @@ actualDiskCacheSizeCalculated=Calculating web content cache size…
 #LOCALIZATION NOTE: The next string is for the disk usage of the application cache.
 #   e.g., "Your application cache is currently using 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
 actualAppCacheSize=Your application cache is currently using %1$S %2$S of disc space
 
 ###Preferences::Advanced::Update
 #LOCALIZATION NOTE: The next string is for updating in Windows 8 only instead of updateAuto1.label.  %S = brandShortName
-updateAutoDesktop.label=Automatically install updates from desktop %S
-updateAutoDesktop.accessKey=A
 
 syncUnlink.title=Do you want to unlink your device?
 syncUnlink.label=This device will no longer be associated with your Sync account. All of your personal data, both on this device and in your Sync account, will remain intact.
 syncUnlinkConfirm.label=Unlink
 
 # LOCALIZATION NOTE (featureEnableRequiresRestart, featureDisableRequiresRestart, restartTitle): %S = brandShortName
 featureEnableRequiresRestart=%S must restart to enable this feature.
 featureDisableRequiresRestart=%S must restart to disable this feature.
--- a/browser/chrome/browser/preferences/privacy.dtd
+++ b/browser/chrome/browser/preferences/privacy.dtd
@@ -52,30 +52,30 @@
 <!ENTITY  historyHeader.pre.label          "&brandShortName; will:">
 <!ENTITY  historyHeader.pre.accesskey      "w">
 <!ENTITY  historyHeader.remember.label     "Remember history">
 <!ENTITY  historyHeader.dontremember.label "Never remember history">
 <!ENTITY  historyHeader.custom.label       "Use custom settings for history">
 <!ENTITY  historyHeader.post.label         "">
 
 <!ENTITY  rememberDescription.label      "&brandShortName; will remember your browsing, download, form and search history, and keep cookies from Web sites you visit.">
-
 <!-- LOCALIZATION NOTE (rememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.middle.label): include a starting and trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.post.label): include a starting space as needed -->
+
 <!ENTITY  rememberActions.pre.label           "You may want to ">
 <!ENTITY  rememberActions.clearHistory.label  "clear your recent history">
 <!ENTITY  rememberActions.middle.label        ", or ">
 <!ENTITY  rememberActions.removeCookies.label "remove individual cookies">
 <!ENTITY  rememberActions.post.label          ".">
 
 <!ENTITY  dontrememberDescription.label  "&brandShortName; will use the same settings as private browsing, and will not remember any history as you browse the Web.">
-
 <!-- LOCALIZATION NOTE (dontrememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (dontrememberActions.post.label): include a starting space as needed -->
+
 <!ENTITY  dontrememberActions.pre.label          "You may also want to ">
 <!ENTITY  dontrememberActions.clearHistory.label "clear all current history">
 <!ENTITY  dontrememberActions.post.label         ".">
 
 <!ENTITY  privateBrowsingPermanent2.label "Always use private browsing mode">
 <!ENTITY  privateBrowsingPermanent2.accesskey "p">
 
 <!ENTITY  rememberHistory2.label      "Remember my browsing and download history">
--- a/browser/chrome/browser/preferences/security.dtd
+++ b/browser/chrome/browser/preferences/security.dtd
@@ -1,24 +1,24 @@
 <!-- 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  general.label                 "General">
 
 <!ENTITY  warnAddonInstall.label        "Warn me when sites try to install add-ons">
 <!ENTITY  warnAddonInstall.accesskey    "W">
-
 <!-- LOCALIZATION NOTE (blockWebForgeries.label, blockAttackSites.label):
   The methods by which forged (phished) and attack sites will be detected by
   phishing providers will vary from human review to machine-based heuristics to a
   combination of both, so it's important that these strings and
   useDownloadedList.label convey the meaning "reported" (and not something like
   "known").
 -->
+
 <!ENTITY  blockAttackSites.label     "Block reported attack sites">
 <!ENTITY  blockAttackSites.accesskey "a">
 
 <!ENTITY  blockWebForgeries.label     "Block reported web forgeries">
 <!ENTITY  blockWebForgeries.accesskey "B">
 
 <!ENTITY  addonExceptions.label         "Exceptions…">
 <!ENTITY  addonExceptions.accesskey     "E">
@@ -31,10 +31,10 @@
 <!ENTITY  passwordExceptions.label      "Exceptions…">
 <!ENTITY  passwordExceptions.accesskey  "x">
 
 <!ENTITY  useMasterPassword.label        "Use a master password">
 <!ENTITY  useMasterPassword.accesskey    "U">
 <!ENTITY  changeMasterPassword.label     "Change Master Password…">
 <!ENTITY  changeMasterPassword.accesskey "M">
 
-<!ENTITY  savedPasswords.label          "Saved Passwords…">
-<!ENTITY  savedPasswords.accesskey      "P">
+<!ENTITY  savedPasswords.label            "Saved Passwords…">
+<!ENTITY  savedPasswords.accesskey        "P">
--- a/browser/chrome/browser/preferences/selectBookmark.dtd
+++ b/browser/chrome/browser/preferences/selectBookmark.dtd
@@ -1,9 +1,7 @@
 <!-- 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 selectBookmark.title
-  "Set Home Page">
-<!ENTITY selectBookmark.label
-  "Choose a Bookmark to be your Home Page. If you choose a folder, the Bookmarks in that folder will be opened in Tabs.">
-
+<!ENTITY selectBookmark.title "Set Home Page">
+<!ENTITY selectBookmark.label "Choose a Bookmark to be your Home Page. If you choose a folder, the Bookmarks in that folder will be opened in Tabs.">
+
--- a/browser/chrome/browser/preferences/sync.dtd
+++ b/browser/chrome/browser/preferences/sync.dtd
@@ -1,24 +1,24 @@
 <!-- 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/. -->
+<!-- The page shown when not logged in... -->
 
-<!-- The page shown when not logged in... -->
 <!ENTITY setupButton.label          "Set Up &syncBrand.fullName.label;">
 <!ENTITY setupButton.accesskey      "S">
 <!ENTITY weaveDesc.label            "&syncBrand.fullName.label; lets you access your history, bookmarks, passwords and open tabs across all your devices.">
+<!-- The page shown when logged in... -->
+<!-- Login error feedback -->
 
-<!-- The page shown when logged in... -->
 
-<!-- Login error feedback -->
 <!ENTITY updatePass.label             "Update">
 <!ENTITY resetPass.label              "Reset">
+<!-- Manage Account -->
 
-<!-- Manage Account -->
 <!ENTITY manageAccount.label          "Manage Account">
 <!ENTITY manageAccount.accesskey      "A">
 <!ENTITY viewQuota.label              "View Quota">
 <!ENTITY changePassword2.label        "Change Password…">
 <!ENTITY myRecoveryKey.label          "My Recovery Key">
 <!ENTITY resetSync2.label             "Reset Sync…">
 
 <!ENTITY pairDevice.label             "Pair a Device">
@@ -31,43 +31,43 @@
 <!ENTITY engine.history.label       "History">
 <!ENTITY engine.history.accesskey   "r">
 <!ENTITY engine.passwords.label     "Passwords">
 <!ENTITY engine.passwords.accesskey "P">
 <!ENTITY engine.prefs.label         "Preferences">
 <!ENTITY engine.prefs.accesskey     "s">
 <!ENTITY engine.addons.label        "Add-ons">
 <!ENTITY engine.addons.accesskey    "A">
+<!-- Device Settings -->
 
-<!-- Device Settings -->
 <!ENTITY syncDeviceName.label       "Device Name:">
 <!ENTITY syncDeviceName.accesskey   "c">
 <!ENTITY unlinkDevice.label           "Unlink This Device">
+<!-- Footer stuff -->
 
-<!-- Footer stuff -->
 <!ENTITY prefs.tosLink.label        "Terms of Service">
 <!ENTITY prefs.ppLink.label         "Privacy Policy">
+<!-- Firefox Accounts stuff -->
 
-<!-- Firefox Accounts stuff -->
 <!ENTITY fxaPrivacyNotice.link.label "Privacy Notice">
 <!ENTITY determiningAcctStatus.label     "Determining your account status…">
-
 <!-- LOCALIZATION NOTE (signedInUnverified.beforename.label,
 signedInUnverified.aftername.label): these two string are used respectively
 before and after the account email address. Localizers can use one of them, or
 both, to better adapt this sentence to their language.
 -->
+
 <!ENTITY signedInUnverified.beforename.label "">
 <!ENTITY signedInUnverified.aftername.label "is not verified.">
-
 <!-- LOCALIZATION NOTE (signedInLoginFailure.beforename.label,
 signedInLoginFailure.aftername.label): these two string are used respectively
 before and after the account email address. Localizers can use one of them, or
 both, to better adapt this sentence to their language.
 -->
+
 <!ENTITY signedInLoginFailure.beforename.label "Please sign in to reconnect">
 <!ENTITY signedInLoginFailure.aftername.label "">
 
 <!ENTITY notSignedIn.label           "You are not signed in.">
 <!ENTITY signIn.label                "Sign in">
 <!ENTITY manage.label                "Manage">
 <!ENTITY disconnect.label            "Disconnect…">
 <!ENTITY verify.label                "Verify Email">
--- a/browser/chrome/browser/safeMode.dtd
+++ b/browser/chrome/browser/safeMode.dtd
@@ -1,19 +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/. -->
 
 <!ENTITY safeModeDialog.title         "&brandShortName; Safe Mode">
 <!ENTITY window.maxWidth              "400">
 
 <!ENTITY startSafeMode.label          "Start in Safe Mode">
-<!ENTITY resetProfile.label           "Reset &brandShortName;">
+
 
 <!ENTITY safeModeDescription3.label   "Safe Mode is a special mode of &brandShortName; that can be used to troubleshoot issues.">
 <!ENTITY safeModeDescription4.label   "Your add-ons and custom settings will be temporarily disabled.">
 
-<!ENTITY resetProfileInstead.label    "You can also Reset &brandShortName; if you want to start fresh.">
-
-<!-- LOCALIZATION NOTE (autoSafeModeDescription2.label safeModeInstead.label resetProfileFooter.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
-<!ENTITY autoSafeModeDescription2.label "&brandShortName; closed unexpectedly while starting. This might be caused by add-ons or other problems. You can try to resolve the problem by resetting &brandShortName; to its default state or troubleshooting in Safe Mode.">
-<!ENTITY resetProfileFooter.label       "Everything else will be reset to factory defaults.">
-<!ENTITY safeModeInstead.label          "If you don't want this, you can continue in Safe Mode to do your own troubleshooting with your add-ons and custom settings temporarily disabled.">
+<!-- LOCALIZATION NOTE (autoSafeModeDescription3.label): Shown on the safe mode dialog after multiple startup crashes. See also chrome/global/resetProfile.dtd -->
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -1,36 +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/. -->
 
 <!ENTITY sanitizePrefs2.title          "Settings for Clearing History">
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
 
 <!ENTITY clearDataSettings2.label     "When I quit &brandShortName;, it should automatically clear all:">
-
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
+
 <!ENTITY clearTimeDuration.label          "Time range to clear: ">
 <!ENTITY clearTimeDuration.accesskey      "T">
 <!ENTITY clearTimeDuration.lastHour       "Last Hour">
 <!ENTITY clearTimeDuration.last2Hours     "Last Two Hours">
 <!ENTITY clearTimeDuration.last4Hours     "Last Four Hours">
 <!ENTITY clearTimeDuration.today          "Today">
 <!ENTITY clearTimeDuration.everything     "Everything">
 <!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
 that require it.  -->
 <!ENTITY clearTimeDuration.suffix         "">
 <!ENTITY clearTimeDuration.dateColumn     "Visit Date">
 <!ENTITY clearTimeDuration.nameColumn     "Name">
-
 <!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
      of the "Details" progressive disclosure button.  See UI mockup at bug
      480169 -->
+
 <!ENTITY detailsProgressiveDisclosure.label     "Details">
 <!ENTITY detailsProgressiveDisclosure.accesskey "e">
 
 <!ENTITY historySection.label         "History">
 <!ENTITY dataSection.label            "Data">
 
 <!ENTITY itemHistoryAndDownloads.label     "Browsing &amp; Download History">
 <!ENTITY itemHistoryAndDownloads.accesskey "B">
@@ -43,20 +43,20 @@ that require it.  -->
 <!ENTITY itemCache.label                   "Cache">
 <!ENTITY itemCache.accesskey               "a">
 <!ENTITY itemOfflineApps.label             "Offline Web Site Data">
 <!ENTITY itemOfflineApps.accesskey         "O">
 <!ENTITY itemActiveLogins.label            "Active Logins">
 <!ENTITY itemActiveLogins.accesskey        "L">
 <!ENTITY itemSitePreferences.label         "Site Preferences">
 <!ENTITY itemSitePreferences.accesskey     "S">
-
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
+
 <!ENTITY sanitizeEverythingUndoWarning     "This action cannot be undone.">
-
 <!-- LOCALIZATION NOTE (dialog.width2): width of the Clear Recent History and
      Clear History on Shutdown dialogs.  Should be large enough to contain
      the item* strings above on a single line.  The column width should be set
      at half of the dialog width. -->
+
 <!ENTITY dialog.width2                 "34em">
 <!ENTITY column.width2                 "17em">
--- a/browser/chrome/browser/shellservice.properties
+++ b/browser/chrome/browser/shellservice.properties
@@ -3,21 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 optionsLabel=%S &Options
 safeModeLabel=%S &Safe Mode
 
 # LOCALIZATION NOTE (setDefaultBrowserMessage2, setDefaultBrowserConfirm.label):
 # %S will be replaced by brandShortName
 setDefaultBrowserMessage2          = Get the most out of %S by setting it as your default browser
-setDefaultBrowserConfirm.label     = Use %S as my default browser
-setDefaultBrowserConfirm.accesskey = U
 setDefaultBrowserOptions.label     = Options
 setDefaultBrowserOptions.accesskey = O
-setDefaultBrowserNotNow.label      = Not now
-setDefaultBrowserNotNow.accesskey  = N
 setDefaultBrowserNever.label       = Don't ask me again
 setDefaultBrowserNever.accesskey   = D
 
 
 desktopBackgroundLeafNameWin=Desktop Background.bmp
 DesktopBackgroundDownloading=Saving Picture…
 DesktopBackgroundSet=Set Desktop Background
--- a/browser/chrome/browser/syncCustomize.dtd
+++ b/browser/chrome/browser/syncCustomize.dtd
@@ -3,21 +3,21 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY syncCustomize.dialog.title       "Sync Selection">
 <!ENTITY syncCustomize.acceptButton.label "Start">
 
 <!ENTITY syncCustomize.title              "What would you like to synchronise?">
 <!ENTITY syncCustomize.description        "You can change this selection in Options.">
 <!ENTITY syncCustomizeUnix.description    "You can change this selection in Preferences.">
-
 <!--
   These engine names are the same as in browser/preferences/sync.dtd except
   for the last two that are marked as being specific to Desktop browsers.
 -->
+
 <!ENTITY engine.bookmarks.label           "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey       "m">
 <!ENTITY engine.history.label             "History">
 <!ENTITY engine.history.accesskey         "r">
 <!ENTITY engine.tabs.label                "Tabs">
 <!ENTITY engine.tabs.accesskey            "T">
 <!ENTITY engine.passwords.label           "Passwords">
 <!ENTITY engine.passwords.accesskey       "P">
--- a/browser/chrome/browser/syncGenericChange.properties
+++ b/browser/chrome/browser/syncGenericChange.properties
@@ -1,13 +1,13 @@
 # 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 (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
+#LOCALIZATION NOTE (change.password.title): This (and associated change.password/passphrase) are used when the user elects to change their password.
 change.password.title = Change your Password
 change.password.acceptButton = Change Password
 change.password.status.active = Changing your password…
 change.password.status.success = Your password has been changed.
 change.password.status.error = There was an error changing your password.
 
 change.password3.introText = Your password must be at least 8 characters long.  It cannot be the same as either your user name or your Recovery Key.
 change.password.warningText = Note: None of your other devices will be able to connect to your account once you change this password.
--- a/browser/chrome/browser/syncProgress.dtd
+++ b/browser/chrome/browser/syncProgress.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/. -->
 
-<!ENTITY % brandDTD
-    SYSTEM "chrome://branding/locale/brand.dtd">
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     %brandDTD;
+<!-- These strings are used in the sync progress upload page -->
 
-<!-- These strings are used in the sync progress upload page -->
 <!ENTITY syncProgress.pageTitle    "Your First Synchronisation">
 <!ENTITY syncProgress.textBlurb    "Your data is now being encrypted and uploaded in the background. You can close this tab and continue using &brandShortName;.">
 <!ENTITY syncProgress.closeButton  "Close">
 <!ENTITY syncProgress.logoAltText  "&brandShortName; logo">
 <!ENTITY syncProgress.diffText     "&brandShortName; will now automatically synchronise in the background.  You can close this tab and continue using &brandShortName;.">
 
--- a/browser/chrome/browser/syncSetup.dtd
+++ b/browser/chrome/browser/syncSetup.dtd
@@ -1,90 +1,90 @@
 <!-- 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 accountSetupTitle.label    "&syncBrand.fullName.label; Setup">
+<!-- First page of the wizard -->
 
-<!-- First page of the wizard -->
 
 <!ENTITY setup.pickSetupType.description2 "Welcome! If you've never used &syncBrand.fullName.label; before, you will need to create a new account.">
 <!ENTITY button.createNewAccount.label "Create a New Account">
 <!ENTITY button.haveAccount.label      "I Have an Account">
 
 <!ENTITY setup.choicePage.title.label     "Have you used &syncBrand.fullName.label; before?">
 <!ENTITY setup.choicePage.new.label       "I've never used &syncBrand.shortName.label; before">
 <!ENTITY setup.choicePage.existing2.label "I'm already using &syncBrand.shortName.label; on another device">
+<!-- New Account AND Existing Account -->
 
-<!-- New Account AND Existing Account -->
 <!ENTITY server.label               "Server">
 <!ENTITY serverType.default.label      "Default: Mozilla &syncBrand.fullName.label; server">
 <!ENTITY serverType.custom2.label   "Use a custom server…">
 <!ENTITY signIn.account2.label      "Account">
 <!ENTITY signIn.account2.accesskey  "A">
 <!ENTITY signIn.password.label      "Password">
 <!ENTITY signIn.password.accesskey  "P">
 <!ENTITY signIn.recoveryKey.label       "Recovery Key">
 <!ENTITY signIn.recoveryKey.accesskey   "K">
+<!-- New Account Page 1: Basic Account Info -->
 
-<!-- New Account Page 1: Basic Account Info -->
 <!ENTITY setup.newAccountDetailsPage.title.label "Account Details">
 <!ENTITY setup.emailAddress.label     "Email Address">
 <!ENTITY setup.emailAddress.accesskey "E">
 <!ENTITY setup.choosePassword.label      "Choose a Password">
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label     "Confirm Password">
 <!ENTITY setup.confirmPassword.accesskey "m">
 <!ENTITY setup.setupMetro.label     "Synchronise with Windows 8 style &brandShortName;">
 <!ENTITY setup.setupMetro.accesskey "S">
-
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
+
 <!ENTITY setup.tosAgree1.label      "I agree to the">
 <!ENTITY setup.tosAgree1.accesskey  "a">
 <!ENTITY setup.tosLink.label        "Terms of Service">
 <!ENTITY setup.tosAgree2.label      "and the">
 <!ENTITY setup.ppLink.label         "Privacy Policy">
 <!ENTITY setup.tosAgree3.label      "">
 <!ENTITY setup.tosAgree2.accesskey  "">
+<!-- My Recovery Key dialog -->
 
-<!-- My Recovery Key dialog -->
 <!ENTITY setup.newRecoveryKeyPage.title.label "&brandShortName; Cares About Your Privacy">
 <!ENTITY setup.newRecoveryKeyPage.description.label "To ensure your total privacy, all of your data is encrypted prior to being uploaded. The Recovery Key which is necessary to decrypt your data is not uploaded.">
 <!ENTITY recoveryKeyEntry.label        "Your Recovery Key">
 <!ENTITY recoveryKeyEntry.accesskey    "K">
 <!ENTITY syncGenerateNewKey.label  "Generate a new key">
 <!ENTITY recoveryKeyBackup.description "Your Recovery Key is required to access &syncBrand.fullName.label; on other machines. Please create a backup copy. We cannot help you recover your Recovery Key.">
 
 <!ENTITY button.syncKeyBackup.print.label     "Print…">
 <!ENTITY button.syncKeyBackup.print.accesskey "P">
 <!ENTITY button.syncKeyBackup.save.label      "Save…">
 <!ENTITY button.syncKeyBackup.save.accesskey  "S">
+<!-- Existing Account Page 1: Pair a Device (incl. Pair a Device dialog strings) -->
 
-<!-- Existing Account Page 1: Pair a Device (incl. Pair a Device dialog strings) -->
 <!ENTITY pairDevice.title.label             "Pair a Device">
 <!ENTITY addDevice.showMeHow.label          "Show me how.">
 <!ENTITY addDevice.dontHaveDevice.label     "I don't have the device with me">
-<!ENTITY pairDevice.setup.description.label  "To activate, select &#x0022;Pair a Device&#x0022; on your other device.">
+<!ENTITY pairDevice.setup.description.label  "To activate, select &quot;Pair a Device&quot; on your other device.">
 <!ENTITY addDevice.setup.enterCode.label    "Then, enter this code:">
-<!ENTITY pairDevice.dialog.description.label "To activate your new device, select &#x0022;Set Up Sync&#x0022; on the device.">
+<!ENTITY pairDevice.dialog.description.label "To activate your new device, select &quot;Set Up Sync&quot; on the device.">
 <!ENTITY addDevice.dialog.enterCode.label   "Enter the code that the device provides:">
 <!ENTITY addDevice.dialog.tryAgain.label    "Please try again.">
 <!ENTITY addDevice.dialog.successful.label  "The device has been successfully added. The initial synchronisation can take several minutes and will finish in the background.">
 <!ENTITY addDevice.dialog.recoveryKey.label     "To activate your device you will need to enter your Recovery Key. Please print or save this key and take it with you.">
 <!ENTITY addDevice.dialog.connected.label   "Device Connected">
+<!-- Existing Account Page 2: Manual Login -->
 
-<!-- Existing Account Page 2: Manual Login -->
 <!ENTITY setup.signInPage.title.label "Sign In">
-<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &#x0022;My Recovery Key&#x0022; under &#x0022;Manage Account&#x0022;.">
+<!ENTITY existingRecoveryKey.description "You can get a copy of your Recovery Key by going to &syncBrand.shortName.label; Options on your other device, and selecting  &quot;My Recovery Key&quot; under &quot;Manage Account&quot;.">
 <!ENTITY verifying.label              "Verifying…">
 <!ENTITY resetPassword.label          "Reset Password">
 <!ENTITY resetSyncKey.label           "I have lost my other device.">
+<!-- Sync Options -->
 
-<!-- Sync Options -->
 <!ENTITY setup.optionsPage.title      "Sync Options">
 <!ENTITY syncDeviceName.label       "Device Name:">
 <!ENTITY syncDeviceName.accesskey   "c">
 
 <!ENTITY syncMy.label               "Synchronise My">
 <!ENTITY engine.bookmarks.label     "Bookmarks">
 <!ENTITY engine.bookmarks.accesskey "m">
 <!ENTITY engine.tabs.label          "Tabs">
@@ -97,20 +97,20 @@
 <!ENTITY engine.prefs.accesskey     "s">
 <!ENTITY engine.addons.label        "Add-ons">
 <!ENTITY engine.addons.accesskey    "A">
 
 <!ENTITY choice2a.merge.main.label       "Merge this device's data with my &syncBrand.shortName.label; data">
 <!ENTITY choice2.merge.recommended.label "Recommended:">
 <!ENTITY choice2a.client.main.label      "Replace all data on this device with my &syncBrand.shortName.label; data">
 <!ENTITY choice2a.server.main.label      "Replace all other devices with this device's data">
+<!-- Confirm Merge Options -->
 
-<!-- Confirm Merge Options -->
 <!ENTITY setup.optionsConfirmPage.title "Confirm">
 <!ENTITY confirm.merge2.label    "&syncBrand.fullName.label; will now merge all this device's browser data into your Sync account.">
 <!ENTITY confirm.client3.label         "Warning: The following &brandShortName; data on this device will be deleted:">
 <!ENTITY confirm.client2.moreinfo.label "&brandShortName; will then copy your &syncBrand.fullName.label; data to this device.">
 <!ENTITY confirm.server2.label         "Warning: The following devices will be overwritten with your local data:">
+<!-- New & Existing Account: Setup Complete -->
 
-<!-- New & Existing Account: Setup Complete -->
 <!ENTITY setup.successPage.title "Setup Complete">
 <!ENTITY changeOptions.label "You can change this preference by selecting Sync Options below.">
 <!ENTITY continueUsing.label "You may now continue using &brandShortName;.">
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -8,32 +8,32 @@ button.syncOptionsCancel.label = Cancel
 
 invalidEmail.label          = Invalid email address
 serverInvalid.label         = Please enter a valid server URL
 usernameNotAvailable.label  = Already in use
 
 verifying.label = Verifying…
 
 # LOCALIZATION NOTE (additionalClientCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of additional clients (was %S for a short while, use #1 instead, even if both work)
 additionalClientCount.label = and #1 additional device;and #1 additional devices
 # LOCALIZATION NOTE (bookmarksCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of bookmarks (was %S for a short while, use #1 instead, even if both work)
 bookmarksCount.label        = #1 bookmark;#1 bookmarks
 # LOCALIZATION NOTE (historyDaysCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of days (was %S for a short while, use #1 instead, even if both work)
 historyDaysCount.label      = #1 day of history;#1 days of history
 # LOCALIZATION NOTE (passwordsCount.label):
-# Semi-colon list of plural forms. See:
+# Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of passwords (was %S for a short while, use #1 instead, even if both work)
 passwordsCount.label        = #1 password;#1 passwords
 # LOCALIZATION NOTE (addonsCount.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of add-ons, see the link above for forms
 addonsCount.label        = #1 addon;#1 addons
 
--- a/browser/chrome/browser/tabbrowser.dtd
+++ b/browser/chrome/browser/tabbrowser.dtd
@@ -1,5 +1,5 @@
 <!-- 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 closeTab.label             "Close Tab">
+<!ENTITY  closeTab.label         "Close Tab">
--- a/browser/chrome/browser/translation.dtd
+++ b/browser/chrome/browser/translation.dtd
@@ -1,44 +1,44 @@
 <!-- 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 (translation.thisPageIsIn.label,
   -                     translation.translateThisPage.label):
   -  These 2 strings are used to construct a sentence that contains a dropdown
   -  showing the detected language of the current web page.
   -  In en-US it looks like this:
   -    This page is in [detected language] Translate this page?
   -  "detected language" here is a language name coming from the
   -  global/languageNames.properties file; for some locales it may not be in
   -  the correct grammar case to keep the same structure of the original
   -  sentence. -->
+
 <!ENTITY translation.thisPageIsIn.label         "This page is in">
 <!ENTITY translation.translateThisPage.label    "Translate this page?">
 <!ENTITY translation.translate.button           "Translate">
 <!ENTITY translation.notNow.button              "Not Now">
 
 <!ENTITY translation.translatingContent.label   "Translating page content…">
-
 <!-- LOCALIZATION NOTE (translation.translatedFrom.label,
   -                     translation.translatedTo.label,
   -                     translation.translatedToSuffix.label):
   -  These 3 strings are used to construct a sentence that contains 2 dropdowns
   -  showing the source and target language of a translated web page.
   -  In en-US it looks like this:
   -    This page has been translated from [from language] to [to language]
   -  "from language" and "to language" here are language names coming from the
   -  global/languageNames.properties file; for some locales they may not be in
   -  the correct grammar case to keep the same structure of the original
   -  sentence.
   -
   -  translation.translatedToSuffix.label (empty in en-US) is for locales that
   -  need to display some text after the second drop down for the sentence to
   -  be grammatically correct. -->
+
 <!ENTITY translation.translatedFrom.label       "This page has been translated from">
 <!ENTITY translation.translatedTo.label         "to">
 <!ENTITY translation.translatedToSuffix.label   "">
 
 <!ENTITY translation.showOriginal.button        "Show Original">
 <!ENTITY translation.showTranslation.button     "Show Translation">
 
 <!ENTITY translation.errorTranslating.label     "There has been an error translating this page.">
@@ -51,16 +51,16 @@
   -                     translation.options.preferences.accesskey):
   -  The accesskey values used here should not clash with the value used for
   -  translation.options.neverForLanguage.accesskey in translation.properties
   -->
 <!ENTITY translation.options.neverForSite.label "Never translate this site">
 <!ENTITY translation.options.neverForSite.accesskey "e">
 <!ENTITY translation.options.preferences.label  "Translation preferences">
 <!ENTITY translation.options.preferences.accesskey "T">
-
 <!-- LOCALIZATION NOTE (translation.options.attribution.beforeLogo,
   -                     translation.options.attribution.afterLogo):
   -  These 2 strings are displayed before and after a 'Microsoft Translator'
   -  logo.
   -->
+
 <!ENTITY translation.options.attribution.beforeLogo "Translations by">
 <!ENTITY translation.options.attribution.afterLogo "">
--- a/browser/chrome/browser/translation.properties
+++ b/browser/chrome/browser/translation.properties
@@ -1,12 +1,10 @@
 # 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 (translation.options.neverForLanguage.label):
 #  %S is a language name coming from the global/languageNames.properties file.
-translation.options.neverForLanguage.label=Never translate %S
 
 # LOCALIZATION NOTE (translation.options.neverForLanguage.accesskey):
 # The accesskey value used here should not clash with the values used for
 # translation.options.*.accesskey in translation.dtd
-translation.options.neverForLanguage.accesskey=N
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -2,197 +2,161 @@
    - 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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Problem loading page">
 <!ENTITY retry.label "Try Again">
+<!-- Specific error messages -->
 
-<!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Unable to connect">
 <!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
 
 <!ENTITY deniedPortAccess.title "This address is restricted">
 <!ENTITY deniedPortAccess.longDesc "">
 
 <!ENTITY dnsNotFound.title "Server not found">
-<!ENTITY dnsNotFound.longDesc "
-<ul>
-  <li>Check the address for typing errors such as
-    <strong>ww</strong>.example.com instead of
-    <strong>www</strong>.example.com</li>
-  <li>If you are unable to load any pages, check your computer's network
-    connection.</li>
-  <li>If your computer or network is protected by a firewall or proxy, make sure
-    that &brandShortName; is permitted to access the Web.</li>
-</ul>
-">
+<!ENTITY dnsNotFound.longDesc "<ul> 
+<li>Check the address for typing errors such as 
+<strong>ww</strong>.example.com instead of 
+<strong>www</strong>.example.com</li> 
+<li>If you are unable to load any pages, check your computer's network 
+connection.</li> 
+<li>If your computer or network is protected by a firewall or proxy, make sure 
+that &brandShortName; is permitted to access the Web.</li> 
+</ul>">
 
 <!ENTITY fileNotFound.title "File not found">
-<!ENTITY fileNotFound.longDesc "
-<ul>
-  <li>Check the file name for capitalisation or other typing errors.</li>
-  <li>Check to see if the file was moved, renamed or deleted.</li>
-</ul>
-">
+<!ENTITY fileNotFound.longDesc "<ul> 
+<li>Check the file name for capitalisation or other typing errors.</li> 
+<li>Check to see if the file was moved, renamed or deleted.</li> 
+</ul>">
 
 
 <!ENTITY generic.title "Oops.">
-<!ENTITY generic.longDesc "
-<p>&brandShortName; can't load this page for some reason.</p>
-">
+<!ENTITY generic.longDesc "<p>&brandShortName; can't load this page for some reason.</p>">
 
 <!ENTITY malformedURI.title "The address isn't valid">
-<!ENTITY malformedURI.longDesc "
-<ul>
-  <li>Web addresses are usually written like
-    <strong>http://www.example.com/</strong></li>
-  <li>Make sure that you're using forward slashes (i.e.
-    <strong>/</strong>).</li>
-</ul>
-">
+<!ENTITY malformedURI.longDesc "<ul> 
+<li>Web addresses are usually written like 
+<strong>http://www.example.com/</strong></li> 
+<li>Make sure that you're using forward slashes (i.e. 
+<strong>/</strong>).</li> 
+</ul>">
 
 <!ENTITY netInterrupt.title "The connection was interrupted">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
 <!ENTITY notCached.title "Document Expired">
 <!ENTITY notCached.longDesc "<p>The requested document is not available in &brandShortName;'s cache.</p><ul><li>As a security precaution, &brandShortName; 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 "
-<ul>
-  <li>Press &quot;Try Again&quot; to switch to online mode and reload the page.</li>
-</ul>
-">
+<!ENTITY netOffline.longDesc2 "<ul> 
+<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 "
-<ul>
-  <li>Please contact the web site owners to inform them of this problem.</li>
-</ul>
-">
+<!ENTITY contentEncodingError.longDesc "<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 "The connection was reset">
 <!ENTITY netReset.longDesc "&sharedLongDesc;">
 
 <!ENTITY netTimeout.title "The connection has timed out">
 <!ENTITY netTimeout.longDesc "&sharedLongDesc;">
 
 <!ENTITY unknownProtocolFound.title "The address wasn't understood">
-<!ENTITY unknownProtocolFound.longDesc "
-<ul>
-  <li>You might need to install other software to open this address.</li>
-</ul>
-">
+<!ENTITY unknownProtocolFound.longDesc "<ul> 
+<li>You might need to install other software to open this address.</li> 
+</ul>">
 
 <!ENTITY proxyConnectFailure.title "The proxy server is refusing connections">
-<!ENTITY proxyConnectFailure.longDesc "
-<ul>
-  <li>Check the proxy settings to make sure that they are correct.</li>
-  <li>Contact your network administrator to make sure the proxy server is
-    working.</li>
-</ul>
-">
+<!ENTITY proxyConnectFailure.longDesc "<ul> 
+<li>Check the proxy settings to make sure that they are correct.</li> 
+<li>Contact your network administrator to make sure the proxy server is 
+working.</li> 
+</ul>">
 
 <!ENTITY proxyResolveFailure.title "Unable to find the proxy server">
-<!ENTITY proxyResolveFailure.longDesc "
-<ul>
-  <li>Check the proxy settings to make sure that they are correct.</li>
-  <li>Check to make sure your computer has a working network connection.</li>
-  <li>If your computer or network is protected by a firewall or proxy, make sure
-    that &brandShortName; is permitted to access the Web.</li>
-</ul>
-">
+<!ENTITY proxyResolveFailure.longDesc "<ul> 
+<li>Check the proxy settings to make sure that they are correct.</li> 
+<li>Check to make sure your computer has a working network connection.</li> 
+<li>If your computer or network is protected by a firewall or proxy, make sure 
+that &brandShortName; is permitted to access the Web.</li> 
+</ul>">
 
 <!ENTITY redirectLoop.title "The page isn't redirecting properly">
-<!ENTITY redirectLoop.longDesc "
-<ul>
-  <li>This problem can sometimes be caused by disabling or refusing to accept
-    cookies.</li>
-</ul>
-">
+<!ENTITY redirectLoop.longDesc "<ul> 
+<li>This problem can sometimes be caused by disabling or refusing to accept 
+cookies.</li> 
+</ul>">
 
 <!ENTITY unknownSocketType.title "Unexpected response from server">
-<!ENTITY unknownSocketType.longDesc "
-<ul>
-  <li>Check to make sure your system has the Personal Security Manager
-    installed.</li>
-  <li>This might be due to a non-standard configuration on the server.</li>
-</ul>
-">
+<!ENTITY unknownSocketType.longDesc "<ul> 
+<li>Check to make sure your system has the Personal Security Manager 
+installed.</li> 
+<li>This might be due to a non-standard configuration on the server.</li> 
+</ul>">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc2 "
-<ul>
-  <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
-  <li>Please contact the web site owners to inform them of this problem.</li>
-</ul>
-">
+<!ENTITY nssFailure2.longDesc2 "<ul> 
+<li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li> 
+<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 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 sharedLongDesc "
-<ul>
-  <li>The site could be temporarily unavailable or too busy. Try again in a few
-    moments.</li>
-  <li>If you are unable to load any pages, check your computer's network
-    connection.</li>
-  <li>If your computer or network is protected by a firewall or proxy, make sure
-    that &brandShortName; is permitted to access the Web.</li>
-</ul>
-">
+<!ENTITY sharedLongDesc "<ul> 
+<li>The site could be temporarily unavailable or too busy. Try again in a few 
+moments.</li> 
+<li>If you are unable to load any pages, check your computer's network 
+connection.</li> 
+<li>If your computer or network is protected by a firewall or proxy, make sure 
+that &brandShortName; is permitted to access the Web.</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 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 cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; 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 web site 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 web site owners to inform them of this problem.</li></ul>">
 
 
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
 <!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
 <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
-
 <!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
 contents of the <button> tags. It uses strings already defined above. The
 button is included here (instead of netError.xhtml) because it exposes
 functionality specific to firefox. -->
 
-<!ENTITY securityOverride.warningContent "
-<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 
-<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
-<button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
-">
+<!ENTITY securityOverride.warningContent "<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p> 
+ 
+<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button> 
+<button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>">
 
 <!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>">
--- a/browser/chrome/overrides/settingsChange.dtd
+++ b/browser/chrome/overrides/settingsChange.dtd
@@ -1,8 +1,7 @@
-<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# 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  settingsChangePreferences.label  "Settings can be changed using the Applications tab in &brandShortName;'s Preferences.">
-<!ENTITY  settingsChangeOptions.label      "Settings can be changed using the Applications tab in &brandShortName;'s Options.">
+<!-- -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -->
+<!-- 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  settingsChangePreferences.label  "Settings can be changed using the Applications tab in &brandShortName;'s Preferences.">
+<!ENTITY  settingsChangeOptions.label      "Settings can be changed using the Applications tab in &brandShortName;'s Options.">
--- a/browser/crashreporter/crashreporter-override.ini
+++ b/browser/crashreporter/crashreporter-override.ini
@@ -1,9 +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/.
-
-# This file is in the UTF-8 encoding
+; This file is in the UTF-8 encoding
 [Strings]
-# LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
+; LOCALIZATION NOTE (CrashReporterProductErrorText2): The %s is replaced with a string containing detailed information.
 CrashReporterProductErrorText2=Firefox had a problem and crashed. We'll try to restore your tabs and windows when it restarts.\n\nUnfortunately the crash reporter is unable to submit a crash report.\n\nDetails: %s
 CrashReporterDescriptionText2=Firefox had a problem and crashed. We'll try to restore your tabs and windows when it restarts.\n\nTo help us diagnose and fix the problem, you can send us a crash report.
--- a/browser/defines.inc
+++ b/browser/defines.inc
@@ -1,9 +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/.
 #filter emptyLines
 
 #define MOZ_LANGPACK_CREATOR Mark Tyndall
 
 # If non-English locales wish to credit multiple contributors, uncomment this
+
 # variable definition and use the format specified.
+
 #define MOZ_LANGPACK_CONTRIBUTORS <em:contributor>David Bartlett</em:contributor> <em:contributor>Constantine Murenin</em:contributor> <em:contributor>Ian Neal</em:contributor>
 
 #unfilter emptyLines
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -155,9 +155,9 @@ text_annotation_type.alt=[{{type}} Annot
 password_label=Enter the password to open this PDF file.
 password_invalid=Invalid password. Please try again.
 password_ok=OK
 password_cancel=Cancel
 
 printing_not_supported=Warning: Printing is not fully supported by this browser.
 printing_not_ready=Warning: The PDF is not fully loaded for printing.
 web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts.
-document_colors_disabled=PDF documents are not allowed to use their own colours: \'Allow pages to choose their own colours\' is deactivated in the browser.
+document_colors_disabled=PDF documents are not allowed to use their own colours: 'Allow pages to choose their own colours' is deactivated in the browser.
--- a/browser/profile/bookmarks.inc
+++ b/browser/profile/bookmarks.inc
@@ -1,45 +1,91 @@
 # 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/.
 #filter emptyLines
 
 # LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-# your locale code, and link to your translated pages as soon as they're 
+
+# your locale code, and link to your translated pages as soon as they're
+
 # live.
 
+
 #define bookmarks_title Bookmarks
+
+
 #define bookmarks_heading Bookmarks
 
+
 #define bookmarks_toolbarfolder Bookmarks Toolbar Folder
+
+
 #define bookmarks_toolbarfolder_description Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
 
+
 # LOCALIZATION NOTE (getting_started):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/central/
+
+
+# link title for https://www.mozilla.org/en-US/firefox/central/
+
+
 #define getting_started Getting Started
 
+
 # LOCALIZATION NOTE (firefox_heading):
+
+
 # Firefox links folder name
+
+
 #define firefox_heading Mozilla Firefox
 
+
 # LOCALIZATION NOTE (firefox_help):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/help/
+
+
+# link title for https://www.mozilla.org/en-US/firefox/help/
+
+
 #define firefox_help Help and Tutorials
 
+
 # LOCALIZATION NOTE (firefox_customize):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/customize/
+
+
+# link title for https://www.mozilla.org/en-US/firefox/customize/
+
+
 #define firefox_customize Customise Firefox
 
+
 # LOCALIZATION NOTE (firefox_community):
-# link title for http://en-US.www.mozilla.com/en-US/firefox/community/
+
+
+# link title for https://www.mozilla.org/en-US/contribute/
+
+
 #define firefox_community Get Involved
 
+
 # LOCALIZATION NOTE (firefox_about):
-# link title for http://en-US.www.mozilla.com/en-US/about/
+
+
+# link title for https://www.mozilla.org/en-US/about/
+
+
 #define firefox_about About Us
 
+
 # LOCALIZATION NOTE (firefox_feedback):
+
+
 # link title for browser feedback page
+
+
 # currently used by Metro only: https://input.mozilla.org/feedback/metrofirefox
+
+
 #define firefox_feedback Give Feedback
 
+
 #unfilter emptyLines
--- a/browser/profile/chrome/userContent-example.css
+++ b/browser/profile/chrome/userContent-example.css
@@ -9,23 +9,16 @@
 
 /*
  * This file can be used to apply a style to all web pages you view
  * Rules without !important are overruled by author rules if the
  * author sets any.  Rules with !important overrule author rules.
  */
 
 /*
- * example: turn off "blink" element blinking
- *
- * blink { text-decoration: none ! important; }
- *
- */
-
-/*
  * example: give all tables a 2px border
  *
  * table { border: 2px solid; }
  */
 
 /*
  * example: turn off "marquee" element
  *
--- a/browser/updater/updater.ini
+++ b/browser/updater/updater.ini
@@ -1,9 +1,9 @@
 ; 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/.
-
 ; This file is in the UTF-8 encoding
+; All strings must be less than 600 chars.
 [Strings]
 TitleText=%MOZ_APP_DISPLAYNAME% Update
 InfoText=%MOZ_APP_DISPLAYNAME% is installing your updates and will start in a few moments…
 MozillaMaintenanceDescription=The Mozilla Maintenance Service ensures that you have the latest and most secure version of Mozilla Firefox on your computer. Keeping Firefox up to date is very important for your online security, and Mozilla strongly recommends that you keep this service enabled.
--- a/dom/chrome/accessibility/AccessFu.properties
+++ b/dom/chrome/accessibility/AccessFu.properties
@@ -92,17 +92,17 @@ listStart      =       First item
 listEnd        =       Last item
 # LOCALIZATION NOTE (listItemsCount): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 listItemsCount =       1 item;#1 items
 
 # LOCALIZATION NOTE: # %1$S is the position of the item n the set.
 # %2$S is the total number of such items in the set.
 # An expanded example would read "2 of 5".
-objItemOfN     =       %1$S of %2$S
+objItemOfN      =       %1$S of %2$S
 
 # Landmark announcements
 banner         =       banner
 complementary  =       complementary
 contentinfo    =       content info
 main           =       main
 navigation     =       navigation
 search         =       search
--- a/dom/chrome/layout/HtmlForm.properties
+++ b/dom/chrome/layout/HtmlForm.properties
@@ -23,15 +23,16 @@ NoFileSelected=No file selected.
 # LOCALIZATION NOTE (NoFilesSelected): this string is shown on a
 # <input type='file' multiple> when there is no file selected yet.
 NoFilesSelected=No files selected.
 # LOCALIZATION NOTE (XFilesSelected): this string is shown on a
 # <input type='file' multiple> when there are more than one selected file.
 # %S will be a number greater or equal to 2.
 XFilesSelected=%S files selected.
 ColorPicker=Choose a colour
+# LOCALIZATION NOTE (AndNMoreFiles): Semi-colon list of plural forms. 
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals 
 # This string is shown at the end of the tooltip text for <input type='file'
 # multiple> when there are more than 21 files selected (when we will only list
 # the first 20, plus an "and X more" line). #1 represents the number of files
 # minus 20 and will always be a number equal to or greater than 2. So the
 # singular case will never be used.
 AndNMoreFiles=and one more;and #1 more
--- a/dom/chrome/layout/MediaDocument.properties
+++ b/dom/chrome/layout/MediaDocument.properties
@@ -3,19 +3,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #LOCALIZATION NOTE (ImageTitleWithDimensions2AndFile): first %S is filename, second %S is type, third %S is width and fourth %S is height
 #LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename, second %S is type
 #LOCALIZATION NOTE (ImageTitleWithDimensions2): first %S is type, second %S is width and third %S is height
 #LOCALIZATION NOTE (ImageTitleWithNeitherDimensionsNorFile): first %S is type
 #LOCALIZATION NOTE (MediaTitleWithFile): first %S is filename, second %S is type
 #LOCALIZATION NOTE (MediaTitleWithNoInfo): first %S is type
-ImageTitleWithDimensions2AndFile=%S (%S Image, %S\u00A0\u00D7\u00A0%S pixels)
+ImageTitleWithDimensions2AndFile=%S (%S Image, %S × %S pixels)
 ImageTitleWithoutDimensions=%S (%S Image)
-ImageTitleWithDimensions2=(%S Image, %S\u00A0\u00D7\u00A0%S pixels)
+ImageTitleWithDimensions2=(%S Image, %S × %S pixels)
 ImageTitleWithNeitherDimensionsNorFile=(%S Image)
 MediaTitleWithFile=%S (%S Object)
 MediaTitleWithNoInfo=(%S Object)
 
-InvalidImage=The image \u201c%S\u201d cannot be displayed, because it contains errors.
+InvalidImage=The image “%S” cannot be displayed, because it contains errors.
 ScaledImage=Scaled (%S%%)
 
 TitleWithStatus=%S - %S
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -11,17 +11,17 @@ EncLateMeta=The character encoding decla
 EncLateMetaReload=The page was reloaded, because the character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncLateMetaTooLate=The character encoding declaration of document was found too late for it to take effect. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncMetaUnsupported=An unsupported character encoding was declared for the HTML document using a meta tag. The declaration was ignored.
 EncProtocolUnsupported=An unsupported character encoding was declared on the transfer protocol level. The declaration was ignored.
 EncBomlessUtf16=Detected UTF-16-encoded Basic Latin-only text without a byte order mark and without a transfer protocol-level declaration. Encoding this content in UTF-16 is inefficient and the character encoding should have been declared in any case.
 EncMetaUtf16=A meta tag was used to declare the character encoding as UTF-16. This was interpreted as an UTF-8 declaration instead.
 EncMetaUserDefined=A meta tag was used to declare the character encoding as x-user-defined. This was interpreted as a windows-1252 declaration instead for compatibility with intentionally mis-encoded legacy fonts. This site should migrate to Unicode.
 
-# The bulk of the messages in this file are derived from 
+# The bulk of the messages below are derived from 
 # http://hg.mozilla.org/projects/htmlparser/file/1f633cef7de7/src/nu/validator/htmlparser/impl/ErrorReportingTokenizer.java
 # which is available under the MIT license.
 
 # Tokenizer errors
 errGarbageAfterLtSlash=Garbage after “</”.
 errLtSlashGt=Saw “</>”. Probable causes: Unescaped “<” (escape as “&lt;”) or mistyped end tag.
 errCharRefLacksSemicolon=Character reference was not terminated by a semicolon.
 errNoDigitsInNCR=No digits in numeric character reference.
--- a/dom/chrome/layout/printing.properties
+++ b/dom/chrome/layout/printing.properties
@@ -1,20 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Page number formating
+# Page number formatting
 ## @page_number The current page number
 #LOCALIZATION NOTE (pageofpages): Do not translate %ld in the following line.
 # Place the word %ld where the page number and number of pages should be
 # The first %ld will receive the the page number
 pagenumber=%1$d
 
-# Page number formating
+# Page number formatting
 ## @page_number The current page number
 ## @page_total The total number of pages
 #LOCALIZATION NOTE (pageofpages): Do not translate %ld in the following line.
 # Place the word %ld where the page number and number of pages should be
 # The first %ld will receive the the page number
 # the second %ld will receive the total number of pages
 pageofpages=%1$d of %2$d
 
--- a/dom/chrome/layout/xmlparser.properties
+++ b/dom/chrome/layout/xmlparser.properties
@@ -1,48 +1,48 @@
-# 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/.
-
-# Map Expat error codes to error strings
-1 = out of memory
-2 = syntax error
-3 = no element found
-4 = not well-formed
-5 = unclosed token
-6 = partial character
-7 = mismatched tag
-8 = duplicate attribute
-9 = junk after document element
-10 = illegal parameter entity reference
-11 = undefined entity
-12 = recursive entity reference
-13 = asynchronous entity
-14 = reference to invalid character number
-15 = reference to binary entity
-16 = reference to external entity in attribute
-17 = XML or text declaration not at start of entity
-18 = unknown encoding
-19 = encoding specified in XML declaration is incorrect
-20 = unclosed CDATA section
-21 = error in processing external entity reference
-22 = document is not standalone
-23 = unexpected parser state
-24 = entity declared in parameter entity
-27 = prefix not bound to a namespace
-28 = must not undeclare prefix
-29 = incomplete markup in parameter entity
-30 = XML declaration not well-formed
-31 = text declaration not well-formed
-32 = illegal character(s) in public id
-38 = reserved prefix (xml) must not be undeclared or bound to another namespace name
-39 = reserved prefix (xmlns) must not be declared or undeclared
-40 = prefix must not be bound to one of the reserved namespace names
-
-# %1$S is replaced by the Expat error string, may be followed by Expected (see below)
-# %2$S is replaced by URL
-# %3$u is replaced by line number
-# %4$u is replaced by column number
-XMLParsingError = XML Parsing Error: %1$S\nLocation: %2$S\nLine Number %3$u, Column %4$u:
-
-# %S is replaced by a tag name.
-# This gets appended to the error string if the error is mismatched tag.
-Expected = . Expected: </%S>.
+# 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/.
+
+# Map Expat error codes to error strings
+1 = out of memory
+2 = syntax error
+3 = no element found
+4 = not well-formed
+5 = unclosed token
+6 = partial character
+7 = mismatched tag
+8 = duplicate attribute
+9 = junk after document element
+10 = illegal parameter entity reference
+11 = undefined entity
+12 = recursive entity reference
+13 = asynchronous entity
+14 = reference to invalid character number
+15 = reference to binary entity
+16 = reference to external entity in attribute
+17 = XML or text declaration not at start of entity
+18 = unknown encoding
+19 = encoding specified in XML declaration is incorrect
+20 = unclosed CDATA section
+21 = error in processing external entity reference
+22 = document is not standalone
+23 = unexpected parser state
+24 = entity declared in parameter entity
+27 = prefix not bound to a namespace
+28 = must not undeclare prefix
+29 = incomplete markup in parameter entity
+30 = XML declaration not well-formed
+31 = text declaration not well-formed
+32 = illegal character(s) in public id
+38 = reserved prefix (xml) must not be undeclared or bound to another namespace name
+39 = reserved prefix (xmlns) must not be declared or undeclared
+40 = prefix must not be bound to one of the reserved namespace names
+
+# %1$S is replaced by the Expat error string, may be followed by Expected (see below)
+# %2$S is replaced by URL
+# %3$u is replaced by line number
+# %4$u is replaced by column number
+XMLParsingError = XML Parsing Error: %1$S\nLocation: %2$S\nLine Number %3$u, Column %4$u:
+
+# %S is replaced by a tag name.
+# This gets appended to the error string if the error is mismatched tag.
+Expected = . Expected: </%S>.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -1,178 +1,162 @@
 <!-- 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 -->
 
-<!-- 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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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>
+<!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 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 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 cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspFrameAncestorBlocked.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>
+<!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/netErrorApp.dtd
+++ b/dom/chrome/netErrorApp.dtd
@@ -1,13 +1,11 @@
 <!-- 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/. -->
-
 <!-- Error messages that are likely to be overridden by applications go in this
      file, all messages that likely don't need to tie into app-specific UI
      should go into netError.dtd -->
 
+
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
-<!ENTITY securityOverride.warningContent "
-<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
-<p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
-">
+<!ENTITY securityOverride.warningContent "<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p> 
+<p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>">
--- a/dom/chrome/security/csp.properties
+++ b/dom/chrome/security/csp.properties
@@ -15,49 +15,34 @@ CSPViolationWithURI = The page's setting
 CSPROViolation = A violation occurred for a report-only CSP policy ("%1$S"). The behaviour was allowed, and a CSP report was sent.
 # LOCALIZATION NOTE (CSPROViolationWithURI):
 # %1$S is the directive that has been violated.
 # %2$S is the URI of the resource which violated the directive.
 CSPROViolationWithURI = The page's settings observed the loading of a resource at %2$S ("%1$S"). A CSP report is being sent.
 # LOCALIZATION NOTE (triedToSendReport):
 # %1$S is the URI we attempted to send a report to.
 triedToSendReport = Tried to send report to invalid URI: "%1$S"
-# LOCALIZATION NOTE (errorWas):
-# %1$S is the error resulting from attempting to send the report
-errorWas = error was: "%1$S"
 # LOCALIZATION NOTE (couldNotParseReportURI):
 # %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 (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 (pageCannotSendReportsTo):
-# %1$S is the URI of the page with the policy
-# %2$S is the report URI that could not be used
-pageCannotSendReportsTo = page on %1$S cannot send reports to %2$S
-allowOrDefaultSrcRequired = 'allow' or 'default-src' directive required but not present.  Reverting to "default-src 'none'"
 # LOCALIZATION NOTE (failedToParseUnrecognizedSource):
 # %1$S is the CSP Source that could not be parsed
 failedToParseUnrecognizedSource = Failed to parse unrecognised source %1$S
-# LOCALIZATION NOTE (reportPostRedirect):
-# %1$S is the specified report URI before redirect
-reportPostRedirect = Post of violation report to %1$S failed, as a redirect occurred
-# LOCALIZATION NOTE (allowDirectiveIsDeprecated):
-# Don't translate "allow" and "default-src" as they are keywords and part of
-# the CSP protocol syntax.
-allowDirectiveIsDeprecated = allow directive is deprecated, use the equivalent default-src directive instead
 # LOCALIZATION NOTE (inlineScriptBlocked):
 # inline script refers to JavaScript code that is embedded into the HTML document.
 inlineScriptBlocked = An attempt to execute inline scripts has been blocked
 # LOCALIZATION NOTE (inlineStyleBlocked):
 # inline style refers to CSS code that is embedded into the HTML document.
 inlineStyleBlocked = An attempt to apply inline style sheets has been blocked
 # LOCALIZATION NOTE (scriptFromStringBlocked):
 # eval is a name and should not be localized.
@@ -65,68 +50,23 @@ scriptFromStringBlocked = An attempt to 
 # LOCALIZATION NOTE (hostNameMightBeKeyword):
 # %1$S is the hostname in question and %2$S is the keyword
 hostNameMightBeKeyword = Interpreting %1$S as a hostname, not a keyword. If you intended this to be a keyword, use '%2$S' (wrapped in single quotes).
 # LOCALIZATION NOTE (notSupportingDirective):
 # directive is not supported (e.g. 'reflected-xss')
 notSupportingDirective = Not supporting directive '%1$S'. Directive and values will be ignored.
 
 # CSP Errors:
-policyURINotAlone = policy-uri directive can only appear alone
-noParentRequest = The policy-uri cannot be fetched without a parent request and a CSP.
-# LOCALIZATION NOTE (policyURIParseError):
-# %1$S is the URI that could not be parsed
-policyURIParseError = could not parse URI in policy URI: %1$S
-# LOCALIZATION NOTE (nonMatchingHost):
-# %1$S is the URI host that does not match
-nonMatchingHost = can't fetch policy uri from non-matching hostname: %1$S
-# LOCALIZATION NOTE (nonMatchingPort):
-# %1$S is the URI port that does not match
-nonMatchingPort = can't fetch policy uri from non-matching port: %1$S
-# LOCALIZATION NOTE (nonMatchingScheme):
-# %1$S is the URI scheme that does not match
-nonMatchingScheme = can't fetch policy uri from non-matching scheme: %1$S
-# LOCALIZATION NOTE (errorFetchingPolicy):
-# %1$S is the error that caused fetching to fail
-errorFetchingPolicy = Error fetching policy-uri: %1$S
-cspSourceNotURI = Provided argument is not an nsIURI
-argumentIsNotString = Provided argument is not a string
-selfDataNotProvided = Can't use 'self' if self data is not provided
-# LOCALIZATION NOTE (uriWithoutScheme):
-# %1$S is the URI without a scheme
-uriWithoutScheme = can't parse a URI without a scheme: %1$S
-selfKeywordNoSelfData = self keyword used, but no self data specified
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
 couldntParseInvalidSource = Couldn't parse invalid source %1$S
-# LOCALIZATION NOTE (hostSourceWithoutData):
-# %1$S is the source
-hostSourceWithoutData = Can't create host-only source %1$S without 'self' data
-# LOCALIZATION NOTE (sourceWithoutData):
-# %1$S is the source
-sourceWithoutData = Can't create source %1$S without 'self' data
 # LOCALIZATION NOTE (couldntParseInvalidHost):
 # %1$S is the host that's invalid
 couldntParseInvalidHost = Couldn't parse invalid host %1$S
 # LOCALIZATION NOTE (couldntParseScheme):
 # %1$S is the string source
 couldntParseScheme = Couldn't parse scheme in %1$S
 # LOCALIZATION NOTE (couldntParsePort):
 # %1$S is the string source
 couldntParsePort = Couldn't parse port in %1$S
-# LOCALIZATION NOTE (notIntersectPort):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectPort = Could not intersect %1$S with %2$S due to port problems.
-# LOCALIZATION NOTE (notIntersectScheme):
-# %1$S is one source we tried to intersect
-# %2$S is the other
-notIntersectScheme = Could not intersect %1$S with %2$S due to scheme problems.
-# LOCALIZATION NOTE (intersectingSourceWithUndefinedHost):
-# %1$S is the source
-intersectingSourceWithUndefinedHost = intersecting source with undefined host: %1$S
-# LOCALIZATION NOTE (intersectingSourcesWithUndefinedHosts):
-# %1$S is the first source
-# %2$S is the second source
-intersectingSourcesWithUndefinedHosts = intersecting two sources with undefined hosts: %1$S and %2$S
 # LOCALIZATION NOTE (duplicateDirective):
 # %1$S is the name of the duplicate directive
 duplicateDirective = Duplicate %1$S directives detected.  All but the first instance will be ignored.
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -3,13 +3,15 @@
 BlockMixedDisplayContent = Blocked loading mixed display content "%1$S"
 BlockMixedActiveContent = Blocked loading mixed active content "%1$S"
 
 # CORS
 CrossSiteRequestBlocked=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. This can be fixed by moving the resource to the same domain or enabling CORS.
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security" or "HSTS"
 InvalidSTSHeaders=The site specified an invalid Strict-Transport-Security header.
+# LOCALIZATION NOTE: Do not translate "Public-Key-Pins or HPKP"
 InsecurePasswordsPresentOnPage=Password fields present on an insecure (http://) page. This is a security risk that allows user login credentials to be stolen.
 InsecureFormActionPasswordsPresent=Password fields present in a form with an insecure (http://) form action. This is a security risk that allows user login credentials to be stolen.
 InsecurePasswordsPresentOnIframe=Password fields present on an insecure (http://) iframe. This is a security risk that allows user login credentials to be stolen.
 LoadingMixedActiveContent=Loading mixed (insecure) active content on a secure page "%1$S"
 LoadingMixedDisplayContent=Loading mixed (insecure) display content on a secure page "%1$S"
+# LOCALIZATION NOTE: Do not translate "allow-scripts", "allow-same-origin", "sandbox" or "iframe"
--- a/dom/chrome/svg/svg.properties
+++ b/dom/chrome/svg/svg.properties
@@ -1,5 +1,5 @@
-# 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/.
-
-AttributeParseWarning=Unexpected value %2$S parsing %1$S attribute.
+# 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/.
+
+AttributeParseWarning=Unexpected value %2$S parsing %1$S attribute.
--- a/dom/chrome/xml/prettyprint.dtd
+++ b/dom/chrome/xml/prettyprint.dtd
@@ -1,5 +1,5 @@
-<!-- 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 xml.nostylesheet "This XML file does not appear to have any style information associated with it. The document tree is shown below.">
+<!-- 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 xml.nostylesheet "This XML file does not appear to have any style information associated with it. The document tree is shown below.">
--- a/dom/chrome/xslt/xslt.properties
+++ b/dom/chrome/xslt/xslt.properties
@@ -1,38 +1,38 @@
-# 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/.
-
-1  = Parsing an XSLT stylesheet failed.
-2  = Parsing an XPath expression failed.
-3  = 
-4  = XSLT transformation failed.
-5  = Invalid XSLT/XPath function.
-6  = XSLT Stylesheet (possibly) contains a recursion.
-7  = Attribute value illegal in XSLT 1.0.
-8  = An XPath expression was expected to return a NodeSet.
-9  = XSLT transformation was terminated by <xsl:message>.
-10 = A network error occurred loading an XSLT stylesheet:
-11 = An XSLT stylesheet does not have an XML mimetype:
-12 = An XSLT stylesheet directly or indirectly imports or includes itself:
-13 = An XPath function was called with the wrong number of arguments.
-14 = An unknown XPath extension function was called.
-15 = XPath parse failure: ')' expected:
-16 = XPath parse failure: invalid axis:
-17 = XPath parse failure: Name or Nodetype test expected:
-18 = XPath parse failure: ']' expected:
-19 = XPath parse failure: invalid variable name:
-20 = XPath parse failure: unexpected end of expression:
-21 = XPath parse failure: operator expected:
-22 = XPath parse failure: unclosed literal:
-23 = XPath parse failure: ':' unexpected:
-24 = XPath parse failure: '!' unexpected, negation is not():
-25 = XPath parse failure: illegal character found:
-26 = XPath parse failure: binary operator expected:
-27 = An XSLT stylesheet load was blocked for security reasons.
-28 = Evaluating an invalid expression.
-29 = Unbalanced curly brace.
-30 = Creating an element with an invalid QName.
-31 = Variable binding shadows variable binding within the same template.
-
-LoadingError = Error loading stylesheet: %S
-TransformError = Error during XSLT transformation: %S
+# 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/.
+
+1  = Parsing an XSLT stylesheet failed.
+2  = Parsing an XPath expression failed.
+3  = 
+4  = XSLT transformation failed.
+5  = Invalid XSLT/XPath function.
+6  = XSLT Stylesheet (possibly) contains a recursion.
+7  = Attribute value illegal in XSLT 1.0.
+8  = An XPath expression was expected to return a NodeSet.
+9  = XSLT transformation was terminated by <xsl:message>.
+10 = A network error occurred loading an XSLT stylesheet:
+11 = An XSLT stylesheet does not have an XML mimetype:
+12 = An XSLT stylesheet directly or indirectly imports or includes itself:
+13 = An XPath function was called with the wrong number of arguments.
+14 = An unknown XPath extension function was called.
+15 = XPath parse failure: ')' expected:
+16 = XPath parse failure: invalid axis:
+17 = XPath parse failure: Name or Nodetype test expected:
+18 = XPath parse failure: ']' expected:
+19 = XPath parse failure: invalid variable name:
+20 = XPath parse failure: unexpected end of expression:
+21 = XPath parse failure: operator expected:
+22 = XPath parse failure: unclosed literal:
+23 = XPath parse failure: ':' unexpected:
+24 = XPath parse failure: '!' unexpected, negation is not():
+25 = XPath parse failure: illegal character found:
+26 = XPath parse failure: binary operator expected:
+27 = An XSLT stylesheet load was blocked for security reasons.
+28 = Evaluating an invalid expression.
+29 = Unbalanced curly brace.
+30 = Creating an element with an invalid QName.
+31 = Variable binding shadows variable binding within the same template.
+
+LoadingError = Error loading stylesheet: %S
+TransformError = Error during XSLT transformation: %S
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -8,17 +8,17 @@
 #SendingRequestTo=Sending request to 
 #TransferringDataFrom=Transferring data from 
 
 3=Looking up %1$S…
 4=Connected to %1$S…
 5=Sending request to %1$S…
 6=Transferring data from %1$S…
 7=Connecting to %1$S…
-8=Read %1$S 
+8=Read %1$S\u0020
 9=Wrote %1$S
 10=Waiting for %1$S…
 11=Looked up %1$S…
 
 27=Beginning FTP transaction…
 28=Finished FTP transaction
 
 UnsupportedFTPServer=The FTP server %1$S is currently unsupported.
@@ -26,14 +26,15 @@ RepostFormData=This web page is being re
 
 # Directory listing strings
 DirTitle=Index of %1$S
 DirGoUp=Up to higher level directory
 ShowHidden=Show hidden objects
 DirColName=Name
 DirColSize=Size
 DirColMTime=Last Modified
-DirFileLabel=File: 
+DirFileLabel=File:\u0020
 
 PhishingAuth=You are about to visit "%1$S". This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
 PhishingAuthAccept=I understand and will be very careful
 SuperfluousAuth=You are about to log in to the site "%1$S" with the user name "%2$S", but the web site does not require authentication. This may be an attempt to trick you.\n\nIs "%1$S" the site you want to visit?
 AutomaticAuth=You are about to log in to the site "%1$S" with the user name "%2$S".
+
--- a/security/manager/chrome/pipnss/nsserrors.properties
+++ b/security/manager/chrome/pipnss/nsserrors.properties
@@ -106,20 +106,20 @@ SSL_ERROR_INTERNAL_ERROR_ALERT=Peer repo
 SSL_ERROR_USER_CANCELED_ALERT=Peer user cancelled handshake.
 SSL_ERROR_NO_RENEGOTIATION_ALERT=Peer does not permit renegotiation of SSL security parameters.
 SSL_ERROR_SERVER_CACHE_NOT_CONFIGURED=SSL server cache not configured and not disabled for this socket.
 SSL_ERROR_UNSUPPORTED_EXTENSION_ALERT=SSL peer does not support requested TLS hello extension.
 SSL_ERROR_CERTIFICATE_UNOBTAINABLE_ALERT=SSL peer could not obtain your certificate from the supplied URL.
 SSL_ERROR_UNRECOGNIZED_NAME_ALERT=SSL peer has no certificate for the requested DNS name.
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=SSL peer was unable to get an OCSP response for its certificate.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=SSL peer reported bad certificate hash value.
-SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.                             
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.                                
-SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.                                        
-SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.                                                    
+SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL received an unexpected New Session Ticket handshake message.                            \u0020
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL received a malformed New Session Ticket handshake message.                               \u0020
+SSL_ERROR_DECOMPRESSION_FAILURE=SSL received a compressed record that could not be decompressed.                                       \u0020
+SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegotiation is not allowed on this SSL socket.                                                   \u0020
 SSL_ERROR_UNSAFE_NEGOTIATION=Peer attempted old style (potentially vulnerable) handshake.
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL received an unexpected uncompressed record.
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL received a weak ephemeral Diffie-Hellman key in Server Key Exchange handshake message.
 SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL received invalid NPN extension data.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=SSL feature not supported for SSL 2.0 connections.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=SSL feature not supported for servers.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=SSL feature not supported for clients.
 SEC_ERROR_IO=An I/O error occurred during security authorisation.
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -1,63 +1,63 @@
 <!-- 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/. -->
+<!-- Values for changepassword.xul -->
 
-<!-- Values for changepassword.xul -->
 <!ENTITY setPassword.title  "Change Master Password">
 <!ENTITY setPassword.tokenName.label "Security Device">
 <!ENTITY setPassword.oldPassword.label "Current password:">
 <!ENTITY setPassword.newPassword.label "New password:">
 <!ENTITY setPassword.reenterPassword.label "New password (again):">
 <!ENTITY setPassword.meter.label "Password quality meter">
 <!ENTITY setPassword.meter.loading "Loading">
+<!-- Values for resetpassword.xul -->
 
-<!-- Values for resetpassword.xul -->
 <!ENTITY resetPasswordButtonLabel "Reset">
 <!ENTITY resetPassword.title  "Reset Master Password">
 <!ENTITY resetPassword.text  "If you reset your master password, all your stored web and email passwords, form data, personal certificates, and private keys will be forgotten. Are you sure you want to reset your master password?">
+<!-- Values for getpassword.xul -->
 
-<!-- Values for getpassword.xul -->
 <!ENTITY getPassword.title  "Enter Master Password">
 <!ENTITY getPassword.tokenName2.label "Security Device:">
 <!ENTITY getPassword.password.label "Password:">
+<!-- These should be common -->
 
-<!-- These should be common -->
 <!ENTITY piperror.title "Error">
 <!ENTITY pipalert.title "Error - cannot recover">
+<!-- Prefs panel strings -->
 
-<!-- Prefs panel strings -->
 <!ENTITY pref.security.general.lHeader "Security">
 <!ENTITY pref.security.general.rHeader "Settings for general security">
 <!ENTITY pref.security.general.header "Settings for general security">
 <!ENTITY pref.security.general.level.title "Security Level">
 <!ENTITY pref.security.general.paranoid.label "Use paranoid security settings">
 <!ENTITY pref.security.general.certificates.title "Certificates">
 <!ENTITY pref.security.general.manageCert.label "Manage Certificates">
+<!-- Downloading a cert -->
 
-<!-- Downloading a cert -->
 <!ENTITY downloadCert.title "Downloading Certificate">
 <!ENTITY downloadCert.message1 "You have been asked to trust a new Certificate Authority (CA).">
 <!ENTITY downloadCert.trustSSL "Trust this CA to identify web sites.">
 <!ENTITY downloadCert.trustEmail "Trust this CA to identify email users.">
 <!ENTITY downloadCert.trustObjSign "Trust this CA to identify software developers.">
 <!ENTITY downloadCert.message3 "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available).">
 <!ENTITY downloadCert.viewCert.label "View">
 <!ENTITY downloadCert.viewPolicy.label "Policy">
 <!ENTITY downloadCert.viewCert.text "Examine CA certificate">
 <!ENTITY downloadCert.viewPolicy.text "Examine CA policies and procedures">
+<!-- Strings for the SSL client auth ask dialog -->
 
-<!-- Strings for the SSL client auth ask dialog -->
 <!ENTITY clientAuthAsk.title "User Identification Request">
 <!ENTITY clientAuthAsk.message1 "This site has requested that you identify yourself with a certificate:">
 <!ENTITY clientAuthAsk.message2 "Choose a certificate to present as identification:">
 <!ENTITY clientAuthAsk.message3 "Details of selected certificate:">
+<!-- Strings for the cert picker dialog -->
 
-<!-- Strings for the cert picker dialog -->
 <!ENTITY certPicker.title "Select Certificate">
 <!ENTITY certPicker.info  "Certificate:">
 <!ENTITY certPicker.detailsLabel "Details of selected certificate:">
 
 <!ENTITY pkcs12.setpassword.title  "Choose a Certificate Backup Password">
 <!ENTITY pkcs12.setpassword.message  "The certificate backup password you set here protects the backup file that you are about to create.  You must set this password to proceed with the backup.">
 <!ENTITY pkcs12.setpassword.label1 "Certificate backup password:">
 <!ENTITY pkcs12.setpassword.label2 "Certificate backup password (again):">
@@ -70,18 +70,18 @@
 <!ENTITY chooseToken.message1 "Please choose a token.">
 
 <!ENTITY escrowWarn.title "Encryption Key Copy">
 <!ENTITY escrowWarn.message1 "Important: This certificate authority has asked to make a backup of your encryption private key.">
 <!ENTITY escrowWarn.benefit1 "The benefit is that if you lose access to your encryption private key, you can request a copy from this certificate authority.">
 <!ENTITY escrowWarn.message2 "However, your encryption private key will be stored by the certificate authority, and could be used to read your encrypted email or documents without your permission.">
 <!ENTITY examineCert.label "View Certificate">
 <!ENTITY examineCert.accesskey "V">
+<!-- Strings for the CreateCertInfo dialog  -->
 
-<!-- Strings for the CreateCertInfo dialog  -->
 <!ENTITY createCertInfo.title "Generating A Private Key">
 <!ENTITY createCertInfo.msg1 "Key Generation in progress… This may take a few minutes…">
 <!ENTITY createCertInfo.msg2 "Please wait…">
+<!-- Strings for protectedAuth dialog -->
 
-<!-- Strings for protectedAuth dialog -->
 <!ENTITY protectedAuth.title "Protected Token Authentication">
 <!ENTITY protectedAuth.msg "Please authenticate to the token. Authentication method depends on the type of your token.">
 <!ENTITY protectedAuth.tokenName.label "Token:">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -66,17 +66,17 @@ clientAuthMessage2=Issued Under: "%S"
 
 #Page Info
 pageInfo_SiteNotVerified=Web Site Identity Not Verified
 pageInfo_WebSiteVerified=Web Site Identity Verified
 pageInfo_Identity_Verified=The web site %S supports authentication for the page you are viewing. The identity of this web site has been verified by %S, a certificate authority you trust for this purpose.
 pageInfo_ViewCertificate=View the security certificate that verifies this web site's identity.
 pageInfo_NoEncryption=Connection Not Encrypted
 pageInfo_Privacy_None1=The web site %S does not support encryption for the page you are viewing.
-pageInfo_Privacy_None2=Information sent over the Internet without encryption can be seen by other people while it is in transit. 
+pageInfo_Privacy_None2=Information sent over the Internet without encryption can be seen by other people while it is in transit.\u0020
 pageInfo_Privacy_None3=The page you are viewing is not encrypted.
 # LOCALIZATION NOTE (pageInfo_StrongEncryptionWithBits): %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 pageInfo_StrongEncryptionWithBits=Connection Encrypted: High-grade Encryption (%1$S, %2$S bit keys)
 pageInfo_Privacy_Strong1=The page you are viewing was encrypted before being transmitted over the Internet.
 pageInfo_Privacy_Strong2=Encryption makes it very difficult for unauthorized people to view information traveling between computers. It is therefore very unlikely that anyone read this page as it traveled across the network.
 # LOCALIZATION NOTE (pageInfo_WeakEncryptionWithBits): %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
@@ -93,17 +93,17 @@ unknownIssuer=<Unknown Issuer>
 
 escrowFinalMessage=You should click OK only if you trust "%S" to protect your encryption private key.
 
 #Token Manager
 password_not_set=(not set)
 failed_pw_change=Unable to change Master Password.
 incorrect_pw=You did not enter the correct current Master Password. Please try again.
 pw_change_ok=Master Password successfully changed.
-pw_erased_ok=Warning! You have deleted your Master Password. 
+pw_erased_ok=Warning! You have deleted your Master Password.\u0020
 pw_not_wanted=Warning! You have decided not to use a Master Password.
 pw_empty_warning=Your stored web and email passwords, form data, and private keys will not be protected.
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
 login_failed=Failed to Login
 loadPK11TokenDialog=Choose a PKCS#11 device to load
 devinfo_modname=Module
 devinfo_modpath=Path
 devinfo_label=Label
--- a/services/sync/errors.properties
+++ b/services/sync/errors.properties
@@ -5,17 +5,17 @@
 error.login.reason.network      = Failed to connect to the server
 error.login.reason.recoverykey  = Wrong Recovery Key
 error.login.reason.account      = Incorrect account name or password
 error.login.reason.no_username  = Missing account name
 error.login.reason.no_password2 = Missing password
 error.login.reason.no_recoverykey= No saved Recovery Key to use
 error.login.reason.server       = Server incorrectly configured
 
-error.sync.failed_partial     = One or more data types could not be synchronised
+error.sync.failed_partial            = One or more data types could not be synchronised
 # LOCALIZATION NOTE (error.sync.reason.serverMaintenance): We removed the extraneous period from this string
 error.sync.reason.serverMaintenance  = Firefox Sync server maintenance is underway, synchronisation will resume automatically
 
 invalid-captcha = Incorrect words, try again
 weak-password   = Use a stronger password
 
 # this is the fallback, if we hit an error we didn't bother to localize
 error.reason.unknown          = Unknown error
--- a/services/sync/sync.properties
+++ b/services/sync/sync.properties
@@ -12,37 +12,27 @@ mobile.label = Mobile Bookmarks
 
 remote.pending.label = Remote tabs are being synchronised…
 remote.missing2.label = Synchronise your other devices again to access their tabs
 remote.opened.label = All remote tabs are already open
 remote.notification.label = Recent desktop tabs will be available once they synchronise
 
 error.login.title = Error While Signing In
 error.login.description = Sync encountered an error while connecting: %1$S.  Please try again.
-error.login.prefs.label = Preferences…
-error.login.prefs.accesskey = P
 # should decide if we're going to show this
 error.logout.title = Error While Signing Out
 error.logout.description = Sync encountered an error while connecting.  It's probably ok, and you don't have to do anything about it.
 error.sync.title = Error While Synchronising
 error.sync.description = Sync encountered an error while synchronising: %1$S.  Sync will automatically retry this action.
 error.sync.prolonged_failure = Synchronisation has not been able to complete during the last %1$S days. Please check your network settings.
-error.sync.serverStatusButton.label = Server Status
-error.sync.serverStatusButton.accesskey = V
 error.sync.needUpdate.description = You need to update Firefox Sync to continue synchronising your data.
-error.sync.needUpdate.label = Update Firefox Sync
-error.sync.needUpdate.accesskey = U
-error.sync.tryAgainButton.label = Sync Now
+error.sync.tryAgainButton.label = Synchronise Now
 error.sync.tryAgainButton.accesskey = S
 warning.sync.quota.label = Approaching Server Quota
 warning.sync.quota.description = You are approaching the server quota. Please review which data to synchronise.
 error.sync.quota.label = Server Quota Exceeded
 error.sync.quota.description = Sync failed because it exceeded the server quota. Please review which data to synchronise.
-error.sync.viewQuotaButton.label = View Quota
-error.sync.viewQuotaButton.accesskey = V
 warning.sync.eol.label = Service Shutting Down
 # %1: the app name (Firefox)
 warning.sync.eol.description = Your Firefox Sync service is shutting down soon. Upgrade %1$S to keep synchronising.
 error.sync.eol.label = Service Unavailable
 # %1: the app name (Firefox)
 error.sync.eol.description = Your Firefox Sync service is no longer available. You need to upgrade %1$S to keep synchronising.
-sync.eol.learnMore.label = Learn more
-sync.eol.learnMore.accesskey = L
--- a/toolkit/chrome/alerts/notificationNames.properties
+++ b/toolkit/chrome/alerts/notificationNames.properties
@@ -1,5 +1,5 @@
 # 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/.
 
-general=General Notification
+general=General Notification
--- a/toolkit/chrome/global-platform/mac/platformKeys.properties
+++ b/toolkit/chrome/global-platform/mac/platformKeys.properties
@@ -1,29 +1,25 @@
 # 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/.
 
-# 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/.
-
-#mac
-#this file defines the on screen display names for the various modifier keys
-#these are used in XP menus to show keyboard shortcuts
-
-#the shift key - open up arrow symbol (ctrl-e)
-VK_SHIFT=\u21e7
-
-#the command key - clover leaf symbol (ctrl-q)
-VK_META=\u2318
-
-#the win key - never generated by native key event
-VK_WIN=win
-
-#the option/alt key - splitting tracks symbol (ctrl-g)
-VK_ALT=\u2325
-
-#the control key. hat symbol (ctrl-f)
-VK_CONTROL=\u2303
-
-#the separator character used between modifiers (none on Mac OS)
-MODIFIER_SEPARATOR=
+#mac
+#this file defines the on screen display names for the various modifier keys
+#these are used in XP menus to show keyboard shortcuts
+
+#the shift key - open up arrow symbol (ctrl-e)
+VK_SHIFT=⇧
+
+#the command key - clover leaf symbol (ctrl-q)
+VK_META=⌘
+
+#the win key - never generated by native key event
+VK_WIN=win
+
+#the option/alt key - splitting tracks symbol (ctrl-g)
+VK_ALT=⌥
+
+#the control key. hat symbol (ctrl-f)
+VK_CONTROL=⌃
+
+#the separator character used between modifiers (none on Mac OS)
+MODIFIER_SEPARATOR=
--- a/toolkit/chrome/global-platform/unix/platformKeys.properties
+++ b/toolkit/chrome/global-platform/unix/platformKeys.properties
@@ -1,12 +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/.
-
 # 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/.
 
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
--- a/toolkit/chrome/global-platform/win/platformKeys.properties
+++ b/toolkit/chrome/global-platform/win/platformKeys.properties
@@ -1,12 +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/.
-
 # 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/.
 
 #default
 #this file defines the on screen display names for the various modifier keys
 #these are used in XP menus to show keyboard shortcuts
 
--- a/toolkit/chrome/global/about.dtd
+++ b/toolkit/chrome/global/about.dtd
@@ -1,27 +1,30 @@
+<!-- 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 about.version                "version">
+<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
-<!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 <!ENTITY about.credits.beforeLink     "See a list of ">
 <!ENTITY about.credits.linkTitle      "contributors">
 <!-- LOCALIZATION NOTE (about.credits.afterLink): note that there is no space between the linked about.credits.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.credits.afterLink      " to the Mozilla Project.">
+<!-- LOCALIZATION NOTE (about.license.beforeTheLink): note that there is no space between this phrase and the linked about.license.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
-<!-- LOCALIZATION NOTE (about.license.beforeTheLink): note that there is no space between this phrase and the linked about.license.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 <!ENTITY about.license.beforeTheLink  "Read the ">
 <!ENTITY about.license.linkTitle      "licensing information">
 <!-- LOCALIZATION NOTE (about.license.afterTheLink): note that there is no space between the linked about.license.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.license.afterTheLink   " for this product.">
+<!-- LOCALIZATION NOTE (about.relnotes.beforeTheLink): note that there is no space between this phrase and the linked about.relnotes.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
-<!-- LOCALIZATION NOTE (about.relnotes.beforeTheLink): note that there is no space between this phrase and the linked about.relnotes.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 <!ENTITY about.relnotes.beforeTheLink "Read the ">
 <!ENTITY about.relnotes.linkTitle     "release notes">
 <!-- LOCALIZATION NOTE (about.relnotes.afterTheLink): note that there is no space between the linked about.relnotes.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.relnotes.afterTheLink  " for this version.">
+<!-- LOCALIZATION NOTE (about.buildconfig.beforeTheLink): note that there is no space between this phrase and the linked about.buildconfig.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 
-<!-- LOCALIZATION NOTE (about.buildconfig.beforeTheLink): note that there is no space between this phrase and the linked about.buildconfig.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. -->
 <!ENTITY about.buildconfig.beforeTheLink "See the ">
 <!ENTITY about.buildconfig.linkTitle     "build configuration">
 <!-- LOCALIZATION NOTE (about.buildconfig.afterTheLink): note that there is no space between the linked about.buildconfig.linkTitle phrase and this phrase, so if your locale needs a space between words, add it at the start of this entity. -->
 <!ENTITY about.buildconfig.afterTheLink  " used for this version.">
 
 <!ENTITY about.buildIdentifier        "Build identifier: ">
--- a/toolkit/chrome/global/aboutAbout.dtd
+++ b/toolkit/chrome/global/aboutAbout.dtd
@@ -1,8 +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/. -->
 
 <!ENTITY aboutAbout.title  "About About">
-<!ENTITY aboutAbout.note   "This is a list of “about” pages for your convenience.<br/>
-                            Some of them might be confusing. Some are for diagnostic purposes only.<br/>
-                            And some are omitted because they require query strings.">
+<!ENTITY aboutAbout.note   "This is a list of “about” pages for your convenience.<br/> 
+Some of them might be confusing. Some are for diagnostic purposes only.<br/> 
+And some are omitted because they require query strings.">
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -1,85 +1,88 @@
+<!-- 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.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
      deliberate for formatting around the embedded links. -->
+
 <!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
 <!ENTITY rights.intro-point1b "Mozilla Public License">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
 
 <!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licenses to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. ">
 <!ENTITY rights.intro-point2-b "Additional information on trademarks">
-<!ENTITY rights.intro-point2-c " is available.">
 
 <!-- point 2.5 text for official branded builds -->
-<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its web sites, and to distribute the feedback.">
 
+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its web sites, and to distribute the feedback.">
 <!-- point 3 text for official branded builds -->
+
 <!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
 <!ENTITY rights2.intro-point3b "&brandShortName; Privacy Policy">
 <!ENTITY rights.intro-point3c ".">
+<!-- point 3 text for unbranded builds -->
 
-<!-- point 3 text for unbranded builds -->
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
+<!-- point 4 text for official branded builds -->
 
-<!-- point 4 text for official branded builds -->
-<!ENTITY rights2.intro-point4a "Some &brandShortName; features make use of web-based information services, however, we cannot guarantee they are 100&#37; accurate or error-free. More details, including information on how to disable the features that use these services, can be found in the ">
+<!ENTITY rights2.intro-point4a "Some &brandShortName; features make use of web-based information services, however, we cannot guarantee they are 100&#037; accurate or error-free. More details, including information on how to disable the features that use these services, can be found in the ">
 <!ENTITY rights.intro-point4b "service terms">
 <!ENTITY rights.intro-point4c ".">
+<!-- point 4 text for unbranded builds -->
 
-<!-- point 4 text for unbranded builds -->
 <!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
 <!ENTITY rights.intro-point4b-unbranded "Web Site Services">
 <!ENTITY rights.intro-point4c-unbranded " section.">
 
 <!ENTITY rights2.webservices-header "&brandFullName; Web-Based Information Services">
-
 <!-- Note that this paragraph references a couple of entities from
      preferences/security.dtd, so that we can refer to text the user sees in
      the UI, without this page being forgotten every time those strings are
      updated.  -->
 <!-- intro paragraph for branded builds -->
+
 <!ENTITY rights2.webservices-a "&brandFullName; uses web-based information services (&quot;Services&quot;) to provide some of the features provided for your use with this binary version of &brandShortName; under the terms described below. If you do not want to use one or more of the Services or the terms below are unacceptable, you may disable the feature or Service(s). Instructions on how to disable a particular feature or Service may be found ">
 <!ENTITY rights2.webservices-b "here">
 <!ENTITY rights3.webservices-c ". Other features and Services can be disabled in the application preferences.">
+<!-- safe browsing points for branded builds -->
 
-<!-- safe browsing points for branded builds -->
 <!ENTITY rights.safebrowsing-a "SafeBrowsing: ">
 <!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites.  If you wish to disable the feature completely, follow these steps:">
 <!ENTITY rights.safebrowsing-term1 "Open the application preferences">
 <!ENTITY rights.safebrowsing-term2 "Select the Security selection">
 <!ENTITY rights.safebrowsing-term3 "Clear the options to &quot;&blockAttackSites.label;&quot; and &quot;&blockWebForgeries.label;&quot;">
 <!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
+<!-- location aware browsing points for branded builds -->
 
-<!-- location aware browsing points for branded builds -->
 <!ENTITY rights.locationawarebrowsing-a "Location Aware Browsing: ">
 <!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
 <!ENTITY rights.locationawarebrowsing-term1a "In the URL bar, type ">
 <!ENTITY rights.locationawarebrowsing-term1b "about:config">
 <!ENTITY rights.locationawarebrowsing-term2 "Type geo.enabled">
 <!ENTITY rights.locationawarebrowsing-term3 "Double click on the geo.enabled preference">
 <!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
-
 <!-- intro paragraph for unbranded builds -->
-<!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 
+<!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 <!-- point 1 text for unbranded builds -->
+
 <!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
+<!-- points 1-7 text for branded builds -->
 
-<!-- points 1-7 text for branded builds -->
 <!ENTITY rights2.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only and neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
 <!ENTITY rights2.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and &vendorShortName; grants you its rights to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
 <!ENTITY rights.webservices-term4 "The Services are provided &quot;as-is.&quot;  &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes.  You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
 <!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services.  The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
 <!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or canceled without &vendorShortName;'s written agreement.">
 <!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -1,24 +1,22 @@
 <!-- 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 aboutSupport.pageTitle "Troubleshooting Information">
+<!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
 
-<!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
-<!ENTITY aboutSupport.pageSubtitle "
-  This page contains technical information that might be useful when you're
-  trying to solve a problem. If you are looking for answers to common questions
-  about &brandShortName;, check out our <a id='supportLink'>support web site</a>.
-">
+<!ENTITY aboutSupport.pageSubtitle "  This page contains technical information that might be useful when you're 
+trying to solve a problem. If you are looking for answers to common questions 
+about &brandShortName;, check out our <a id='supportLink'>support web site</a>.">
 
 <!ENTITY aboutSupport.crashes.title "Crash Reports">
 <!-- LOCALIZATION NOTE (aboutSupport.crashes.id):
-     This is likely the same like id.heading in crashes.dtd. -->
+This is likely the same like id.heading in crashes.dtd. -->
 <!ENTITY aboutSupport.crashes.id "Report ID">
 <!ENTITY aboutSupport.crashes.sendDate "Submitted">
 <!ENTITY aboutSupport.crashes.allReports "All Crash Reports">
 <!ENTITY aboutSupport.crashes.noConfig "This application has not been configured to display crash reports.">
 
 <!ENTITY aboutSupport.extensionsTitle "Extensions">
 <!ENTITY aboutSupport.extensionName "Name">
 <!ENTITY aboutSupport.extensionEnabled "Enabled">
@@ -32,19 +30,19 @@
 <!ENTITY aboutSupport.experimentActive "Active">
 <!ENTITY aboutSupport.experimentEndDate "End Date">
 <!ENTITY aboutSupport.experimentHomepage "Homepage">
 
 
 <!ENTITY aboutSupport.appBasicsTitle "Application Basics">
 <!ENTITY aboutSupport.appBasicsName "Name">
 <!ENTITY aboutSupport.appBasicsVersion "Version">
-
 <!-- LOCALIZATION NOTE (aboutSupport.appBasicsUpdateHistory, aboutSupport.appBasicsShowUpdateHistory):
 "Update" is a noun here, not a verb. -->
+
 <!ENTITY aboutSupport.appBasicsUpdateHistory "Update History">
 <!ENTITY aboutSupport.appBasicsShowUpdateHistory "Show Update History">
 
 <!ENTITY aboutSupport.appBasicsProfileDir "Profile Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.appBasicsProfileDirWinMac):
 This is the Windows- and Mac-specific variant of aboutSupport.appBasicsProfileDir.
 Windows/Mac use the term "Folder" instead of "Directory" -->
 <!ENTITY aboutSupport.appBasicsProfileDirWinMac "Profile Folder">
@@ -53,37 +51,37 @@ Windows/Mac use the term "Folder" instea
 <!ENTITY aboutSupport.appBasicsBuildConfig "Build Configuration">
 <!ENTITY aboutSupport.appBasicsUserAgent "User Agent">
 <!ENTITY aboutSupport.appBasicsMemoryUse "Memory Use">
 
 <!ENTITY aboutSupport.appBasicsMultiProcessSupport "Multiprocess Windows">
 
 <!ENTITY aboutSupport.showDir.label "Open Directory">
 <!-- LOCALIZATION NOTE (aboutSupport.showMac.label): This is the Mac-specific
-variant of aboutSupport.show.label.  This allows us to use the preferred
+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
 variant of aboutSupport.showDir.label. -->
 <!ENTITY aboutSupport.showWin.label "Show Folder">
 
 <!ENTITY aboutSupport.modifiedKeyPrefsTitle "Important Modified Preferences">
 <!ENTITY aboutSupport.modifiedPrefsName "Name">
 <!ENTITY aboutSupport.modifiedPrefsValue "Value">
+<!-- LOCALIZATION NOTE (aboutSupport.userJSTitle, aboutSupport.userJSDescription): user.js is the name of the preference override file being checked. -->
 
-<!-- LOCALIZATION NOTE (aboutSupport.userJSTitle, aboutSupport.userJSDescription): user.js is the name of the preference override file being checked. -->
 <!ENTITY aboutSupport.userJSTitle "user.js Preferences">
 <!ENTITY aboutSupport.userJSDescription "Your profile folder contains a <a id='prefs-user-js-link'>user.js file</a>, which includes preferences that were not created by &brandShortName;.">
 
-<!ENTITY aboutSupport.graphicsTitle "Graphics">
-
 <!ENTITY aboutSupport.lockedKeyPrefsTitle "Important Locked Preferences">
 <!ENTITY aboutSupport.lockedPrefsName "Name">
 <!ENTITY aboutSupport.lockedPrefsValue "Value">
 
+<!ENTITY aboutSupport.graphicsTitle "Graphics">
+
 <!ENTITY aboutSupport.jsTitle "JavaScript">
 <!ENTITY aboutSupport.jsIncrementalGC "Incremental GC">
 
 <!ENTITY aboutSupport.a11yTitle "Accessibility">
 <!ENTITY aboutSupport.a11yActivated "Activated">
 <!ENTITY aboutSupport.a11yForceDisabled "Prevent Accessibility">
 
 <!ENTITY aboutSupport.libraryVersionsTitle "Library Versions">
--- a/toolkit/chrome/global/aboutSupport.properties
+++ b/toolkit/chrome/global/aboutSupport.properties
@@ -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/.
 
 # LOCALIZATION NOTE (downloadsTitleFiles): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of days relevant with relevant crash reports
+# #1 number of relevant days with crash reports
 crashesTitle=Crash Reports for the Last #1 Day;Crash Reports for the Last #1 Days
 
 # LOCALIZATION NOTE (crashesTimeMinutes): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of minutes (between 1 and 59) which have passed since the crash
 crashesTimeMinutes=#1 minute ago;#1 minutes ago
 
 # LOCALIZATION NOTE (crashesTimeHours): Semi-colon list of plural forms.
@@ -64,18 +64,18 @@ clearTypeParametersNotFound = ClearType 
 adapterDescription = Adapter Description
 adapterVendorID = Vendor ID
 adapterDeviceID = Device ID
 adapterSubsysID = Subsys ID
 adapterDrivers = Adapter Drivers
 adapterRAM = Adapter RAM
 driverVersion = Driver Version
 driverDate = Driver Date
-adapterDescription2 = Adapter Description (GPU #2) 
-adapterVendorID2 = Vendor ID (GPU #2) 
+adapterDescription2 = Adapter Description (GPU #2)\u0020
+adapterVendorID2 = Vendor ID (GPU #2)\u0020
 adapterDeviceID2 = Device ID (GPU #2)
 adapterSubsysID2 = Subsys ID (GPU #2)
 adapterDrivers2 = Adapter Drivers (GPU #2)
 adapterRAM2 = Adapter RAM (GPU #2)
 driverVersion2 = Driver Version (GPU #2)
 driverDate2 = Driver Date (GPU #2)
 isGPU2Active = GPU #2 Active
 webglRenderer = WebGL Renderer
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -1,73 +1,39 @@
 <!-- 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.telemetryEnabled "
-  Telemetry is <span>enabled</span>.
-">
+<!ENTITY aboutTelemetry.telemetryEnabled "  Telemetry is <span>enabled</span>.">
 
-<!ENTITY aboutTelemetry.telemetryDisabled "
-  Telemetry is <span>disabled</span>.
-">
+<!ENTITY aboutTelemetry.telemetryDisabled "  Telemetry is <span>disabled</span>.">
 
-<!ENTITY aboutTelemetry.slowSqlSection "
-  Slow SQL Statements
-">
+<!ENTITY aboutTelemetry.slowSqlSection "  Slow SQL Statements">
 
-<!ENTITY aboutTelemetry.chromeHangsSection "
-  Browser Hangs
-">
+<!ENTITY aboutTelemetry.chromeHangsSection "  Browser Hangs">
 
-<!ENTITY aboutTelemetry.threadHangStatsSection "
-  Thread Hangs
-">
+<!ENTITY aboutTelemetry.threadHangStatsSection "  Thread Hangs">
 
-<!ENTITY aboutTelemetry.histogramsSection "
-  Histograms
-">
+<!ENTITY aboutTelemetry.histogramsSection "  Histograms">
 
-<!ENTITY aboutTelemetry.simpleMeasurementsSection "
-  Simple Measurements
-">
+<!ENTITY aboutTelemetry.simpleMeasurementsSection "  Simple Measurements">
 
-<!ENTITY aboutTelemetry.addonDetailsSection "
-  Add-on Details
-">
+<!ENTITY aboutTelemetry.addonDetailsSection "  Add-on Details">
 
-<!ENTITY aboutTelemetry.lateWritesSection "
-  Late Writes
-">
+<!ENTITY aboutTelemetry.lateWritesSection "  Late Writes">
 
-<!ENTITY aboutTelemetry.systemInfoSection "
-  System Information
-">
+<!ENTITY aboutTelemetry.systemInfoSection "  System Information">
 
-<!ENTITY aboutTelemetry.addonHistogramsSection "
-  Histograms Collected by Add-ons
-">
+<!ENTITY aboutTelemetry.addonHistogramsSection "  Histograms Collected by Add-ons">
 
-<!ENTITY aboutTelemetry.toggle "
-  Click to toggle section
-">
+<!ENTITY aboutTelemetry.toggle "  Click to toggle section">
 
-<!ENTITY aboutTelemetry.emptySection "
-  (No data collected)
-">
+<!ENTITY aboutTelemetry.emptySection "  (No data collected)">
 
-<!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.fullSqlWarning "  NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.">
 
-<!ENTITY aboutTelemetry.fetchSymbols "
-  Fetch function names for hang stacks
-">
+<!ENTITY aboutTelemetry.fetchSymbols "  Fetch function names for hang stacks">
 
-<!ENTITY aboutTelemetry.hideSymbols "
-  Show raw data from hangs
-">
+<!ENTITY aboutTelemetry.hideSymbols "  Show raw data from hangs">
 
-<!ENTITY aboutTelemetry.filterText "
-  Filter (strings or /regexp/)
-">
+<!ENTITY aboutTelemetry.filterText "  Filter (strings or /regexp/)">
--- a/toolkit/chrome/global/appPicker.dtd
+++ b/toolkit/chrome/global/appPicker.dtd
@@ -1,7 +1,7 @@
 <!-- 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 NoAppFound.label      "No applications were found for this file type.">
-<!ENTITY BrowseButton.label    "Browse…">
-<!ENTITY SendMsg.label         "Send this item to:">
+<!ENTITY NoAppFound.label      "No applications were found for this file type.">
+<!ENTITY BrowseButton.label    "Browse…">
+<!ENTITY SendMsg.label         "Send this item to:">
--- a/toolkit/chrome/global/autocomplete.properties
+++ b/toolkit/chrome/global/autocomplete.properties
@@ -1,9 +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/.
 
 # LOCALIZATION NOTE (searchWithEngine): %S will be replaced with
 # the search engine provider's name. This format was chosen because
 # the provider can also end with "Search" (e.g.: MSN Search).
 searchWithEngine = Search with %S
-switchToTab = Switch to tab
\ No newline at end of file
+# LOCALIZATION NOTE (searchWithEngineForQuery):
+# %1$S is the search engine's name, %2$S is the search query.
+# This format was chosen because the provider can also end with "Search"
+# (e.g.: MSN Search).
+switchToTab = Switch to tab
+# LOCALIZATION NOTE (visitURL):
+# %S is the URL to visit.
--- a/toolkit/chrome/global/charsetMenu.dtd
+++ b/toolkit/chrome/global/charsetMenu.dtd
@@ -1,19 +1,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY charsetMenu.label             "Character Encoding">
 <!ENTITY charsetMenu.accesskey         "C">
+<!-- The strings below are unused on m-c. They will be removed post-Australis -->
 
 
-<!-- The strings below are unused on m-c. They will be removed post-Australis -->
 <!ENTITY charsetMenuAutodet.label      "Auto-Detect">
-<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
+<!-- A reserved for Arabic -->
+<!ENTITY charsetMenuAutodet.accesskey  "D">
 
 <!ENTITY charsetMenuAutodet.off.label     "(off)">
 <!ENTITY charsetMenuAutodet.off.accesskey "o">
 <!ENTITY charsetMenuAutodet.ja.label      "Japanese">
 <!ENTITY charsetMenuAutodet.ja.accesskey  "J">
 <!ENTITY charsetMenuAutodet.ru.label      "Russian">
 <!ENTITY charsetMenuAutodet.ru.accesskey  "R">
 <!ENTITY charsetMenuAutodet.uk.label      "Ukrainian">
--- a/toolkit/chrome/global/charsetMenu.properties
+++ b/toolkit/chrome/global/charsetMenu.properties
@@ -59,25 +59,18 @@ ISO-8859-4       = Baltic (ISO)
 
 # Central European
 windows-1250.key =         E
 windows-1250     = Central European (Windows)
 ISO-8859-2.key   =       l
 ISO-8859-2       = Central European (ISO)
 
 # Chinese, Simplified
-# LOCALIZATION NOTE (gbk.bis.key):
-# gbk.bis.key never appears together with gbk.key and, hence, can be the same.
 gbk.bis.key      =          S
 gbk.bis          = Chinese, Simplified
-# The strings gbk.key, gbk and gb18030 are no longer used but are retained
-# in order to enable backout after string freeze, just in case.
-gbk.key          =          S
-gbk              = Chinese, Simplified (GBK)
-gb18030          = Chinese, Simplified (GB18030)
 
 # Chinese, Traditional
 Big5.key         =          T
 Big5             = Chinese, Traditional
 
 # Cyrillic
 windows-1251.key = C
 windows-1251     = Cyrillic (Windows)
--- a/toolkit/chrome/global/config.dtd
+++ b/toolkit/chrome/global/config.dtd
@@ -1,36 +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/. -->
 
 <!ENTITY window.title "about:config">
-
 <!-- about:config warning page -->
 <!-- LOCALIZATION NOTE: aboutWarningTitle.label should be attention grabbing and playful -->
+
 <!ENTITY aboutWarningTitle.label "Here be dragons!">
 <!ENTITY aboutWarningText.label "Changing these advanced settings can be harmful to the stability, security, and performance of this application. You should only continue if you are sure of what you are doing.">
 <!ENTITY aboutWarningButton.label "I'll be careful, I promise!">
 <!ENTITY aboutWarningCheckbox.label "Show this warning next time">
 
 <!ENTITY searchPrefs.label "Search:">
 <!ENTITY searchPrefs.accesskey "r">
 <!ENTITY focusSearch.key "r">
+<!-- Columns -->
 
-<!-- Columns -->
 <!ENTITY prefColumn.label "Preference Name">
 <!ENTITY lockColumn.label "Status">
 <!ENTITY typeColumn.label "Type">
 <!ENTITY valueColumn.label "Value">
+<!-- Tooltips -->
 
-<!-- Tooltips -->
 <!ENTITY prefColumnHeader.tooltip "Click to sort"> 
 <!ENTITY columnChooser.tooltip "Click to select columns to display"> 
+<!-- Context Menu -->
 
-<!-- Context Menu -->
 <!ENTITY copyPref.key "C">
 <!ENTITY copyPref.label "Copy">
 <!ENTITY copyPref.accesskey "C">
 <!ENTITY copyName.label "Copy Name">
 <!ENTITY copyName.accesskey "N">
 <!ENTITY copyValue.label "Copy Value">
 <!ENTITY copyValue.accesskey "V">
 <!ENTITY modify.label "Modify">
--- a/toolkit/chrome/global/datetimepicker.dtd
+++ b/toolkit/chrome/global/datetimepicker.dtd
@@ -1,7 +1,7 @@
 <!-- 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/. -->
+<!-- first day of week to display in datepicker, a value from 0 to 6,
+     0 = Sunday, 1 = Monday, etc. -->
 
-<!-- first day of week to display in datepicker, a value from 0 to 6,
-     0 = Sunday, 1 = Monday, etc. -->
-<!ENTITY firstdayofweek.default "0">
+<!ENTITY firstdayofweek.default "0">
--- a/toolkit/chrome/global/devtools/csscoverage.dtd
+++ b/toolkit/chrome/global/devtools/csscoverage.dtd
@@ -1,46 +1,47 @@
 <!-- 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 : FILE This file contains the CSS Coverage Report
    - strings. See the 'csscoverage' command for more information, and
    - browser/devtools/styleeditor/styleeditor.xul for context -->
-
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
    - keep it in English, or another language commonly spoken among web developers.
    - You want to make that choice consistent across the developer tools.
    - A good criteria is the language in which you'd find the best
    - documentation on web development on the web. -->
-
 <!-- LOCALIZATION NOTE (csscoverage.backButton):
   -  Text on the button to go back to the main style editor -->
+
+
+
 <!ENTITY csscoverage.backButton "Backwards">
-
 <!-- LOCALIZATION NOTE (csscoverage.unused, csscoverage.noMatches):
   -  This is the heading and body text for the CSS usage part of the report -->
+
 <!ENTITY csscoverage.unused "Unused Rules">
 <!ENTITY csscoverage.noMatches "No matches found for the following rules:">
-
 <!-- LOCALIZATION NOTE (csscoverage.optimize.header):
   -  This is the heading for the CSS optimization part of the report -->
+
 <!ENTITY csscoverage.optimize.header "Optimisable Pages">
-
 <!-- LOCALIZATION NOTE (csscoverage.preload1, csscoverage.preload2,
   -  csscoverage.preload3): These 3 are part of a paragraph with 1 and 2
   -  separated by a styled <link> tag and 2 and 3 separated by a styled
   -  <style> tag -->
+
 <!ENTITY csscoverage.optimize.body1 "You can sometimes speed up loading by moving">
 <!ENTITY csscoverage.optimize.body2 "tags to the bottom of the page and creating a new inline">
 <!ENTITY csscoverage.optimize.body3 "element with the styles needed before the 'load' event to the top. Here are the style blocks you need:">
-
 <!-- LOCALIZATION NOTE (csscoverage.optimize.bodyX):
   -  This is what we say when we have no optimization suggestions -->
-<!ENTITY csscoverage.optimize.bodyX "All rules are inlined.">
 
-<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2, csscoverage.footer3):
-  -  The text displayed at the bottom of the page, with 2 being the URL opened
-  -  when the link text in 3 is clicked -->
+<!ENTITY csscoverage.optimize.bodyX "All rules are inlined.">
+<!-- LOCALIZATION NOTE (csscoverage.footer1, csscoverage.footer2a,
+  -  csscoverage.footer3, csscoverage.footer4): The text displayed at the
+  -  bottom of the page, with 2a being the URL opened when the link text in 3
+  -  is clicked -->
+
 <!ENTITY csscoverage.footer1 "See">
 <!ENTITY csscoverage.footer2a "https://developer.mozilla.org/docs/Tools/CSS_Coverage">
 <!ENTITY csscoverage.footer3 "the MDN article on the CSS Coverage Tool">
 <!ENTITY csscoverage.footer4 "for caveats in the generation of this report.">
--- a/toolkit/chrome/global/devtools/styleinspector.properties
+++ b/toolkit/chrome/global/devtools/styleinspector.properties
@@ -95,24 +95,16 @@ 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.showCSSSources): Text displayed in the rule view
-# context menu.
-ruleView.contextmenu.showCSSSources=Show CSS sources
-
-# LOCALIZATION NOTE (ruleView.contextmenu.showCSSSources.accessKey): Access key for
-# the rule view context menu "Show CSS sources" entry.
-ruleView.contextmenu.showCSSSources.accessKey=S
-
 # 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/global/dialogOverlay.dtd
+++ b/toolkit/chrome/global/dialogOverlay.dtd
@@ -1,13 +1,10 @@
-<!-- -*- Mode: HTML -*-
-# 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/.
-#
-# WARNING!!! This file is obsoleted by the dialog.xml widget
-#
--->
+<!-- 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/. -->
+<!-- WARNING!!! This file is obsoleted by the dialog.xml widget -->
+<!-- OK Cancel Buttons -->
 
-<!-- OK Cancel Buttons -->
+
 <!ENTITY okButton.label      "OK">
 <!ENTITY cancelButton.label  "Cancel">
 <!ENTITY helpButton.label    "Help">
--- a/toolkit/chrome/global/editMenuOverlay.dtd
+++ b/toolkit/chrome/global/editMenuOverlay.dtd
@@ -1,35 +1,35 @@
 <!-- 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 editMenu.label            "Edit">
-<!ENTITY editMenu.accesskey        "E">
-<!ENTITY undoCmd.label             "Undo">
-<!ENTITY undoCmd.key               "Z">
-<!ENTITY undoCmd.accesskey         "U">
-<!ENTITY redoCmd.label             "Redo">
-<!ENTITY redoCmd.key               "Y">
-<!ENTITY redoCmd.accesskey         "R">
-<!ENTITY cutCmd.label              "Cut">
-<!ENTITY cutCmd.key                "X">
-<!ENTITY cutCmd.accesskey          "t">
-<!ENTITY copyCmd.label             "Copy">
-<!ENTITY copyCmd.key               "C">
-<!ENTITY copyCmd.accesskey         "C">
-<!ENTITY pasteCmd.label            "Paste">
-<!ENTITY pasteCmd.key              "V">
-<!ENTITY pasteCmd.accesskey        "P">
-<!ENTITY deleteCmd.label           "Delete">
-<!ENTITY deleteCmd.accesskey       "D">
-<!ENTITY selectAllCmd.label        "Select All">
-<!ENTITY selectAllCmd.key          "A">
-<!ENTITY selectAllCmd.accesskey    "A">
-<!ENTITY findCmd.label             "Find">
-<!ENTITY findCmd.key               "F">
-<!ENTITY findCmd.accesskey         "F">
-<!ENTITY findAgainCmd.label        "Find Again">
-<!ENTITY findAgainCmd.key          "G">
-<!ENTITY findAgainCmd.key2         "VK_F3">
-<!ENTITY findAgainCmd.accesskey    "g">
-<!ENTITY findPreviousCmd.label     "Find Previous">
-<!ENTITY findPreviousCmd.accesskey "v">
+<!ENTITY editMenu.label            "Edit">
+<!ENTITY editMenu.accesskey        "E">
+<!ENTITY undoCmd.label             "Undo">
+<!ENTITY undoCmd.key               "Z">
+<!ENTITY undoCmd.accesskey         "U">
+<!ENTITY redoCmd.label             "Redo">
+<!ENTITY redoCmd.key               "Y">
+<!ENTITY redoCmd.accesskey         "R">
+<!ENTITY cutCmd.label              "Cut">
+<!ENTITY cutCmd.key                "X">
+<!ENTITY cutCmd.accesskey          "t">
+<!ENTITY copyCmd.label             "Copy">
+<!ENTITY copyCmd.key               "C">
+<!ENTITY copyCmd.accesskey         "C">
+<!ENTITY pasteCmd.label            "Paste">
+<!ENTITY pasteCmd.key              "V">
+<!ENTITY pasteCmd.accesskey        "P">
+<!ENTITY deleteCmd.label           "Delete">
+<!ENTITY deleteCmd.accesskey       "D">
+<!ENTITY selectAllCmd.label        "Select All">
+<!ENTITY selectAllCmd.key          "A">
+<!ENTITY selectAllCmd.accesskey    "A">
+<!ENTITY findCmd.label             "Find">
+<!ENTITY findCmd.key               "F">
+<!ENTITY findCmd.accesskey         "F">
+<!ENTITY findAgainCmd.label        "Find Again">
+<!ENTITY findAgainCmd.key          "G">
+<!ENTITY findAgainCmd.key2         "VK_F3">
+<!ENTITY findAgainCmd.accesskey    "g">
+<!ENTITY findPreviousCmd.label     "Find Previous">
+<!ENTITY findPreviousCmd.accesskey "v">
--- a/toolkit/chrome/global/findbar.dtd
+++ b/toolkit/chrome/global/findbar.dtd
@@ -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/. -->
-
 <!-- LOCALIZATION NOTE : FILE This file contains the entities needed to -->
 <!-- LOCALIZATION NOTE : FILE use the Find Bar. --> 
 
+
 <!ENTITY next.tooltip "Find the next occurrence of the phrase">
 <!ENTITY previous.tooltip "Find the previous occurrence of the phrase">
 <!ENTITY findCloseButton.tooltip "Close Find bar">
 <!ENTITY highlightAll.label "Highlight All">
-<!ENTITY highlightAll.accesskey "a">
+<!ENTITY highlightAll.accesskey "A">
 <!ENTITY highlightAll.tooltiptext "Highlight all occurrences of the phrase">
 <!ENTITY caseSensitive.label "Match Case">
 <!ENTITY caseSensitive.accesskey "c">
 <!ENTITY caseSensitive.tooltiptext "Search with case sensitivity">
--- a/toolkit/chrome/global/finddialog.dtd
+++ b/toolkit/chrome/global/finddialog.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- extracted from finddialog.xul -->
 
-<!-- extracted from finddialog.xul -->
 
 <!ENTITY findDialog.title "Find in This Page">
 <!ENTITY findField.label "Find what:">
 <!ENTITY findField.accesskey "n">
 <!ENTITY caseSensitiveCheckbox.label "Match case">
 <!ENTITY caseSensitiveCheckbox.accesskey "c">
 <!ENTITY wrapCheckbox.label "Wrap">
 <!ENTITY wrapCheckbox.accesskey "W">
--- a/toolkit/chrome/global/finddialog.properties
+++ b/toolkit/chrome/global/finddialog.properties
@@ -1,6 +1,6 @@
 # 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/.
 
 notFoundWarning=The text you entered was not found.
-notFoundTitle=Find
\ No newline at end of file
+notFoundTitle=Find
--- a/toolkit/chrome/global/languageNames.properties
+++ b/toolkit/chrome/global/languageNames.properties
@@ -116,17 +116,17 @@ mi = Maori
 mk = Macedonian
 ml = Malayalam
 mn = Mongolian
 mr = Marathi
 ms = Malay
 mt = Maltese
 my = Burmese
 na = Nauru
-nb = Norwegian Bokm\u00e5l
+nb = Norwegian Bokmål
 nd = Ndebele, North
 ne = Nepali
 ng = Ndonga
 nl = Dutch
 nn = Norwegian Nynorsk
 no = Norwegian
 nr = Ndebele, South
 nso = Sotho, Northern
@@ -184,17 +184,17 @@ tt = Tatar
 tw = Twi
 ty = Tahitian
 ug = Uighur
 uk = Ukrainian
 ur = Urdu
 uz = Uzbek
 ve = Venda
 vi = Vietnamese
-vo = Volap\u00fck
+vo = Volapük
 wa = Walloon
 wen = Sorbian
 wo = Wolof
 xh = Xhosa
 yi = Yiddish
 yo = Yoruba
 za = Zhuang
 zh = Chinese
--- a/toolkit/chrome/global/mozilla.dtd
+++ b/toolkit/chrome/global/mozilla.dtd
@@ -1,14 +1,11 @@
 <!-- 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.15.1 "The Book of Mozilla, 15:1">
 
-<!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 
+<!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.'>
+And the beasts brought <em>fire</em> and light to the darkness.">
 
-<!ENTITY mozilla.from.15.1
-'from <strong>The Book of Mozilla,</strong> 15:1'>
+<!ENTITY mozilla.from.15.1 "from <strong>The Book of Mozilla,</strong> 15:1">
--- a/toolkit/chrome/global/notification.dtd
+++ b/toolkit/chrome/global/notification.dtd
@@ -1,12 +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/. -->
-
 <!-- 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 closeNotification.tooltip "Close this message">
 
 <!ENTITY closeNotificationItem.label "Not Now">
 
--- a/toolkit/chrome/global/printPageSetup.dtd
+++ b/toolkit/chrome/global/printPageSetup.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- extracted from printjoboptions.xul -->
 
-<!-- extracted from printjoboptions.xul -->
 
 <!ENTITY printSetup.title    "Page Setup">
 
 <!ENTITY basic.tab           "Format &amp; Options">
 
 <!ENTITY formatGroup.label   "Format">
 
 <!ENTITY orientation.label   "Orientation:">
--- a/toolkit/chrome/global/printPreviewProgress.dtd
+++ b/toolkit/chrome/global/printPreviewProgress.dtd
@@ -1,9 +1,9 @@
 <!-- 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 printPreviewProgress.dtd Main UI for Print Preview Progress Dialog -->
 
-<!--LOCALIZATION NOTE printPreviewProgress.dtd Main UI for Print Preview Progress Dialog -->
-<!ENTITY printWindow.title "Print Preview"> 
-<!ENTITY title   "Title:"> 
-<!ENTITY preparing "Preparing…">
-<!ENTITY progress "Progress:">
+<!ENTITY printWindow.title "Print Preview"> 
+<!ENTITY title   "Title:"> 
+<!ENTITY preparing "Preparing…">
+<!ENTITY progress "Progress:">
--- a/toolkit/chrome/global/printProgress.dtd
+++ b/toolkit/chrome/global/printProgress.dtd
@@ -1,21 +1,21 @@
 <!-- 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 printProgress.dtd Main UI for Print Progress Dialog -->
 
-<!--LOCALIZATION NOTE printProgress.dtd Main UI for Print Progress Dialog -->
-<!ENTITY printWindow.title "Printing"> 
-<!ENTITY title    "Title:"> 
-<!ENTITY progress "Progress:">
-<!ENTITY preparing "Preparing…">
-<!ENTITY printComplete "Printing is Completed.">
-
-<!ENTITY dialogCancel.label "Cancel"> 
-<!ENTITY dialogClose.label "Close">
-
-<!-- LOCALIZATION NOTE (percentPrint):
-
-    This string is used to format the text to the right of the progress
-    meter.
-
-    #1 will be replaced by the percentage of the file that has been saved -->
-<!ENTITY percentPrint "#1&#037;">
+<!ENTITY printWindow.title "Printing"> 
+<!ENTITY title    "Title:"> 
+<!ENTITY progress "Progress:">
+<!ENTITY preparing "Preparing…">
+<!ENTITY printComplete "Printing is Completed.">
+
+<!ENTITY dialogCancel.label "Cancel"> 
+<!ENTITY dialogClose.label "Close">
+<!-- LOCALIZATION NOTE (percentPrint):
+
+    This string is used to format the text to the right of the progress
+    meter.
+
+    #1 will be replaced by the percentage of the file that has been saved -->
+
+<!ENTITY percentPrint "#1&#037;">
--- a/toolkit/chrome/global/printdialog.dtd
+++ b/toolkit/chrome/global/printdialog.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- extracted from printdialog.xul -->
 
-<!-- extracted from printdialog.xul -->
 
 <!ENTITY printButton.label "Print">
 
 <!ENTITY printDialog.title "Print">
 
 <!ENTITY fpDialog.title "Save File">
 
 <!ENTITY fileCheck.label "Print to File">
--- a/toolkit/chrome/global/printjoboptions.dtd
+++ b/toolkit/chrome/global/printjoboptions.dtd
@@ -1,13 +1,13 @@
 <!-- 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/. -->
+<!-- extracted from printjoboptions.xul -->
 
-<!-- extracted from printjoboptions.xul -->
 
 <!ENTITY printJobOptions.title "Printer Properties">
 
 <!ENTITY paperInput.label "Paper Size:">
 <!ENTITY paperInput.accesskey "P">
 
 <!ENTITY plexInput.label "Plex mode:">
 <!ENTITY plexInput.accesskey "m">
--- a/toolkit/chrome/global/regionNames.properties
+++ b/toolkit/chrome/global/regionNames.properties
@@ -1,250 +1,250 @@
 # 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/.
 
-ad	=	Andorra
-ae	=	U.A.E.
-af	=	Afghanistan
-ag	=	Antigua and Barbuda
-ai	=	Anguilla
-al	=	Albania
-am	=	Armenia
-an	=	Netherlands Antilles
-ao	=	Angola
-aq	=	Antarctica
-ar	=	Argentina
-as	=	American Samoa
-at	=	Austria
-au	=	Australia
-aw	=	Aruba
-ax	=	\u00c5land Islands
-az	=	Azerbaijan
-ba	=	Bosnia and Herzegovina
-bb	=	Barbados
-bd	=	Bangladesh
-be	=	Belgium
-bf	=	Burkina Faso
-bg	=	Bulgaria
-bh	=	Bahrain
-bi	=	Burundi
-bj	=	Benin
-bl	=	Saint Barth\u00e9lemy
-bm	=	Bermuda
-bn	=	Brunei Darussalam
-bo	=	Bolivia
-br	=	Brazil
-bs	=	Bahamas
-bt	=	Bhutan
-bv	=	Bouvet Island
-bw	=	Botswana
-by	=	Belarus
-bz	=	Belize
-ca	=	Canada
-cc	=	Cocos (Keeling) Islands
-cd	=	Congo-Kinshasa
-cf	=	Central African Republic
-cg	=	Congo-Brazzaville
-ch	=	Switzerland
-ci	=	Ivory Coast
-ck	=	Cook Islands
-cl	=	Chile
-cm	=	Cameroon
-cn	=	China
-co	=	Colombia
-cr	=	Costa Rica
-cu	=	Cuba
-cv	=	Cape Verde
-cx	=	Christmas Island
-cy	=	Cyprus
-cz	=	Czech Republic
-de	=	Germany
-dj	=	Djibouti
-dk	=	Denmark
-dm	=	Dominica
-do	=	Dominican Republic
-dz	=	Algeria
-ec	=	Ecuador
-ee	=	Estonia
-eg	=	Egypt
-eh	=	Western Sahara
-er	=	Eritrea
-es	=	Spain
-et	=	Ethiopia
-fi	=	Finland
-fj	=	Fiji
-fk	=	Falkland Islands (Malvinas)
-fm	=	Micronesia
-fo	=	Faroe Islands
-fr	=	France
-ga	=	Gabon
-gb	=	United Kingdom
-gd	=	Grenada
-ge	=	Georgia
-gf	=	French Guiana
-gg	=	Guernsey
-gh	=	Ghana
-gi	=	Gibraltar
-gl	=	Greenland
-gm	=	Gambia
-gn	=	Guinea
-gp	=	Guadeloupe
-gq	=	Equatorial Guinea
-gr	=	Greece
-gs	=	South Georgia and the South Sandwich Islands
-gt	=	Guatemala
-gu	=	Guam
-gw	=	Guinea-Bissau
-gy	=	Guyana
-hk	=	Hong Kong
-hm	=	Heard Island and McDonald Islands
-hn	=	Honduras
-hr	=	Croatia
-ht	=	Haiti
-hu	=	Hungary
-id	=	Indonesia
-ie	=	Ireland
-il	=	Israel
-im	=	Isle of Man
-in	=	India
-io	=	British Indian Ocean Territory
-iq	=	Iraq
-ir	=	Iran
-is	=	Iceland
-it	=	Italy
-je	=	Jersey
-jm	=	Jamaica
-jo	=	Jordan
-jp	=	Japan
-ke	=	Kenya
-kg	=	Kyrgyzstan
-kh	=	Cambodia
-ki	=	Kiribati
-km	=	Comoros
-kn	=	Saint Kitts and Nevis
-kp	=	North Korea
-kr	=	South Korea 
-kw	=	Kuwait
-ky	=	Cayman Islands
-kz	=	Kazakhstan
-la	=	Laos
-lb	=	Lebanon
-lc	=	Saint Lucia
-li	=	Liechtenstein
-lk	=	Sri Lanka
-lr	=	Liberia
-ls	=	Lesotho
-lt	=	Lithuania
-lu	=	Luxembourg
-lv	=	Latvia
-ly	=	Libya
-ma	=	Morocco
-mc	=	Monaco
-md	=	Moldova
-me	=	Montenegro
-mf	=	Saint Martin
-mg	=	Madagascar
-mh	=	Marshall Islands
-mk	=	Macedonia, F.Y.R. of
-ml	=	Mali
-mm	=	Myanmar
-mn	=	Mongolia
-mo	=	Macao 
-mp	=	Northern Mariana Islands
-mq	=	Martinique
-mr	=	Mauritania
-ms	=	Montserrat
-mt	=	Malta
-mu	=	Mauritius
-mv	=	Maldives
-mw	=	Malawi
-mx	=	Mexico
-my	=	Malaysia
-mz	=	Mozambique
-na	=	Namibia
-nc	=	New Caledonia
-ne	=	Niger
-nf	=	Norfolk Island
-ng	=	Nigeria
-ni	=	Nicaragua
-nl	=	Netherlands
-no	=	Norway
-np	=	Nepal
-nr	=	Nauru
-nu	=	Niue
-nz	=	New Zealand
-om	=	Oman
-pa	=	Panama
-pe	=	Peru
-pf	=	French Polynesia
-pg	=	Papua New Guinea
-ph	=	Philippines
-pk	=	Pakistan
-pl	=	Poland
-pm	=	Saint Pierre and Miquelon
-pn	=	Pitcairn
-pr	=	Puerto Rico
-ps	=	Occupied Palestinian Territory
-pt	=	Portugal
-pw	=	Palau
-py	=	Paraguay
-qa	=	Qatar
-re	=	Reunion
-ro	=	Romania
-rs	=	Serbia
-ru	=	Russian Federation
-rw	=	Rwanda
-sa	=	Saudi Arabia
-sb	=	Solomon Islands
-sc	=	Seychelles
-sd	=	Sudan
-se	=	Sweden
-sg	=	Singapore
-sh	=	Saint Helena
-si	=	Slovenia
-sj	=	Svalbard and Jan Mayen
-sk	=	Slovakia
-sl	=	Sierra Leone
-sm	=	San Marino
-sn	=	Senegal
-so	=	Somalia
-sr	=	Suriname
-st	=	Sao Tome and Principe
-sv	=	El Salvador
-sy	=	Syria
-sz	=	Swaziland
-tc	=	Turks and Caicos Islands
-td	=	Chad
-tf	=	French Southern Territories
-tg	=	Togo
-th	=	Thailand
-tj	=	Tajikistan
-tk	=	Tokelau
-tl	=	Timor-Leste
-tm	=	Turkmenistan
-tn	=	Tunisia
-to	=	Tonga
-tr	=	Turkey
-tt	=	Trinidad and Tobago
-tv	=	Tuvalu
-tw	=	Taiwan
-tz	=	Tanzania
-ua	=	Ukraine
-ug	=	Uganda
-um	=	United States Minor Outlying Islands
-us	=	United States
-uy	=	Uruguay
-uz	=	Uzbekistan
-va	=	Vatican City
-vc	=	Saint Vincent and the Grenadines
-ve	=	Venezuela
-vg	=	British Virgin Islands
-vi	=	U.S. Virgin Islands
-vn	=	Vietnam
-vu	=	Vanuatu
-wf	=	Wallis and Futuna
-ws	=	Samoa
-ye	=	Yemen
-yt	=	Mayotte
-za	=	South Africa
-zm	=	Zambia
-zw	=	Zimbabwe
+ad=	Andorra
+ae=	U.A.E.
+af=	Afghanistan
+ag=	Antigua and Barbuda
+ai=	Anguilla
+al=	Albania
+am=	Armenia
+an=	Netherlands Antilles
+ao=	Angola
+aq=	Antarctica
+ar=	Argentina
+as=	American Samoa
+at=	Austria
+au=	Australia
+aw=	Aruba
+ax=	Åland Islands
+az=	Azerbaijan
+ba=	Bosnia and Herzegovina
+bb=	Barbados
+bd=	Bangladesh
+be=	Belgium
+bf=	Burkina Faso
+bg=	Bulgaria
+bh=	Bahrain
+bi=	Burundi
+bj=	Benin
+bl=	Saint Barthélemy
+bm=	Bermuda
+bn=	Brunei Darussalam
+bo=	Bolivia
+br=	Brazil
+bs=	Bahamas
+bt=	Bhutan
+bv=	Bouvet Island
+bw=	Botswana
+by=	Belarus
+bz=	Belize
+ca=	Canada
+cc=	Cocos (Keeling) Islands
+cd=	Congo-Kinshasa
+cf=	Central African Republic
+cg=	Congo-Brazzaville
+ch=	Switzerland
+ci=	Ivory Coast
+ck=	Cook Islands
+cl=	Chile
+cm=	Cameroon
+cn=	China
+co=	Colombia
+cr=	Costa Rica
+cu=	Cuba
+cv=	Cape Verde
+cx=	Christmas Island
+cy=	Cyprus
+cz=	Czech Republic
+de=	Germany
+dj=	Djibouti
+dk=	Denmark
+dm=	Dominica
+do=	Dominican Republic
+dz=	Algeria
+ec=	Ecuador
+ee=	Estonia
+eg=	Egypt
+eh=	Western Sahara
+er=	Eritrea
+es=	Spain