Bug 880964 - Update en-GB for Gecko 23 - Firefox part r=pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 17 Jun 2013 22:56:18 +0100
changeset 276 dc8feafdc09656b14654f41639233edf64474f72
parent 275 8216a4abd6577ddd2d28b8296b8877b4b66cc079
child 277 a69857d571ae7af509e5fc54d75b1b33c5f0e181
push id53
push useriann_cvs@blueyonder.co.uk
push dateMon, 17 Jun 2013 21:57:26 +0000
reviewerspending
bugs880964
Bug 880964 - Update en-GB for Gecko 23 - Firefox part r=pending
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/VariablesView.dtd
browser/chrome/browser/devtools/appcacheutils.properties
browser/chrome/browser/devtools/debugger.dtd
browser/chrome/browser/devtools/debugger.properties
browser/chrome/browser/devtools/gcli.properties
browser/chrome/browser/devtools/gclicommands.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/netmonitor.properties
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/scratchpad.properties
browser/chrome/browser/devtools/styleeditor.dtd
browser/chrome/browser/devtools/styleeditor.properties
browser/chrome/browser/devtools/toolbox.dtd
browser/chrome/browser/devtools/toolbox.properties
browser/chrome/browser/devtools/webConsole.dtd
browser/chrome/browser/devtools/webconsole.properties
browser/chrome/browser/migration/migration.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/preferences/advanced-scripts.dtd
browser/chrome/browser/preferences/advanced.dtd
browser/chrome/browser/preferences/content.dtd
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/preferences/tabs.dtd
browser/chrome/browser/quitDialog.properties
browser/feedback/main.dtd
browser/feedback/main.properties
browser/installer/nsisstrings.properties
browser/pdfviewer/viewer.properties
browser/webapp-uninstaller/webapp-uninstaller.properties
browser/webapprt/webapp.dtd
browser/webapprt/webapp.properties
webapprt/webapp-uninstaller/webapp-uninstaller.properties
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/aboutHome.dtd
+++ b/browser/chrome/browser/aboutHome.dtd
@@ -1,33 +1,33 @@
 <!-- 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;
-<!ENTITY % syncBrandDTD
-    SYSTEM "chrome://browser/locale/syncBrand.dtd">
+<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
   %syncBrandDTD;
 
 <!-- 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>">
 
 <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
 <!ENTITY abouthome.historyButton.label   "History">
 <!ENTITY abouthome.settingsButton.label  "Settings">
 <!ENTITY abouthome.addonsButton.label    "Add-ons">
 <!ENTITY abouthome.appsButton.label      "Marketplace">
 <!ENTITY abouthome.downloadsButton.label "Downloads">
 <!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -110,17 +110,28 @@ These should match what Safari and other
 
 <!ENTITY closeWindow.label "Close Window">
 <!ENTITY closeWindow.accesskey "d">
 
 <!ENTITY bookmarksMenu.label "Bookmarks">
 <!ENTITY bookmarksMenu.accesskey "B">
 <!ENTITY bookmarkThisPageCmd.label "Bookmark This Page">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
-<!ENTITY sharePageCmd.commandkey "l">
+<!ENTITY markPageCmd.commandkey "l">
+<!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">
 <!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">
 
 <!ENTITY backCmd.label                "Back">
@@ -202,16 +213,18 @@ These should match what Safari and other
 <!ENTITY devtoolsConnect.accesskey    "e">
 
 <!ENTITY errorConsoleCmd.label        "Error Console">
 <!ENTITY errorConsoleCmd.accesskey    "C">
 <!ENTITY errorConsoleCmd.commandkey   "j">
 
 <!ENTITY remoteWebConsoleCmd.label    "Remote Web Console">
 
+<!ENTITY browserConsoleCmd.label      "Browser Console">
+
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY responsiveDesignTool.label   "Responsive Design View">
 <!ENTITY responsiveDesignTool.accesskey "R">
 <!ENTITY responsiveDesignTool.commandkey "M">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
@@ -531,17 +544,18 @@ you can use these alternative items. Oth
 
 <!ENTITY quitApplicationCmdWin.label       "Exit"> 
 <!ENTITY quitApplicationCmdWin.accesskey   "x">
 <!ENTITY goBackCmd.commandKey "[">
 <!ENTITY goForwardCmd.commandKey "]">
 <!ENTITY quitApplicationCmd.label       "Quit"> 
 <!ENTITY quitApplicationCmd.accesskey   "Q">
 <!ENTITY quitApplicationCmdMac.label    "Quit &brandShortName;">
-<!ENTITY quitApplicationCmdMac.key      "Q">
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX builds. -->
+<!ENTITY quitApplicationCmdUnix.key     "Q">
 
 <!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">
@@ -625,23 +639,31 @@ just addresses the organization to follo
 <!ENTITY social.toggleSidebar.label "Show sidebar">
 <!ENTITY social.toggleSidebar.accesskey "s">
 
 <!ENTITY social.addons.label "Manage Services…">
 
 <!ENTITY social.toggleNotifications.label "Show desktop notifications">
 <!ENTITY social.toggleNotifications.accesskey "n">
 
-<!ENTITY social.activated.undobutton.label "Undo">
-<!ENTITY social.activated.undobutton.accesskey "U">
+<!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.learnMore.label "Learn more…">
+<!ENTITY social.learnMore.accesskey "l">
+<!ENTITY social.closeNotificationItem.label "Not Now">
 
 <!ENTITY social.chatBar.commandkey "c">
 <!ENTITY social.chatBar.label "Focus chats">
 <!ENTITY social.chatBar.accesskey "c">
 
+<!-- labels are set dynamically, see browser.properties -->
+<!ENTITY social.markpage.accesskey "m">
+<!ENTITY social.marklink.accesskey "m">
+
 <!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 webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
 
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -80,32 +80,35 @@ lwthemePostInstallNotification.manageBut
 
 # LOCALIZATION NOTE (lwthemeNeedsRestart.message):
 # %S will be replaced with the new theme name.
 lwthemeNeedsRestart.message=%S will be installed after you restart.
 lwthemeNeedsRestart.button=Restart Now
 lwthemeNeedsRestart.accesskey=R
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.message=#1 prevented this site from opening a pop-up window.;#1 prevented this site from opening #2 pop-up windows.
 popupWarningButton=Options
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Preferences
 popupWarningButtonUnix.accesskey=P
 popupAllow=Allow popups for %S
 popupBlock=Block popups for %S
 popupWarningDontShowFromMessage=Don't show this message when popups are blocked
 popupWarningDontShowFromLocationbar=Don't show info bar when popups are blocked
 popupShowPopupPrefix=Show '%S'
 
 # missing plugin installer
-missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
-missingpluginsMessage.button.label=Install Missing Plugins…
-missingpluginsMessage.button.accesskey=I
+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
 outdatedpluginsMessage.title=Some plugins used by this page are out of date.
 outdatedpluginsMessage.updateButton.label=Update Plugins…
 outdatedpluginsMessage.updateButton.accesskey=U
 blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
 blockedpluginsMessage.infoButton.label=Details…
 blockedpluginsMessage.infoButton.accesskey=D
 blockedpluginsMessage.searchButton.label=Update Plugins…
 blockedpluginsMessage.searchButton.accesskey=U
@@ -134,16 +137,21 @@ vulnerablePluginsMessage=Some plugins ha
 pluginInfo.unknownPlugin=Unknown
 
 # 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
+# button between the user clicking it and the window closing.  Indicates the
+# items are being cleared.
+sanitizeButtonClearing=Clearing
+
 # LOCALIZATION NOTE (sanitizeEverythingWarning2): Warning that appears when
 # "Time range to clear" is set to "Everything" in Clear Recent History dialog,
 # provided that the user has not modified the default set of history items to clear.
 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.
@@ -172,17 +180,17 @@ feedShowFeedNew=Subscribe to '%S'…
 
 menuOpenAllInTabs.label=Open All in Tabs
 
 # History menu
 menuRestoreAllTabs.label=Restore All Tabs
 # LOCALIZATION NOTE (menuRestoreAllWindows, menuUndoCloseWindowLabel, menuUndoCloseWindowSingleTabLabel):
 # see bug 394759
 menuRestoreAllWindows.label=Restore All Windows
-# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semi-colon list of plural forms.
+# LOCALIZATION NOTE (menuUndoCloseWindowLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 Window Title, #2 Number of tabs
 menuUndoCloseWindowLabel=#1 (and #2 other tab);#1 (and #2 other tabs)
 menuUndoCloseWindowSingleTabLabel=#1
 
 # Unified Back-/Forward Popup
 tabHistory.current=Stay on this page
 tabHistory.goBack=Go back to this page
@@ -231,19 +239,19 @@ identity.unknown.tooltip=This web site d
 identity.ownerUnknown2=(unknown)
 
 # Edit Bookmark UI
 editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
 editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
 editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
 editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
 
-# LOCALIZATION NOTE (editBookmark.removeBookmarks.label)
-# Semi-colon list of plural forms. Replacement for #1 is
-# the number of bookmarks to be removed.
+# 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.
@@ -272,24 +280,24 @@ webNotifications.showForSession.accesske
 webNotifications.alwaysShow=Always Show Notifications
 webNotifications.alwaysShow.accesskey=A
 webNotifications.neverShow=Always Block Notifications
 webNotifications.neverShow.accesskey=N
 webNotifications.showFromSite=Would you like to show notifications from %S?
 
 # Pointer lock UI
 
-pointerLock.allow=Hide pointer
-pointerLock.allow.accesskey=H
+pointerLock.allow2=Hide pointer
+pointerLock.allow2.accesskey=H
 pointerLock.alwaysAllow=Always allow hiding
 pointerLock.alwaysAllow.accesskey=A
 pointerLock.neverAllow=Never allow hiding
 pointerLock.neverAllow.accesskey=N
-pointerLock.title=Would you like to allow the pointer to be hidden on %S?
-pointerLock.autoLock.title=%S will hide the pointer.
+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!
@@ -356,53 +364,51 @@ syncPromoNotification.addons.description
 # 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
 
-# Keyword.URL reset prompt
-# LOCALIZATION NOTE (keywordPrompt.message):
-#  - %1$S is brandShortName
-#  - %2$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-#  - %3$S is the name of the default search engine (e.g. "Google")
-keywordPrompt.message = %1$S is using '%2$S' for searches from the location bar. Would you like to restore the default search (%3$S)?
-
-# LOCALIZATION NOTE (keywordPrompt.yesButton): %1$S is the name of the default search engine
-keywordPrompt.yesButton = Yes, use %1$S
-keywordPrompt.yesButton.accessKey = Y
-
-# LOCALIZATION NOTE (keywordPrompt.noButton): %1$S is a host name (e.g. "somewebsearch.com") from the current value of keyword.URL
-keywordPrompt.noButton = No, continue using '%1$S'
-keywordPrompt.noButton.accessKey  = N
-
 # 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
 
 # LOCALIZATION NOTE (fullscreen.entered): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.entered=%S is now fullscreen.
 # LOCALIZATION NOTE (fullscreen.rememberDecision): displayed when we enter HTML5 fullscreen mode, %S is the domain name of the focused website (e.g. mozilla.com).
 fullscreen.rememberDecision=Remember decision for %S
 
-# LOCALIZATION NOTE (social.activated.description): %1$S is the name of the social provider, %2$S is brandShortName (e.g. Firefox)
-social.activated.description=You've turned on %1$S for %2$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
+service.install.learnmore=Learn More…
 
 # LOCALIZATION NOTE (social.turnOff.label): %S is the name of the social provider
 social.turnOff.label=Turn off %S
 social.turnOff.accesskey=T
 # LOCALIZATION NOTE (social.turnOn.label): %S is the name of the social provider
 social.turnOn.label=Turn on %S
 social.turnOn.accesskey=T
 
+# LOCALIZATION NOTE (social.markpage.label): %S is the name of the social provider
+social.markpage.label=Send Page to %S
+social.unmarkpage.label=Remove Page from %S
+# LOCALIZATION NOTE (social.marklink.label): %S is the name of the social provider
+social.marklink.label=Send Link to %S
+social.unmarklink.label=Remove Link from %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.
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/VariablesView.dtd
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!-- LOCALIZATION NOTE : 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">
+
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/appcacheutils.properties
@@ -0,0 +1,123 @@
+# 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 Inspector
+# which is available from the Web Developer sub-menu -> 'Inspect'.
+#
+# 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 (noManifest): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has no cache manifest.
+noManifest=The specified page has no manifest.
+
+# LOCALIZATION NOTE (notUTF8): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a character encoding that is not
+# UTF-8.
+notUTF8=Manifest has a character encoding of %S. Manifests must have the utf-8 character encoding.
+
+# LOCALIZATION NOTE (badMimeType): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a mimetype that is not
+# text/cache-manifest.
+badMimeType=Manifest has a mimetype of %S. Manifests must have a mimetype of text/cache-manifest.
+
+# LOCALIZATION NOTE (duplicateURI): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI from multiple locations.
+duplicateURI=URI %S is referenced in multiple locations. This is not allowed: %S.
+
+# LOCALIZATION NOTE (networkBlocksURI): Used when an attempt is made to validate
+# a page using AppCacheUtils.jsm that has a cache manifest which references the
+# same URI in the NETWORK section as it does in other sections.
+networkBlocksURI=NETWORK section line %S (%S) prevents caching of line %S (%S) in the %S section.
+
+# LOCALIZATION NOTE (fallbackBlocksURI): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references the same URI in the FALLBACK section as it does in other sections.
+fallbackBlocksURI=FALLBACK section line %S (%S) prevents caching of line %S (%S) in the %S section.
+
+# LOCALIZATION NOTE (fileChangedButNotManifest): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a cache manifest which
+# references a URI that has a file modified after the cache manifest.
+fileChangedButNotManifest=The file %S was modified after %S. Unless the text in the manifest file is changed the cached version will be used instead at line %S.
+
+# LOCALIZATION NOTE (cacheControlNoStore): Used when an attempt is made to
+# validate a page using AppCacheUtils.jsm that has a header preventing caching
+# or storing information.
+cacheControlNoStore=%S has cache-control set to no-store. This will prevent the application cache from storing the file at line %S.
+
+# LOCALIZATION NOTE (notAvailable): Used when an attempt is made to validate a
+# page using AppCacheUtils.jsm that is not available.
+notAvailable=%S points to a resource that is not available at line %S.
+
+# LOCALIZATION NOTE (invalidURI): Used when an invalid URI is passed to the
+# appcache.
+invalidURI=The URI passed to AppCacheUtils is invalid.
+
+# LOCALIZATION NOTE (noResults) Used when a search returns no results.
+noResults=Your search returned no results.
+
+# LOCALIZATION NOTE (cacheDisabled) Used when the cache is disabled and an
+# attempt is made to view offline data.
+cacheDisabled=Your disc cache is disabled. Please set browser.cache.disk.enable to true in about:config and try again.
+
+# LOCALIZATION NOTE (firstLineMustBeCacheManifest): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having a first line that
+# is not "CACHE MANIFEST."
+firstLineMustBeCacheManifest=The first line of the manifest must be "CACHE MANIFEST" at line %S.
+
+# LOCALIZATION NOTE (cacheManifestOnlyFirstLine): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having "CACHE MANIFEST"
+# on a line other than the first line.
+cacheManifestOnlyFirstLine="CACHE MANIFEST" is only valid on the first line at line %S.
+
+# LOCALIZATION NOTE (asteriskInWrongSection): Used when an attempt is made
+# to validate a cache manifest using AppCacheUtils.jsm having an asterisk (*) in
+# a section other than the network section.
+asteriskInWrongSection=Asterisk used as a wildcard in the %S section at line %S. A single line containing an asterisk is called the online whitelist wildcard flag and is only valid in the NETWORK section. Other uses of the * character are prohibited. The presence of this flag indicates that any URI not listed as cached is to be implicitly treated as being in the online whitelist namespaces. If the flag is not present then the blocking state indicates that URIs not listed explicitly in the manifest are to be treated as unavailable.
+
+# LOCALIZATION NOTE (escapeSpaces): Used when an attempt is made to validate a
+# cache manifest using AppCacheUtils.jsm having a space in a URI. Spaces are to
+# be replaced with %20.
+escapeSpaces=Spaces in URIs need to be replaced with %20 at line %S.
+
+# LOCALIZATION NOTE (slashDotDotSlashBad): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# /../, which is invalid.
+slashDotDotSlashBad=/../ is not a valid URI prefix at line %S.
+
+# LOCALIZATION NOTE (tooManyDotDotSlashes): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a URI containing
+# too many ../ operators. Too many of these operaters mean that the file would
+# be below the root of the site, which is not possible.
+tooManyDotDotSlashes=Too many dot dot slash operators (../) at line %S.
+
+# LOCALIZATION NOTE (fallbackUseSpaces): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm having a FALLBACK section
+# containing more or less than the standard two URIs seperated by a single
+# space.
+fallbackUseSpaces=Only two URIs separated by spaces are allowed in the FALLBACK section at line %S.
+
+# LOCALIZATION NOTE (fallbackAsterisk): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a FALLBACK section that
+# attempts to use an asterisk (*) as a wildcard. In this section the URI is
+# simply a path prefix.
+fallbackAsterisk=Asterisk (*) incorrectly used as a wildcard in a fallback namespace at line %S. Namespaces simply need to match a path prefix.
+
+# LOCALIZATION NOTE (settingsBadValue): Used when an attempt is made to validate
+# a cache manifest using AppCacheUtils.jsm having a SETTINGS section containing
+# something other than the valid "prefer-online" or "fast."
+settingsBadValue=The SETTINGS section may only contain a single value, "prefer-online" or "fast" at line %S.
+
+# LOCALIZATION NOTE (invalidSectionName): Used when an attempt is made to
+# validate a cache manifest using AppCacheUtils.jsm containing an invalid
+# section name.
+invalidSectionName=Invalid section name (%S) at line %S.
+
+# LOCALIZATION NOTE (entryNotFound): Used when an attempt is made to view a
+# cache entry that does not exist.
+entryNotFound=Entry not found.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -60,16 +60,22 @@
 
 <!-- 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.key    "P">
 
+<!-- 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.key  "O">
+
 <!-- LOCALIZATION NOTE (debuggerUI.searchPanelTitle): This is the text that
   -  appears in the filter panel popup as a description. -->
 <!ENTITY debuggerUI.searchPanelTitle    "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">
@@ -79,17 +85,16 @@
   -  in the source editor's context menu for the global search operation. -->
 <!ENTITY debuggerUI.searchGlobal        "Search in all files">
 <!ENTITY debuggerUI.searchGlobal.key    "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.altkey "O">
 
 <!-- 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">
 
 <!-- LOCALIZATION NOTE (debuggerUI.searchLine): This is the text that appears
   -  in the source editor's context menu for the line search operation. -->
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -5,25 +5,16 @@
 # LOCALIZATION NOTE These strings are used inside the Script Debugger
 # which is available from the Web Developer sub-menu -> 'Script 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 (confirmTabSwitch): The messages displayed for all the
-# title and buttons on the notification shown when a user attempts to open a
-# debugger in a new tab while a different tab is already being debugged.
-confirmTabSwitch.message=Debugger is already open in another tab. Continuing will close the other instance.
-confirmTabSwitch.buttonSwitch=Switch to debugged tab
-confirmTabSwitch.buttonSwitch.accessKey=S
-confirmTabSwitch.buttonOpen=Open anyway
-confirmTabSwitch.buttonOpen.accessKey=O
-
 # LOCALIZATION NOTE (open.commandkey): The key used to open the debugger in
 # combination to e.g. ctrl + shift
 open.commandkey=S
 
 # LOCALIZATION NOTE (debuggerMenu.accesskey): The access key used to open the
 # debugger.
 debuggerMenu.accesskey=D
 
@@ -210,8 +201,15 @@ variablesSeparatorLabel=:
 # LOCALIZATION NOTE (watchExpressionsSeparatorLabel): The text that is displayed
 # in the watch expressions list as a separator between the code and evaluation.
 watchExpressionsSeparatorLabel=\ →
 
 # 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
+# open in separate tabs and the user tries to resume them in the wrong order.
+# The substitution parameter is the URL of the last paused window that must be
+# resumed first.
+resumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -14,16 +14,30 @@
 # LOCALIZATION NOTE (canonDescNone): Short string used to describe any command
 # or command parameter when no description has been provided.
 canonDescNone=(No description)
 
 # LOCALIZATION NOTE (canonDefaultGroupName): The default name for a group of
 # parameters.
 canonDefaultGroupName=Options
 
+# LOCALIZATION NOTE (canonProxyDesc): A very short description of a set of
+# remote 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. See
+# canonProxyManual for a fuller description of what it does.
+canonProxyDesc=Execute a command on %S
+
+# LOCALIZATION NOTE (canonProxyManual): A fuller description of a set of
+# remote commands. Displayed when the user asks for help on what it does.
+canonProxyManual=A set of commands that are executed on a remote system. The remote system is reached via %S
+
+# LOCALIZATION NOTE (canonProxyExists): An error message displayed when we try
+# to add new command (via a proxy) where one already exists in that name.
+canonProxyExists=There is already a command called '%S'
+
 # LOCALIZATION NOTE (cliEvalJavascript): The special '{' command allows entry
 # of JavaScript like traditional developer tool command lines. This describes
 # the '{' command.
 cliEvalJavascript=Enter JavaScript directly
 
 # LOCALIZATION NOTE (cliUnusedArg): When the command line has more arguments
 # than the current command can understand this is the error message shown to
 # the user.
@@ -185,16 +199,102 @@ helpManOptional=optional
 # of the matching sub-commands
 subCommands=Sub-Commands
 
 # LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
 # 'help' command when the command in question should have sub-commands but in
 # fact has none
 subCommandsNone=None
 
+# LOCALIZATION NOTE (contextDesc): A very short description of the 'context'
+# 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. See contextManual for
+# a fuller description of what it does.
+contextDesc=Concentrate on a group of commands
+
+# LOCALIZATION NOTE (contextManual): A fuller description of the 'context'
+# command. Displayed when the user asks for help on what it does.
+contextManual=Setup a default prefix to future commands. For example 'context git' would allow you to type 'commit' rather than 'git commit'.
+
+# LOCALIZATION NOTE (contextPrefixDesc): A short description of the 'prefix'
+# parameter to the 'context' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+contextPrefixDesc=The command prefix
+
+# LOCALIZATION NOTE (contextNotParentError): An error message displayed during
+# the processing of the 'context' command, when the found command is not a
+# parent command.
+contextNotParentError=Can't use '%1$S' as a prefix because it is not a parent command.
+
+# LOCALIZATION NOTE (contextReply): A message displayed during the processing
+# of the 'context' command, to indicate success.
+contextReply=Using %1$S as a command prefix
+
+# LOCALIZATION NOTE (contextEmptyReply): A message displayed during the
+# processing of the 'context' command, to indicate that there is no command
+# prefix
+contextEmptyReply=Command prefix is unset
+
+# LOCALIZATION NOTE (connectDesc): A very short description of the 'connect'
+# 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. See connectManual for
+# a fuller description of what it does.
+connectDesc=Proxy commands to server
+
+# LOCALIZATION NOTE (connectManual): A fuller description of the 'connect'
+# command. Displayed when the user asks for help on what it does.
+connectManual=Connect to the server, creating local versions of the commands on the server. Remote commands initially have a prefix to distinguish them from local commands (but see the context command to get past this)
+
+# LOCALIZATION NOTE (connectPrefixDesc): A short description of the 'prefix'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPrefixDesc=Parent prefix for imported commands
+
+# LOCALIZATION NOTE (connectPortDesc): A short description of the 'port'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectPortDesc=The TCP port to listen on
+
+# LOCALIZATION NOTE (connectHostDesc): A short description of the 'host'
+# parameter to the 'connect' command. This string is designed to be shown in a
+# dialog with restricted space, which is why it should be as short as
+# possible.
+connectHostDesc=The hostname to bind to
+
+# LOCALIZATION NOTE (connectDupReply): An error condition from executing the
+# 'connect' command
+connectDupReply=Connection called %S already exists.
+
+# LOCALIZATION NOTE (connectReply): The output of the 'connect' command,
+# telling the user what it has done.
+connectReply=Added %S commands.
+
+# LOCALIZATION NOTE (disconnectDesc): A very short description of the
+# 'disconnect' 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.
+# See connectManual for a fuller description of what it does.
+disconnectDesc=Proxy commands to server
+
+# LOCALIZATION NOTE (disconnectManual): A fuller description of the
+# 'disconnect' command. Displayed when the user asks for help on what it does.
+disconnectManual=Connect to the server, creating local versions of the commands on the server. Remote commands initially have a prefix to distinguish them from local commands (but see the context command to get past this)
+
+# LOCALIZATION NOTE (disconnectPrefixDesc): A short description of the
+# 'prefix' parameter to the 'disconnect' command. This string is designed to
+# be shown in a dialog with restricted space, which is why it should be as
+# short as possible.
+disconnectPrefixDesc=Parent prefix for imported commands
+
+# LOCALIZATION NOTE (disconnectReply): The output of the 'disconnect' command,
+# telling the user what it's done.
+disconnectReply=Removed %S commands.
+
 # LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
 # 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. See prefManual for a
 # fuller description of what it does.
 prefDesc=Commands to control settings
 
 # LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
 # Displayed when the user asks for help on what it does.
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -7,24 +7,16 @@
 # -> 'Web Console'.
 #
 # 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 (echoDesc) A very short string used to describe the
-# function of the echo command.
-echoDesc=Show a message
-
-# LOCALIZATION NOTE (echoMessageDesc) A very short string used to describe the
-# message parameter to the echo command.
-echoMessageDesc=Message
-
 # LOCALIZATION NOTE (helpDesc) A very short string used to describe the
 # function of the help command.
 helpDesc=Get help on the available commands
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
 helpAvailable=Available Commands
 
@@ -324,28 +316,23 @@ breakDesc=Manage breakpoints
 # LOCALIZATION NOTE (breakManual) A longer description describing the
 # set of commands that control breakpoints.
 breakManual=Commands to list, add and remove breakpoints
 
 # LOCALIZATION NOTE (breaklistDesc) A very short string used to describe the
 # function of the 'break list' command.
 breaklistDesc=Display known breakpoints
 
-# LOCALIZATION NOTE (breaklistLineEntry) Used in the output of the 'break list'
-# command to display a single line breakpoint.
-# %1$S=script URL, %2$S=line number
-breaklistLineEntry=Line breakpoint at %1$S:%2$S
-
 # LOCALIZATION NOTE (breaklistNone) Used in the output of the 'break list'
 # command to explain that the list is empty.
 breaklistNone=No breakpoints set
 
-# LOCALIZATION NOTE (breaklistIntro) Used in the output of the 'break list'
-# command to preface the list contents.
-breaklistIntro=The following breakpoints are set:
+# LOCALIZATION NOTE (breaklistOutRemove) A title used in the output from the
+# 'break list' command on a button which can be used to remove breakpoints
+breaklistOutRemove=Remove
 
 # LOCALIZATION NOTE (breakaddAdded) Used in the output of the 'break add'
 # command to explain that a breakpoint was added.
 breakaddAdded=Added breakpoint
 
 # LOCALIZATION NOTE (breakaddFailed) Used in the output of the 'break add'
 # command to explain that a breakpoint could not be added.
 breakaddFailed=Could not set breakpoint: %S
@@ -545,16 +532,38 @@ addonListTypeDesc=Select an addon type
 addonListDictionaryHeading=The following dictionaries are currently installed:
 addonListExtensionHeading=The following extensions are currently installed:
 addonListLocaleHeading=The following locales are currently installed:
 addonListPluginHeading=The following plugins are currently installed:
 addonListThemeHeading=The following themes are currently installed:
 addonListAllHeading=The following addons are currently installed:
 addonListUnknownHeading=The following addons of the selected type are currently installed:
 
+# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
+# output of the 'addon list' command as the labels for the enable/disable
+# action buttons in the listing. This string is designed to be shown in a
+# small action button next to the addon name, which is why it should be as
+# short as possible.
+addonListOutEnable=Enable
+addonListOutDisable=Disable
+
+# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
+# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
+# the output of the 'addon list' command as the descriptions of pending
+# addon operations. addonPending is used as a prefix for a list of pending
+# actions (named by the other lookup variables). These strings are designed
+# to be shown alongside addon names, which is why they should be as short
+# as possible.
+addonPending=pending
+addonPendingEnable=enable
+addonPendingDisable=disable
+addonPendingUninstall=uninstall
+addonPendingInstall=install
+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.
@@ -714,16 +723,64 @@ pagemodRemoveAttributeRootDesc=CSS selec
 # to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
 # command, which is displayed in a dialog when the user is using this command.
 pagemodRemoveAttributeIgnoreCaseDesc=Perform case-insensitive search
 
 # LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
 # result of the 'pagemod remove attribute' command.
 pagemodRemoveAttributeResult=Elements matched by selector: %1$S. Attributes removed: %2$S.
 
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
+# command, the parent command for tool-hacking commands.
+# The argument (%1$S) is the browser name.
+toolsDesc2=Hack the %1$S Developer Tools
+
+# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
+# command. The argument (%1$S) is the browser name.
+toolsManual2=Various commands related to hacking directly on the %1$S Developer Tools.
+
+# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
+# command, for pointing your developer tools loader at a mozilla-central source tree.
+toolsSrcdirDesc=Load tools from a mozilla-central checkout
+
+# LOCALIZATION NOTE (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
+# an invalid srcdir.
+toolsSrcdirNotFound=%1$s does not exist or is not a mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
+# 'tools srcdir' command.
+toolsSrcdirReloaded=Tools loaded from %1$s.
+
+# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
+# command. The argument (%1$S) is the browser name.
+toolsSrcdirManual2=Load the %1$S Developer Tools from a complete mozilla-central checkout.
+
+# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
+toolsSrcdirDir=A mozilla-central checkout
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
+# command, which overrides a previous 'tools srcdir' command.
+toolsBuiltinDesc=Use the builtin tools
+
+# LOCALIZATION NOTE (toolsBuiltinDesc) A fuller description of the 'tools builtin'
+# command.
+toolsBuiltinManual=Use the builtin tools, overriding any previous srcdir command.
+
+# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
+# 'tools builtin' command.
+toolsBuiltinReloaded=Builtin tools loaded.
+
+# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
+# which will reload the tools from the current srcdir.
+toolsReloadDesc=Reload the developer tools
+
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
+# reload' command.
+toolsReloaded2=Tools reloaded.
+
 # LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
 # command. See cookieManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 cookieDesc=Display and alter cookies
 
 # LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
 # command, displayed when the user asks for help on what it does.
@@ -834,25 +891,26 @@ cookieSetHttpOnlyDesc=Not accessible fro
 # 'session' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetSessionDesc=Only valid for the lifetime of the browser session
 
 # LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
 # 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
 # when the user is using this command.
 cookieSetExpiresDesc=The expiry date of the cookie (quoted RFC2822 or ISO 8601 date)
+
 # LOCALIZATION NOTE (jsbDesc) A very short description of the
 # 'jsb' 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.
 jsbDesc=Javascript beautifier
 
 # LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
 # 'jsb <url>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=The URL of the JS file to prettify
+jsbUrlDesc=The URL of the JS file to beautify
 
 # LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
 # 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 jsbIndentSizeDesc=Indentation size in chars
 
 # LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
 # 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
@@ -1057,16 +1115,91 @@ paintflashingChromeDesc=chrome frames
 # LOCALIZATION NOTE (paintflashingManual) A longer description describing the
 # set of commands that control paint flashing.
 paintflashingManual=Draw repainted areas in different colours
 
 # LOCALIZATION NOTE (paintflashingTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which toggles paint flashing.
 paintflashingTooltip=Highlight painted area
 
+# LOCALIZATION NOTE (paintflashingOnDesc) A very short string used to describe the
+# function of the "paintflashing on" command.
+paintflashingToggleDesc=Toggle paint flashing
+
+# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
+# function of the "appcache" command
+appCacheDesc=Application cache utilities
+
+# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
+# the function of the "appcache validate" command.
+appCacheValidateDesc=Validate cache manifest
+
+# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
+# 'validate' parameter to the 'appcache' command, displayed when the user asks
+# for help on what it does.
+appCacheValidateManual=Find issues relating to a cache manifest and the files that it references
+
+# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
+# the function of the "uri" parameter of the appcache validate" command.
+appCacheValidateUriDesc=URI to check
+
+# LOCALIZATION NOTE (appCacheValidated) Displayed by the "appcache validate"
+# command when it has been successfully validated.
+appCacheValidatedSuccessfully=Appcache validated successfully.
+
+# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
+# the function of the "appcache clear" command.
+appCacheClearDesc=Clear entries from the application cache
+
+# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
+# 'appcache clear' command, displayed when the user asks for help on what it does.
+appCacheClearManual=Clear one or more entries from the application cache
+
+# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
+# command when entries are successfully cleared.
+appCacheClearCleared=Entries cleared successfully.
+
+# LOCALIZATION NOTE (AppCacheListDesc) A very short string used to describe
+# the function of the "appcache list" command.
+appCacheListDesc=Display a list of application cache entries.
+
+# LOCALIZATION NOTE (AppCacheListManual) A fuller description of the
+# 'appcache list' command, displayed when the user asks for help on what it does.
+appCacheListManual=Display a list of all application cache entries. If the search parameter is used then the table displays the entries containing the search term.
+
+# LOCALIZATION NOTE (AppCacheListSearchDesc) A very short string used to describe
+# the function of the "search" parameter of the appcache list" command.
+appCacheListSearchDesc=Filter results using a search term.
+
+# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
+appCacheListKey=Key:
+appCacheListDataSize=Data size:
+appCacheListDeviceID=Device ID:
+appCacheListExpirationTime=Expires:
+appCacheListFetchCount=Fetch count:
+appCacheListLastFetched=Last fetched:
+appCacheListLastModified=Last modified:
+
+# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
+# of the 'appcache list' command.
+appCacheListViewEntry=View Entry
+
+# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
+# the function of the "appcache viewentry" command.
+appCacheViewEntryDesc=Open a new tab containing the specified cache entry information.
+
+# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
+# 'appcache viewentry' command, displayed when the user asks for help on what it
+# does.
+appCacheViewEntryManual=Open a new tab containing the specified cache entry information.
+
+# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
+# the function of the "key" parameter of the 'appcache viewentry' command.
+appCacheViewEntryKey=The key for the entry to display.
+
 # LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
 # function of the profiler command.
 profilerDesc=Manage profiler
 
 # LOCALIZATION NOTE (profilerManual) A longer description describing the
 # set of commands that control the profiler.
 profilerManual=Commands to start or stop a JavaScript profiler
 
@@ -1109,21 +1242,45 @@ profilerAlreadyFinished=This profile has
 # an operation cannot be completed because the profile in question could not be
 # found.
 profilerNotFound=Profile not found
 
 # LOCALIZATION NOTE (profilerNotStarted) A message that is displayed whenever
 # an operation cannot be completed because the profile in question has not been
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
-profilerNotStarted=This profile has not been started yet. Use 'profile start' to start profliling
+profilerNotStarted2=This profile has not been started yet. Use 'profile start' to start profiling
 
 # LOCALIZATION NOTE (profilerStarting) A very short string that indicates that
 # we're starting the profiler.
-profilerStarting=Starting...
+profilerStarting2=Starting…
 
 # LOCALIZATION NOTE (profilerStopping) A very short string that indicates that
 # we're stopping the profiler.
-profilerStopping=Stopping...
+profilerStopping2=Stopping…
 
 # LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
 # an operation cannot be completed because the profiler has not been opened yet.
 profilerNotReady=For this command to work you need to open the profiler first
+
+# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
+# function of the 'listen' command.
+listenDesc=Open a remote debug port
+
+# LOCALIZATION NOTE (listenManual) A longer description of the 'listen'
+# command.
+listenManual=Firefox can allow remote debugging over a TCP/IP connection. For security reasons this is turned off by default, but can be enabled using this command.
+
+# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
+# function of 'port' parameter to the 'listen' command.
+listenPortDesc=The TCP port to listen on
+
+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenDisabledOutput=Listen is disabled by the devtools.debugger.remote-enabled preference
+
+# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
+# execution of the 'listen' command. %1$S is a port number
+listenInitOutput=Listening on port %1$S
+
+# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
+# execution of the 'listen' command.
+listenNoInitOutput=DebuggerServer not initialised
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -0,0 +1,134 @@
+<!-- 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.emptyNotice): This is the label displayed
+  -  in the network table when empty. -->
+<!ENTITY netmonitorUI.emptyNotice         "Reload the page to see detailed information about network activity.">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.toolbar.status): This is the label displayed
+  -  in the network table toolbar, above the "status" column. -->
+<!ENTITY netmonitorUI.toolbar.status      "√">
+
+<!-- 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.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:">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/netmonitor.properties
@@ -0,0 +1,118 @@
+# 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 Network Monitor
+# which is available from the Web Developer sub-menu -> 'Network Monitor'.
+# 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 (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.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.
+collapseDetailsPane=Hide request details
+
+# LOCALIZATION NOTE (expandDetailsPane): This is the tooltip for the button
+# that expands the network details pane in the UI.
+expandDetailsPane=Show request details
+
+# LOCALIZATION NOTE (headersEmptyText): This is the text displayed in the
+# headers tab of the network details pane when there are no headers available.
+headersEmptyText=No headers for this request
+
+# LOCALIZATION NOTE (headersFilterText): This is the text displayed in the
+# headers tab of the network details pane for the filtering input.
+headersFilterText=Filter headers
+
+# LOCALIZATION NOTE (cookiesEmptyText): This is the text displayed in the
+# cookies tab of the network details pane when there are no cookies available.
+cookiesEmptyText=No cookies for this request
+
+# LOCALIZATION NOTE (cookiesFilterText): This is the text displayed in the
+# cookies tab of the network details pane for the filtering input.
+cookiesFilterText=Filter cookies
+
+# LOCALIZATION NOTE (paramsEmptyText): This is the text displayed in the
+# params tab of the network details pane when there are no params available.
+paramsEmptyText=No parameters for this request
+
+# LOCALIZATION NOTE (paramsFilterText): This is the text displayed in the
+# params tab of the network details pane for the filtering input.
+paramsFilterText=Filter request parameters
+
+# LOCALIZATION NOTE (paramsQueryString): This is the label displayed
+# in the network details params tab identifying the query string.
+paramsQueryString=Query string
+
+# LOCALIZATION NOTE (paramsFormData): This is the label displayed
+# in the network details params tab identifying the form data.
+paramsFormData=Form data
+
+# LOCALIZATION NOTE (paramsPostPayload): This is the label displayed
+# in the network details params tab identifying the request payload.
+paramsPostPayload=Request payload
+
+# LOCALIZATION NOTE (requestHeaders): This is the label displayed
+# in the network details headers tab identifying the request headers.
+requestHeaders=Request headers
+
+# LOCALIZATION NOTE (responseHeaders): This is the label displayed
+# in the network details headers tab identifying the response headers.
+responseHeaders=Response headers
+
+# LOCALIZATION NOTE (requestCookies): This is the label displayed
+# in the network details params tab identifying the request cookies.
+requestCookies=Request cookies
+
+# LOCALIZATION NOTE (responseCookies): This is the label displayed
+# in the network details params tab identifying the response cookies.
+responseCookies=Response cookies
+
+# LOCALIZATION NOTE (jsonFilterText): This is the text displayed
+# in the response tab of the network details pane for the JSON filtering input.
+jsonFilterText=Filter properties
+
+# LOCALIZATION NOTE (jsonScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSON scope.
+jsonScopeName=JSON
+
+# LOCALIZATION NOTE (jsonpScopeName): This is the text displayed
+# in the response tab of the network details pane for a JSONP scope.
+jsonpScopeName=JSONP → callback %S()
+
+# LOCALIZATION NOTE (networkMenu.sortedAsc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted ascending.
+networkMenu.sortedAsc=Sorted ascending
+
+# LOCALIZATION NOTE (networkMenu.sortedDesc): This is the tooltip displayed
+# in the network table toolbar, for any column that is sorted descending.
+networkMenu.sortedDesc=Sorted descending
+
+# LOCALIZATION NOTE (networkMenu.sizeKB): This is the label displayed
+# in the network menu specifying the size of a request (in kilobytes).
+networkMenu.sizeKB=%S KB
+
+# LOCALIZATION NOTE (networkMenu.totalMS): This is the label displayed
+# in the network menu specifying the time for a request to finish (in milliseconds).
+networkMenu.totalMS=→ %S ms
+
+# LOCALIZATION NOTE (networkMenu.divisionMS): This is the label displayed
+# in the network menu specifying timing interval divisions (in milliseconds).
+networkMenu.divisionMS=%S ms
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -10,19 +10,19 @@
 # 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
 # displayed inside the developer tools window and in the Developer Tools Menu.
 profiler.label=Profiler
 
-# LOCALIZATION NOTE (profiler.commandkey, profiler.accesskey)
+# LOCALIZATION NOTE (profiler2.commandkey, profiler.accesskey)
 # Used for the menuitem in the tool menu
-profiler.commandkey=Y
+profiler2.commandkey=VK_F5
 profiler.accesskey=P
 
 # LOCALIZATION NOTE (profiler.tooltip):
 # This string is displayed in the tooltip of the tab when the profiler is
 # displayed inside the developer tools window.
 profiler.tooltip=Profiler
 
 # LOCALIZATION NOTE (profiler.profileName):
--- a/browser/chrome/browser/devtools/scratchpad.properties
+++ b/browser/chrome/browser/devtools/scratchpad.properties
@@ -6,22 +6,16 @@
 # which is available from the Web Developer sub-menu -> 'Scratchpad'.
 #
 # 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  (propertyPanel.updateButton.label): Used in the Property
-# Panel that is opened by the Scratchpad window when inspecting an object. This
-# is the Update button label.
-propertyPanel.updateButton.label=Update
-propertyPanel.updateButton.accesskey=U
-
 # LOCALIZATION NOTE  (export.fileOverwriteConfirmation): This is displayed when
 # the user attempts to save to an already existing file.
 export.fileOverwriteConfirmation=File exists. Overwrite?
 
 # LOCALIZATION NOTE  (browserWindow.unavailable): This error message is shown
 # when Scratchpad does not find any recently active window of navigator:browser
 # type.
 browserWindow.unavailable=Scratchpad cannot find any browser window to execute the code in.
--- a/browser/chrome/browser/devtools/styleeditor.dtd
+++ b/browser/chrome/browser/devtools/styleeditor.dtd
@@ -5,54 +5,37 @@
 <!-- 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. -->
 
-<!-- LOCALIZATION NOTE (window.title): This is the default title for Style Editor
-     main window. NB: the property chromeWindowTitle in styleeditor.properties
-     is used to dynamically update the Style Editor window title with the title
-     of the web page it is editing. -->
-<!ENTITY window.title               "Style Editor">
-
 <!ENTITY newButton.label            "New">
 <!ENTITY newButton.tooltip          "Create and append a new style sheet to the document">
 <!ENTITY newButton.accesskey        "N">
-<!ENTITY newButton.commandkey       "n">
 
 <!ENTITY importButton.label         "Import…">
 <!ENTITY importButton.tooltip       "Import and append an existing style sheet to the document">
 <!ENTITY importButton.accesskey     "I">
-<!ENTITY importButton.commandkey    "i">
 
 <!ENTITY visibilityToggle.tooltip   "Toggle style sheet visibility">
-<!ENTITY visibilityToggle.accesskey "V">
 
 <!ENTITY saveButton.label           "Save">
 <!ENTITY saveButton.tooltip         "Save this style sheet to a file">
 <!ENTITY saveButton.accesskey       "S">
-<!ENTITY saveButton.commandkey      "s">
-
-<!-- LOCALICATION NOTE  (scoped.label): This is shown in a stylesheets list item
-     when the stylesheet uses the scoped attribute on the <style> element. -->
-<!ENTITY scoped.label               "Scoped.">
 
 <!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    "?">
-
-<!-- LOCALIZATION NOTE  (closeCmd.key): Accel + this key closes the window. -->
-<!ENTITY closeCmd.key                  "W">
--- a/browser/chrome/browser/devtools/styleeditor.properties
+++ b/browser/chrome/browser/devtools/styleeditor.properties
@@ -20,17 +20,17 @@ chromeWindowTitle=Style Editor [%S]
 # the argument is the index (order) of the containing <style> element in the
 # document.
 inlineStyleSheet=<inline style sheet #%S>
 
 # LOCALIZATION NOTE  (newStyleSheet): This is the default name for a new
 # user-created style sheet.
 newStyleSheet=New style sheet #%S
 
-# LOCALIZATION NOTE  (ruleCount.label): Semi-colon list of plural forms.
+# 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.
 error-load=Style sheet could not be loaded.
@@ -59,26 +59,16 @@ open.commandkey=VK_F7
 # LOCALIZATION NOTE (open.accesskey): The access key used to open the style
 # editor.
 open.accesskey=y
 
 # 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  (undo.commandkey): This the key to use in
-# conjunction with accel (Command on Mac or Ctrl on other platforms) to Undo a
-# change in the editor.
-undo.commandkey=Z
-
-# LOCALIZATION NOTE  (redo.commandkey): This the key to use in
-# conjunction with accel+shift (accel is Command on Mac or Ctrl on other
-# platforms) to Redo a change in the editor.
-redo.commandkey=Z
-
 # LOCALIZATION NOTE (ToolboxStyleEditor.label):
 # This string is displayed in the title of the tab when the debugger is
 # displayed inside the developer tools window and in the Developer Tools Menu.
 ToolboxStyleEditor.label=Style Editor
 
 # LOCALIZATION NOTE (ToolboxStyleEditor.tooltip):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -1,7 +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 Toolbox strings -->
+<!-- LOCALIZATION NOTE : FILE Do not translate key -->
+
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip  "Close Developer Tools">
+<!ENTITY toolboxOptionsButton.key      "O">
+
+<!-- LOCALIZATION NOTE (options.context.label): This is the label for the
+  -  heading of the group of two about:config preferences to toggle chrome
+  -  and remote debugging in the options panel. -->
+<!ENTITY options.context.label         "Advanced settings (requires a browser restart)">
+
+<!-- LOCALIZATION NOTE (options.enableChrome.label): 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.label    "Enable chrome debugging">
+<!ENTITY options.enableChrome.tooltip  "Turning this option on will allow you to use various developer tools in browser context">
+
+<!-- LOCALIZATION NOTE (options.enableRemote.label): 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.label    "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.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.selectDefaultTools.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.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:">
+<!ENTITY options.darkTheme.label             "Dark theme">
+<!ENTITY options.lightTheme.label            "Light theme">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -1,36 +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/.
-
-toolboxDockButtons.bottom.tooltip=Dock to bottom of browser window
-toolboxDockButtons.side.tooltip=Dock to side of browser window
-toolboxDockButtons.window.tooltip=Show in separate window
-
-# LOCALIZATION NOTE (toolboxToggleButton.errors): Semi-colon list of plural
-# forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of errors in the current web page
-toolboxToggleButton.errors=#1 error;#1 errors
-
-# LOCALIZATION NOTE (toolboxToggleButton.warnings): Semi-colon list of plural
-# forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of warnings in the current web page
-toolboxToggleButton.warnings=#1 warning;#1 warnings
-
-# LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
-# as tooltip in the developer toolbar to open/close the developer tools.
-# It's using toolboxToggleButton.errors as first and
-# toolboxToggleButton.warnings as second argument to show the number of errors
-# and warnings.
-toolboxToggleButton.tooltip=%1$S, %2$S\nClick to toggle the developer tools.
-
-# LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
-# used to format the title of the toolbox.
-# The name of the selected tool: %1$S.
-# The url of the page being tooled: %2$S.
-toolbox.titleTemplate=%1$S - %2$S
-
-# LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
-# name when no tool is selected.
-toolbox.defaultTitle=Developer Tools
+# 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/.
+
+toolboxDockButtons.bottom.tooltip=Dock to bottom of browser window
+toolboxDockButtons.side.tooltip=Dock to side of browser window
+toolboxDockButtons.window.tooltip=Show in separate window
+
+# LOCALIZATION NOTE (toolboxToggleButton.errors): Semi-colon list of plural
+# forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of errors in the current web page
+toolboxToggleButton.errors=#1 error;#1 errors
+
+# LOCALIZATION NOTE (toolboxToggleButton.warnings): Semi-colon list of plural
+# forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of warnings in the current web page
+toolboxToggleButton.warnings=#1 warning;#1 warnings
+
+# LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
+# as tooltip in the developer toolbar to open/close the developer tools.
+# It's using toolboxToggleButton.errors as first and
+# toolboxToggleButton.warnings as second argument to show the number of errors
+# and warnings.
+toolboxToggleButton.tooltip=%1$S, %2$S\nClick to toggle the developer tools.
+
+# LOCALIZATION NOTE (toolbox.titleTemplate): This is the template
+# used to format the title of the toolbox.
+# The name of the selected tool: %1$S.
+# The url of the page being tooled: %2$S.
+toolbox.titleTemplate=%1$S - %2$S
+
+# LOCALIZATION NOTE (toolbox.defaultTitle): This is used as the tool
+# name when no tool is selected.
+toolbox.defaultTitle=Developer Tools
+
+# LOCALIZATION NOTE (optionsButton.tooltip): This is used as the tooltip
+# for the optiosn panel tab.
+optionsButton.tooltip=Toolbox Options
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -4,16 +4,17 @@
 
 <!-- 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">
 <!ENTITY networkPanel.requestCookie               "Sent Cookie">
 <!ENTITY networkPanel.requestBody                 "Request Body">
@@ -43,36 +44,40 @@
   -  This string and the following strings toggle various kinds of output
   -  filters. -->
 <!ENTITY btnPageNet.label   "Net">
 <!ENTITY btnPageNet.tooltip "Log network access">
 <!ENTITY btnPageCSS.label   "CSS">
 <!ENTITY btnPageCSS.tooltip "Log CSS parsing errors">
 <!ENTITY btnPageJS.label    "JS">
 <!ENTITY btnPageJS.tooltip  "Log JavaScript exceptions">
+<!ENTITY btnPageSecurity.label "Security">
+<!ENTITY btnPageSecurity.tooltip "Log security errors and warnings">
 
 <!-- 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 btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Info">
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
 
-<!ENTITY filterBox.placeholder "Filter">
+<!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 <!ENTITY fullZoomEnlargeCmd.commandkey3 "">
 
 <!ENTITY fullZoomReduceCmd.commandkey   "-">
 <!ENTITY fullZoomReduceCmd.commandkey2  "">
 
 <!ENTITY fullZoomResetCmd.commandkey    "0">
 <!ENTITY fullZoomResetCmd.commandkey2   "">
 
 <!ENTITY copyURLCmd.label     "Copy Link Location">
 <!ENTITY copyURLCmd.accesskey "a">
+
+<!ENTITY closeCmd.key  "W">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -29,38 +29,17 @@ 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 FOR `jsPropertyTitle` AND `jsPropertyInspectTitle`:
-#
-# The "PropertyPanel" is used to display a JS object to the user.
-# If it is clear which object is being inspected (e.g., window, document object)
-# the title of the panel is based on the `jsPropertyInspectTitle` string.
-# If it isn't clear which object is being inspected, the `jsPropertyTitle` string
-# gets used. This can be the case when the user logs an object to the WebConsole
-# output using the console.log(aObjectToInspect) method.
-#
-# You can find a screenshot of the PropertyPanel here:
-#   https://bug585030.bugzilla.mozilla.org/attachment.cgi?id=464034
-jsPropertyTitle=Object Inspector
-# LOCALIZATION NOTE (jsPropertyInspectTitle):
-#
-# The %S is replaced by the evaluated code the user clicked on in the console.
-#
-# Example: The user executed `window.document` in the WebConsole. The `document`
-# object is written to the output. If the user clicks on the `document` output
-# in the console, a PropertyPanel will show up. The title of the PropertyPanel
-# is set to `Inspect: window.document` because the clicked `document` object was
-# evaluated based on the `window.document` string.
-jsPropertyInspectTitle=Inspect: %S
+
 # LOCALIZATION NOTE (timestampFormat): %1$02S = hours (24-hour clock),
 # %2$02S = minutes, %3$02S = seconds, %4$03S = milliseconds.
 timestampFormat=%02S:%02S:%02S.%03S
 
 helperFuncUnsupportedTypeError=Can't call print on this type of object.
 NetworkPanel.label=Inspect Network Request
 # LOCALIZATION NOTE (NetworkPanel.deltaDurationMS):
 #
@@ -159,32 +138,39 @@ remoteWebConsoleSelectTabTitle=Tab list 
 # 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.
 listTabs.globalConsoleActor=*Global Console*
 
-# LOCALIZATION NOTE (ToolboxWebconsole.label):
-# This string is displayed in the title of the tab when the web console is
-# displayed inside the developer tools window it is probably the same string
-# as webConsoleWindowTitleAndURL before the '-'
-ToolboxWebconsole.label=Web Console
+# LOCALIZATION NOTE (MenuWebconsole.label):
+# This string is displayed in the Tools menu as a shortcut to open the devtools
+# with the web console tab selected.
+MenuWebconsole.label=Web Console
+
+# LOCALIZATION NOTE (ToolboxTabWebconsole.label):
+# This string is displayed as the label of the tab in the devtools window.
+ToolboxTabWebconsole.label=Console
 
 # LOCALIZATION NOTE (ToolboxWebconsole.tooltip):
 # This string is displayed in the tooltip of the tab when the web console is
 # displayed inside the developer tools window.
 ToolboxWebconsole.tooltip=Web Console
 
 # LOCALIZATION NOTE (longStringEllipsis): The string displayed after a long
 # string. This string is clickable such that the rest of the string is retrieved
 # from the server.
 longStringEllipsis=[…]
 
+# LOCALIZATION NOTE (longStringTooLong): The string displayed after the user
+# tries to expand a long string.
+longStringTooLong=The string you are trying to view is too long to be displayed by the Web Console.
+
 # LOCALIZATION NOTE (executeEmptyInput): This is displayed when the user tries
 # to execute code, but the input is empty.
 executeEmptyInput=No value to execute.
 
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingResponseContentLink): This is
 # displayed in the network panel when the response body is only partially
 # available.
 NetworkPanel.fetchRemainingResponseContentLink=Fetch the remaining %1$S bytes
@@ -192,8 +178,16 @@ NetworkPanel.fetchRemainingResponseConte
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): This is
 # displayed in the network panel when the request body is only partially
 # available.
 NetworkPanel.fetchRemainingRequestContentLink=Fetch the request body (%1$S bytes)
 
 # LOCALIZATION NOTE (connectionTimeout): Message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout=Connection timeout. Check the Error Console on both ends for potential error messages. Reopen the Web Console to try again.
+
+# LOCALIZATION NOTE (propertiesFilterPlaceholder): This is the text that
+# appears in the filter text box for the properties view container.
+propertiesFilterPlaceholder=Filter properties
+
+# LOCALIZATION NOTE (emptyPropertiesList): The text that is displayed in the
+# properties pane when there are no properties to display.
+emptyPropertiesList=No properties to display
--- a/browser/chrome/browser/migration/migration.properties
+++ b/browser/chrome/browser/migration/migration.properties
@@ -10,16 +10,18 @@ sourceNameSafari=Safari
 sourceNameChrome=Google Chrome
 sourceNameFirefox=Mozilla Firefox
 
 importedBookmarksFolder=From %S
 
 importedSafariReadingList=Reading List (From Safari)
 
 # Import Sources
+# Note: When adding an import source for profile reset, add the string name to
+# resetProfile.js if it should be listed in the reset dialog.
 1_ie=Internet Options
 1_safari=Preferences
 1_chrome=Preferences
 
 2_ie=Cookies
 2_safari=Cookies
 2_chrome=Cookies
 2_firefox=Cookies
@@ -41,9 +43,9 @@ 16_firefox=Saved Passwords
 
 32_ie=Favourites
 32_safari=Bookmarks
 32_chrome=Bookmarks
 
 64_ie=Other Data
 64_safari=Other Data
 64_chrome=Other Data
-64_firefox=Bookmarks Backups
+64_firefox_other=Other Data
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -61,17 +61,17 @@
 <!ENTITY  permImage             "Load Images">
 <!ENTITY  permPopup             "Open Popup Windows">
 <!ENTITY  permCookie            "Set Cookies">
 <!ENTITY  permNotifications     "Show Notifications">
 <!ENTITY  permInstall           "Install Extensions or Themes">
 <!ENTITY  permGeo               "Share Location">
 <!ENTITY  permPlugins           "Activate Plugins">
 <!ENTITY  permFullscreen        "Enter Fullscreen">
-<!ENTITY  permPointerLock       "Hide the Pointer">
+<!ENTITY  permPointerLock2      "Hide the Mouse Pointer">
 
 <!ENTITY  permIndexedDB              "Maintain Offline Storage">
 <!ENTITY  permClearStorage           "Clear Storage">
 <!ENTITY  permClearStorage.accesskey "C">
 
 <!ENTITY  securityTab           "Security">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityHeader        "Security information for this page">
deleted file mode 100644
--- a/browser/chrome/browser/preferences/advanced-scripts.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY advancedJSDialog.title         "Advanced JavaScript Settings">
-<!ENTITY window.width                   "37em">
-
-<!ENTITY allowScripts.label             "Allow scripts to:">
-
-<!ENTITY moveResizePopupWindows.label     "Move or resize popup windows">
-<!ENTITY moveResizePopupWindows.accesskey "M">
-<!ENTITY raiseLowerWindows.label        "Raise or lower windows">
-<!ENTITY raiseLowerWindows.accesskey    "R">
-<!ENTITY disableContextMenus.label      "Disable or replace context menus">
-<!ENTITY disableContextMenus.accesskey  "D">
--- a/browser/chrome/browser/preferences/advanced.dtd
+++ b/browser/chrome/browser/preferences/advanced.dtd
@@ -110,24 +110,17 @@
 <!ENTITY offlineNotifyExceptions.accesskey "E">
 
 <!ENTITY offlineAppsList2.label          "The following web sites are allowed to store data for offline use:">
 <!ENTITY offlineAppsList.height          "7em">
 <!ENTITY offlineAppsListRemove.label     "Remove…">
 <!ENTITY offlineAppsListRemove.accesskey "R">
 <!ENTITY offlineAppRemove.confirm        "Remove offline data">
 
-<!ENTITY encryptionTab.label             "Encryption">
-
-<!ENTITY protocols.label                 "Protocols">
-<!ENTITY useSSL3.label                   "Use SSL 3.0">
-<!ENTITY useSSL3.accesskey               "3">
-<!ENTITY useTLS1.label                   "Use TLS 1.0">
-<!ENTITY useTLS1.accesskey               "1">
-<!ENTITY certificates.label              "Certificates">
+<!ENTITY certificateTab.label            "Certificates">
 <!ENTITY certSelection.description       "When a server requests my personal certificate:">
 <!ENTITY certs.auto                      "Select one automatically">
 <!ENTITY certs.auto.accesskey            "S">
 <!ENTITY certs.ask                       "Ask me every time">
 <!ENTITY certs.ask.accesskey             "A">
 <!ENTITY viewCerts.label                 "View Certificates">
 <!ENTITY viewCerts.accesskey             "C">
 <!ENTITY viewCRLs.label                  "Revocation Lists">
--- a/browser/chrome/browser/preferences/content.dtd
+++ b/browser/chrome/browser/preferences/content.dtd
@@ -2,36 +2,22 @@
    - 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  blockPopups.label           "Block popup windows">
 <!ENTITY  blockPopups.accesskey       "B">
 <!ENTITY  popupExceptions.label       "Exceptions…">
 <!ENTITY  popupExceptions.accesskey   "E">
 
-<!ENTITY  loadImages.label            "Load images automatically">
-<!ENTITY  loadImages.accesskey        "L">
-<!ENTITY  exceptions.label            "Exceptions…">
-<!ENTITY  exceptions.accesskey        "x">
-
-<!ENTITY  enableJavaScript.label      "Enable JavaScript">
-<!ENTITY  enableJavaScript.accesskey  "S">
-<!ENTITY  advancedJS.label            "Advanced…">
-<!ENTITY  advancedJS.accesskey        "v">
-
-<!ENTITY  enableJava.label            "Enable Java">
-<!ENTITY  enableJava.accesskey        "n">
-
-
 <!ENTITY  fontsAndColors.label        "Fonts &amp; Colours">
 
 <!ENTITY  defaultFont.label           "Default font:">
 <!ENTITY  defaultFont.accesskey       "D">
 <!ENTITY  defaultSize.label           "Size:">
-<!ENTITY  defaultSize.accesskey       "z">
+<!ENTITY  defaultSize.accesskey       "S">
 
 <!ENTITY  advancedFonts.label         "Advanced…">
 <!ENTITY  advancedFonts.accesskey     "A">
 
 <!ENTITY  colors.label                "Colours…">
 <!ENTITY  colors.accesskey            "C">
 
 
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -16,18 +16,16 @@ labelDefaultFont=Default (%S)
 #### Permissions Manager
 
 cookiepermissionstext=You can specify which web sites are always or never allowed to use cookies.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle=Exceptions - Cookies
 addonspermissionstext=You can specify which web sites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
 addons_permissions_title=Allowed Sites - Add-ons Installation
 popuppermissionstext=You can specify which web sites are allowed to open popup windows. Type the exact address of the site you want to allow and then click Allow.
 popuppermissionstitle=Allowed Sites - Popups
-imagepermissionstext=You can specify which web sites are allowed to load images. Type the exact address of the site you want to manage and then click Block or Allow.
-imagepermissionstitle=Exceptions - Images
 invalidURI=Please enter a valid hostname
 invalidURITitle=Invalid Hostname Entered
 
 #### Master Password
 
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
 pw_change_failed_title=Password Change Failed
 
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -6,19 +6,16 @@
 <!ENTITY newWindowsAsTabs.accesskey   "n">
 
 <!ENTITY warnCloseMultipleTabs.label  "Warn me when closing multiple tabs">
 <!ENTITY warnCloseMultipleTabs.accesskey  "c">
 
 <!ENTITY warnOpenManyTabs.label       "Warn me when opening multiple tabs might slow down &brandShortName;">
 <!ENTITY warnOpenManyTabs.accesskey   "o">
 
-<!ENTITY showTabBar.label             "Always show the tab bar">
-<!ENTITY showTabBar.accesskey         "A">
-
 <!ENTITY restoreTabsOnDemand.label        "Don’t load tabs until selected">
 <!ENTITY restoreTabsOnDemand.accesskey    "D">
 
 <!ENTITY switchToNewTabs.label        "When I open a link in a new tab, switch to it immediately">
 <!ENTITY switchToNewTabs.accesskey    "W">
 
 <!ENTITY showTabsInTaskbar.label          "Show tab previews in the Windows taskbar">
 <!ENTITY showTabsInTaskbar.accesskey      "S">
--- a/browser/chrome/browser/quitDialog.properties
+++ b/browser/chrome/browser/quitDialog.properties
@@ -2,11 +2,11 @@
 # 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/.
 
 quitDialogTitle=Quit %S
 
 quitTitle=&Quit
 cancelTitle=&Cancel
 saveTitle=&Save and Quit
-neverAsk=Do not ask next time
+neverAsk2=&Do not ask next time
 message=Do you want %S to save your tabs and windows for the next time it starts?
 messageNoWindows=Do you want %S to save your tabs for the next time it starts?
deleted file mode 100644
--- a/browser/feedback/main.dtd
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY testpilot.brand.label                      "Test Pilot">
-<!ENTITY testpilot.settings.label                   "Settings">
-<!ENTITY testpilot.settings.dataSubmission.label    "Data Submission">
-<!ENTITY testpilot.settings.notifications.label     "Notifications">
-<!ENTITY testpilot.settings.notifyWhen.label        "Notify me when…">
-<!ENTITY testpilot.settings.readyToSubmit.label     "A study is ready to submit">
-<!ENTITY testpilot.settings.newStudy.label          "There's a new study">
-<!ENTITY testpilot.settings.hasNewResults.label     "A study has new results">
-<!ENTITY testpilot.settings.alwaysSubmitData.label  "Automatically submit my data (don't ask me)">
-<!ENTITY testpilot.allYourStudies.label             "All Your User Studies…">
-<!ENTITY testpilot.about.label                      "About Test Pilot">
-
-<!-- all studies window -->
-<!ENTITY testpilot.studiesWindow.title                  "Your Test Pilot Studies">
-<!ENTITY testpilot.studiesWindow.currentStudies.label   "Current Studies">
-<!ENTITY testpilot.studiesWindow.finishedStudies.label  "Finished Studies">
-<!ENTITY testpilot.studiesWindow.studyFindings.label    "Study Findings">
-<!ENTITY testpilot.studiesWindow.settings.label         "Settings">
-<!ENTITY testpilot.studiesWindow.stillLoadingMessage    "Loading, please wait…">
-
-<!-- raw data dialog -->
-<!ENTITY testpilot.rawDataWindow.title                  "Test Pilot: Raw Data">
-
-<!-- notification -->
-<!ENTITY testpilot.notification.close.tooltip            "Close">
-
-<!-- Firefox 4 beta version UI -->
-<!ENTITY testpilot.enable.label                        "Turn On User Studies">
-<!ENTITY testpilot.feedbackbutton.label                "Feedback">
-<!ENTITY testpilot.happy.label        "Firefox Made Me Happy Because…">
-<!ENTITY testpilot.sad.label          "Firefox Made Me Sad Because…">
-<!ENTITY testpilot.broken.label      "Report this website as broken…">
-<!ENTITY testpilot.idea.label        "Give us a suggestion…">
deleted file mode 100644
--- a/browser/feedback/main.properties
+++ /dev/null
@@ -1,102 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# description for add-on manager
-extensions.testpilot@labs.mozilla.com.description = Help make Firefox better by running user studies.
-
-# common
-testpilot.fullBrandName = Mozilla Labs Test Pilot
-testpilot.moreInfo = More Info
-testpilot.submit = Submit
-testpilot.takeSurvey = Take the Survey
-
-# Feedback button menu
-testpilot.turnOn = Turn On User Studies
-testpilot.turnOff = Turn Off User Studies
-
-# studies window
-testpilot.studiesWindow.noStudies = We are working on a new study now; it will knock on your door soon! Stay Tuned!
-testpilot.studiesWindow.uploading = Uploading…
-testpilot.studiesWindow.unableToReachServer = Unable to reach Mozilla; please try again later.
-testpilot.studiesWindow.thanksForContributing = Thanks for contributing!
-testpilot.studiesWindow.finishedOn = Finished on %S
-testpilot.studiesWindow.canceledStudy = (You cancelled this study)
-testpilot.studiesWindow.missedStudy = (You missed this study)
-testpilot.studiesWindow.willStart = Will start on %S
-testpilot.studiesWindow.gatheringData = Currently gathering data.
-testpilot.studiesWindow.willFinish = Will finish on %S
-testpilot.studiesWindow.proposeStudy = Propose your own study
-
-# for pages
-testpilot.page.commentsAndDiscussions = Comments & Discussions »
-testpilot.page.proposeATest = Propose a Test »
-testpilot.page.testpilotOnTwitter = @MozTestPilot on Twitter »
-
-# status page
-testpilot.statusPage.uploadingData = Now uploading data…
-testpilot.statusPage.uploadErrorMsg = Oops! There was an error connecting to the Mozilla servers.  Maybe your network connection is down?
-testpilot.statusPage.willRetry = Test Pilot will retry automatically, so it's OK to close this page now.
-testpilot.statusPage.endedAlready = (It has already ended and you should not be seeing this page)
-testpilot.statusPage.todayAt =  today, at %S
-testpilot.statusPage.endOn = on %S
-# LOCALIZATION NOTE (numExtensions): Semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 = number of extensions
-# example: "2 extensions"
-testpilot.statusPage.numExtensions = #1 extension;#1 extensions
-testpilot.statusPage.recursEveryNumberOfDays = This test recurs every %S days. Each time it completes:
-testpilot.statusPage.askMeBeforeSubmitData = Ask me whether I want to submit my data.
-testpilot.statusPage.alwaysSubmitData = Always submit my data, and don't ask me about it.
-testpilot.statusPage.neverSubmitData = Never submit my data, and don't ask me about it.
-testpilot.statusPage.loading = Loading, please wait a moment…
-
-# quit page
-testpilot.quitPage.aboutToQuit = You are about to quit the "%S" study.
-testpilot.quitPage.optionalMessage = (Optional) If you have a minute, please let us know why you have chosen to quit the study.
-testpilot.quitPage.reason = Reason:
-testpilot.quitPage.recurringStudy = This is a recurring study. Normally we will let you know the next time we run the study.  If you never want to hear about this study again, tick the box below:
-testpilot.quitPage.quitForever = Quit this recurring study.
-testpilot.quitPage.quitStudy = Quit the Study »
-
-# welcome page
-testpilot.welcomePage.thankYou = Thank You for Joining the Test Pilot Team!
-testpilot.welcomePage.gettingStarted = Getting Started
-testpilot.welcomePage.pleaseTake = Please take the
-testpilot.welcomePage.backgroundSurvey = Pilot Background Survey
-testpilot.welcomePage.clickToOpenStudiesWindow = Click here to see the studies that are currently running.
-testpilot.welcomePage.testpilotAddon = Test Pilot Add-on
-testpilot.welcomePage.iconExplanation = « look for this icon in the bottom right of the browser window.
-testpilot.welcomePage.moreIconExplanation = You can click on it to get the main Test Pilot menu.
-testpilot.welcomePage.notificationInfo = The icon will pop up a notification when a study needs your attention.
-testpilot.welcomePage.privacyPolicy = Privacy Policy
-testpilot.welcomePage.legalNotices = Legal Notices
-
-# survey page
-testpilot.surveyPage.saveAnswers = Save Answers
-testpilot.surveyPage.submitAnswers = Submit Answers
-testpilot.surveyPage.changeAnswers = Change Answers
-testpilot.surveyPage.loading = Loading, please wait a moment…
-testpilot.surveyPage.thankYouForFinishingSurvey = Thank you for finishing this survey. Your answers will be uploaded along with the next set of experimental data.
-testpilot.surveyPage.reviewOrChangeYourAnswers = If you would like to review or change your answers, you can do so at any time using the button below.
-
-# modules/task.js
-testpilot.finishedTask.finishedStudy = Excellent! You finished the "%S" Study!
-testpilot.finishedTask.allRelatedDataDeleted = All data related to this study has been removed from your computer.
-
-# modules/setup.js
-testpilot.notification.update = Update…
-testpilot.notification.thankYouForUploadingData = Thanks!
-testpilot.notification.thankYouForUploadingData.message = Thank you for uploading your data.
-testpilot.notification.readyToSubmit = Ready to Submit
-testpilot.notification.readyToSubmit.message = The Test Pilot "%S" study is finished gathering data and is ready to submit.
-testpilot.notification.newTestPilotStudy = New Test Pilot Study
-testpilot.notification.newTestPilotStudy.pre.message = The Test Pilot "%S" study is about to begin.
-testpilot.notification.newTestPilotSurvey = New Test Pilot Survey
-testpilot.notification.newTestPilotSurvey.message = The Test Pilot "%S" survey is available.
-testpilot.notification.newTestPilotResults = New Test Pilot Results
-testpilot.notification.newTestPilotResults.message = New results are now available for the Test Pilot "%S" study.
-testpilot.notification.autoUploadedData = Thank you!
-testpilot.notification.autoUploadedData.message = The Test Pilot "%S" study is completed and your data has been submitted!
-testpilot.notification.extensionUpdate = Extension Update
-testpilot.notification.extensionUpdate.message = One of your studies requires a newer version of Test Pilot. You can get the latest version using the Add-ons window.
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -15,32 +15,31 @@
 # for double ampersand) and prevents the letter following the ampersand from
 # being used as an accesskey.
 
 # You can use \n to create a newline in the string but only when the string
 # from en-US contains a \n.
 
 WIN_CAPTION=$BrandShortName Setup
 
-INTRO_BLURB=Thanks for choosing $BrandFullName, the browser that chooses you above everything else. Click to install.
+INTRO_BLURB1=Thanks for choosing $BrandFullName, the browser that chooses you above everything else.
 INSTALL_BLURB1=You're about to enjoy the very latest in speed, flexibility and security so you're always in control.
 INSTALL_BLURB2=That's because $BrandShortName is made by a non-profit to make browsing and the Web better for you.
 INSTALL_BLURB3=You're also joining a global community of users, contributors and developers working to make the best browser in the world.
 
 WARN_MIN_SUPPORTED_OS_MSG=Sorry, $BrandShortName can't be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer.
 WARN_WRITE_ACCESS=You don't have access to write to the installation directory.\n\nClick OK to select a different directory.
 WARN_DISK_SPACE=You don't have sufficient disc space to install to this location.\n\nClick OK to select a different location.
 WARN_ROOT_INSTALL=Unable to install to the root of your disc.\n\nClick OK to select a different location.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 
 ERROR_DOWNLOAD=Your download was interrupted.\n\nPlease click the OK button to continue.
 
 INSTALL_BUTTON=&Install
 UPGRADE_BUTTON=&Upgrade
-BACK_BUTTON=&Back
 CANCEL_BUTTON=Cancel
 OPTIONS_BUTTON=&Options
 
 MAKE_DEFAULT=&Make $BrandShortName my default browser
 CREATE_SHORTCUTS=Create Shortcuts for $BrandShortName:
 ADD_SC_TASKBAR=On my &Task bar
 ADD_SC_QUICKLAUNCHBAR=On my &Quick Launch bar
 ADD_CheckboxShortcutInStartMenu=In my &Start Menu Programs Folder
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -48,19 +48,16 @@ toggle_sidebar.title=Toggle Sidebar
 toggle_sidebar_label=Toggle Sidebar
 outline.title=Show Document Outline
 outline_label=Document Outline
 thumbs.title=Show Thumbnails
 thumbs_label=Thumbnails
 findbar.title=Find in Document
 findbar_label=Find
 
-# Document outline messages
-no_outline=No Outline Available
-
 # Thumbnails panel item (tooltip and alt text for images)
 # LOCALIZATION NOTE (thumb_page_title): "{{page}}" will be replaced by the page
 # number.
 thumb_page_title=Page {{page}}
 # LOCALIZATION NOTE (thumb_page_canvas): "{{page}}" will be replaced by the page
 # number.
 thumb_page_canvas=Thumbnail of Page {{page}}
 
@@ -118,8 +115,9 @@ missing_file_error=Missing PDF file.
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
 
 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.
+web_colors_disabled=Web colors are disabled.
rename from browser/webapp-uninstaller/webapp-uninstaller.properties
rename to webapprt/webapp-uninstaller/webapp-uninstaller.properties
rename from browser/webapprt/webapp.dtd
rename to webapprt/webapprt/webapp.dtd
rename from browser/webapprt/webapp.properties
rename to webapprt/webapprt/webapp.properties