Bug 926177 - Update en-GB for Gecko 26 - Firefox part r=pending
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 03 Nov 2013 23:00:29 +0000
changeset 316 cfeb5910c29d382467c8daec700b6028d56644ea
parent 315 5f6e6430e1b356f5795e3630791db6346367b27c
child 317 4ff3d23284f46385efc712ca4f590ab6ecac6183
push id65
push useraxel@mozilla.com
push dateMon, 09 Dec 2013 20:15:05 +0000
reviewerspending
bugs926177
Bug 926177 - Update en-GB for Gecko 26 - Firefox part r=pending
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/devtools/app-manager.dtd
browser/chrome/browser/devtools/app-manager.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/inspector.properties
browser/chrome/browser/devtools/netmonitor.dtd
browser/chrome/browser/devtools/profiler.dtd
browser/chrome/browser/devtools/profiler.properties
browser/chrome/browser/devtools/responsiveUI.properties
browser/chrome/browser/devtools/scratchpad.dtd
browser/chrome/browser/devtools/styleinspector.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/feeds/subscribe.properties
browser/chrome/browser/preferences/tabs.dtd
browser/metro/chrome/aboutAddons.dtd
browser/metro/chrome/aboutCertError.dtd
browser/metro/chrome/aboutPanel.dtd
browser/metro/chrome/browser.dtd
browser/metro/chrome/browser.properties
browser/metro/chrome/checkbox.dtd
browser/metro/chrome/config.dtd
browser/metro/chrome/crashprompt.properties
browser/metro/chrome/passwordmgr.properties
browser/metro/chrome/phishing.dtd
browser/metro/chrome/preferences.dtd
browser/metro/chrome/sync.dtd
browser/metro/chrome/sync.properties
browser/pdfviewer/viewer.properties
webapprt/webapprt/webapp.dtd
webapprt/webapprt/webapp.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -41,16 +41,21 @@ can reach it easily. -->
 <!ENTITY  moveToGroup.accesskey              "M">
 <!ENTITY  moveToNewGroup.label               "New Group">
 <!ENTITY  moveToNewWindow.label              "Move to New Window">
 <!ENTITY  moveToNewWindow.accesskey          "W">
 <!ENTITY  bookmarkAllTabs.label              "Bookmark All Tabs…">
 <!ENTITY  bookmarkAllTabs.accesskey          "T">
 <!ENTITY  undoCloseTab.label                 "Undo Close Tab">
 <!ENTITY  undoCloseTab.accesskey             "U">
+<!-- LOCALIZATION NOTE (undoCloseTabs.label) : This label is used
+when the previous tab-closing operation closed more than one tab. It
+replaces the undoCloseTab.label and will use the same accesskey as the
+undoCloseTab.label so users will not need to learn new keyboard controls. -->
+<!ENTITY  undoCloseTabs.label                "Undo Close Tabs">
 <!ENTITY  closeTab.label                     "Close Tab">
 <!ENTITY  closeTab.accesskey                 "C">
 
 <!ENTITY  listAllTabs.label      "List all tabs">
 
 <!ENTITY tabCmd.label "New Tab">
 <!ENTITY tabCmd.accesskey "T">
 <!ENTITY tabCmd.commandkey "t">
@@ -240,16 +245,18 @@ These should match what Safari and other
 
 <!-- LOCALIZATION NOTE (chromeDebuggerMenu.label): This is the label for the
   -  application menu item that opens the browser debugger UI in the Tools menu. -->
 <!ENTITY chromeDebuggerMenu.label       "Browser Debugger">
 
 <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
 <!ENTITY devToolbarMenu.label              "Developer Toolbar">
 <!ENTITY devToolbarMenu.accesskey          "v">
+<!ENTITY devAppMgrMenu.label               "App Manager">
+<!ENTITY devAppMgrMenu.accesskey           "A">
 <!ENTITY devToolbar.keycode                "VK_F2">
 <!ENTITY devToolbar.keytext                "F2">
 <!ENTITY devToolboxMenuItem.label          "Toggle Tools">
 <!ENTITY devToolboxMenuItem.accesskey      "T">
 <!ENTITY devToolboxMenuItem.keycode        "I">
 <!ENTITY devToolboxMenuItem.keytext        "I">
 
 <!ENTITY devToolbarToolsButton.tooltip     "Toggle developer tools">
@@ -633,19 +640,20 @@ just addresses the organization to follo
 <!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 social.markpageMenu.accesskey "P">
+<!ENTITY social.markpageMenu.label "Save Page To…">
+<!ENTITY social.marklinkMenu.accesskey "L">
+<!ENTITY social.marklinkMenu.label "Save Link To…">
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 
 <!ENTITY webrtcIndicatorButton.label "Camera / Microphone Access">
 <!ENTITY webrtcIndicatorButton.tooltip "Display sites you are currently sharing your camera or microphone with">
@@ -658,16 +666,28 @@ just addresses the organization to follo
 <!ENTITY pluginNotification.showAll.label "Show All">
 <!ENTITY pluginNotification.showAll.accesskey "S">
 
 <!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
 <!ENTITY pluginActivateNow.label "Allow Now">
 <!ENTITY pluginActivateAlways.label "Allow and Remember">
 <!ENTITY pluginBlockNow.label "Block Plugin">
 
+<!-- LOCALIZATION NOTE: (pluginNotification.width): This is used to determine the
+     width of the plugin popup notification that can appear if a plugin has been
+     blocked on a page. Should be wide enough to fit the pluginActivateNow.label
+     and pluginActivateAlways.label strings above on a single line. This must be
+     a CSS length value. -->
+<!ENTITY pluginNotification.width "28em">
+
+<!ENTITY tabCrashed.header "Tab crashed">
+<!ENTITY tabCrashed.message "Well, this is embarrassing. We tried to display this Web page, but it's not responding.">
+<!ENTITY tabCrashed.checkSendReport "Tell &vendorShortName; about this crash so they can fix it.">
+<!ENTITY tabCrashed.tryAgain "Try Again">
+
 <!-- LOCALIZATION NOTE: the following strings are unused in Australis, they're
      kept here to avoid warnings from l10n tools like compare-locales on
      l10n-central. They will be definitely removed when Australis is ready
      for mozilla-aurora. -->
 
 <!ENTITY navbarCmd.accesskey           "N">
 <!ENTITY addonBarCmd.label             "Add-on Bar">
 <!ENTITY addonBarCmd.accesskey         "A">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -254,17 +254,16 @@ offlineApps.manageUsageAccessKey=S
 indexedDB.usage=This web site (%1$S) is attempting to store more than %2$S MB of data on your computer for offline use.
 
 identity.identified.verifier=Verified by: %S
 identity.identified.verified_by_you=You have added a security exception for this site.
 identity.identified.state_and_country=%S, %S
 
 identity.encrypted2=The connection to this web site is secure.
 identity.mixed_display_loaded=The connection to this web site is not fully secure because it contains unencrypted elements (such as images).
-identity.mixed_display_loaded_active_blocked=Interactive content (such as script) that isn't encrypted has been blocked for your protection.
 identity.mixed_active_loaded2=This web site contains interactive content that isn't encrypted (such as scripts). Other people can view your information or modify the web site's behavior.
 identity.unencrypted=Your connection to this web site is not encrypted.
 
 identity.unknown.tooltip=This web site does not supply identity information.
 
 identity.ownerUnknown2=(unknown)
 
 # LOCALIZATION NOTE (identity.chrome): %S is replaced with the brandShortName.
@@ -402,16 +401,17 @@ dataReportingNotification.button.label  
 dataReportingNotification.button.accessKey  = C
 
 # Webapps notification popup
 webapps.install = Install
 webapps.install.accesskey = I
 #LOCALIZATION NOTE (webapps.requestInstall) %1$S is the web app name, %2$S is the site from which the web app is installed
 webapps.requestInstall = Do you want to install "%1$S" from this site (%2$S)?
 webapps.install.success = Application Installed
+webapps.install.inprogress = Installation in progress
 
 # 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
 
 service.toolbarbutton.label=Services
 service.toolbarbutton.tooltiptext=Services
@@ -424,22 +424,20 @@ 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.markpageMenu.label): %S is the name of the social provider
+social.markpageMenu.label=Save Page to %S
+# LOCALIZATION NOTE (social.marklinkMenu.label): %S is the name of the social provider
+social.marklinkMenu.label=Save Link to %S
 
 # LOCALIZATION NOTE (social.error.message): %1$S is brandShortName (e.g. Firefox), %2$S is the name of the social provider
 social.error.message=%1$S is unable to connect with %2$S right now.
 social.error.tryAgain.label=Try Again
 social.error.tryAgain.accesskey=T
 social.error.closeSidebar.label=Close This Sidebar
 social.error.closeSidebar.accesskey=C
 
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.dtd
@@ -0,0 +1,85 @@
+<!-- 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 index.title "App Manager">
+<!ENTITY index.projects2 "Apps">
+<!ENTITY index.device2 "Device">
+<!ENTITY index.help "Help">
+
+<!ENTITY device.screenshot "Screenshot">
+<!ENTITY device.screenshotTooltip "Open a screenshot of the current state of the device in a new tab.">
+<!ENTITY device.title "Device Control Center">
+<!ENTITY device.notConnected "Not connected. Please connect your device below.">
+<!ENTITY device.startApp "Start">
+<!ENTITY device.startAppTooltip "Start this app on the device.">
+<!ENTITY device.stopApp "Stop">
+<!ENTITY device.stopAppTooltip "Stop this app on the device.">
+<!ENTITY device.debugApp "Debug">
+<!ENTITY device.debugAppTooltip "Open the Developer Tools connected to this app on the device.">
+<!ENTITY device.name "Name">
+<!ENTITY device.app "App">
+<!ENTITY device.privileged "Privileged">
+<!ENTITY device.certified "Certified">
+<!ENTITY device.allow "Allow">
+<!ENTITY device.allowTooltip "This permission is allowed for apps of this type.">
+<!ENTITY device.prompt "Prompt">
+<!ENTITY device.promptTooltip "This permission requires a user prompt for apps of this type.">
+<!ENTITY device.deny "Deny">
+<!ENTITY device.denyTooltip "This permission is denied for apps of this type.">
+<!ENTITY device.installedApps "Installed Apps">
+<!ENTITY device.installedAppsTooltip "View a list of apps installed on the device. Some apps, such as certified apps, may be excluded from this view.">
+<!ENTITY device.permissions "Permissions">
+<!ENTITY device.permissionsTooltip "View a table of the permissions accessible to the different types of apps.">
+<!ENTITY device.permissionsHelpLink "https://developer.mozilla.org/docs/Web/Apps/App_permissions">
+<!ENTITY device.help "Help">
+
+<!ENTITY connection.connectTooltip "Connect to the device.">
+<!ENTITY connection.disconnect "Disconnect">
+<!ENTITY connection.disconnectTooltip "Disconnect from the current device or simulator.">
+<!ENTITY connection.notConnected2 "Not Connected.">
+<!ENTITY connection.connectTo "Connect to:">
+<!ENTITY connection.noDeviceFound "No device found. Plug a device">
+<!ENTITY connection.changeHostAndPort "Change">
+<!ENTITY connection.changeHostAndPortTooltip "Change the host and port used to connect to the device. (Defaults to localhost:6000)">
+<!ENTITY connection.startSimulator "Start Simulator">
+<!ENTITY connection.startSimulatorTooltip "Start an instance of the Simulator and connect to it.">
+<!ENTITY connection.saveConnectionInfo "Save">
+<!ENTITY connection.saveConnectionInfoTooltip "Save the host and port.">
+<!ENTITY connection.connecting "Connecting…">
+<!ENTITY connection.disconnecting "Disconnecting…">
+<!ENTITY connection.cancel "Cancel">
+<!ENTITY connection.cancelConnectTooltip "Cancel the connection in progress.">
+<!ENTITY connection.cancelShowSimulatorTooltip "Exit the Simulator connection mode and return to the initial prompt.">
+<!ENTITY connection.or "or">
+<!ENTITY connection.noSimulatorInstalled "No simulator installed.">
+<!ENTITY connection.installOneSimulator "Install Simulator">
+<!ENTITY connection.installOneSimulatorTooltip "Install a version of the Simulator by downloading the relevant add-on.">
+<!ENTITY connection.installAnotherSimulator "Add">
+<!ENTITY connection.installAnotherSimulatorTooltip "Install an additional version of the Simulator by downloading the relevant add-on.">
+
+<!ENTITY projects.localApps "Local Apps">
+<!ENTITY projects.addApp "Add">
+<!ENTITY projects.addPackaged "Add Packaged App">
+<!ENTITY projects.addPackagedTooltip "Add a new packaged app (a directory) from your computer.">
+<!ENTITY projects.addHosted "Add Hosted App">
+<!ENTITY projects.addHostedTooltip "Add a new hosted app (link to a manifest.webapp file) from a remote web site.">
+<!ENTITY projects.title "Local Apps">
+<!ENTITY projects.appDetails "App Details">
+<!ENTITY projects.removeAppFromList "Remove this app from the list of apps you are working on. This will not remove it from a device or a simulator.">
+<!ENTITY projects.updateApp "Update">
+<!ENTITY projects.updateAppTooltip "Execute validation checks and update the app to the connected device">
+<!ENTITY projects.debugApp "Debug">
+<!ENTITY projects.debugAppTooltip "Open Developer Tools connected to this app">
+<!ENTITY projects.hostedManifestPlaceHolder2 "http://example.com/app/manifest.webapp">
+<!ENTITY projects.noProjects "No projects. Add a new packaged app below (local directory) or a hosted app (link to a manifest file).">
+
+<!ENTITY help.title "App Manager">
+<!ENTITY help.close "Close">
+<!ENTITY help.intro "This tool will help you build and install web apps on compatible devices (i.e. Firefox OS). The <strong>Apps</strong> tab will assist you in the validation and installation process of your app. The <strong>Device</strong> tab will give you information about the connected device. Use the bottom toolbar to connect to a device or start the simulator.">
+<!ENTITY help.usefullLinks "Useful links:">
+<!ENTITY help.appMgrDoc "Documentation: Using the App Manager">
+<!ENTITY help.configuringDevice "How to setup your Firefox OS device">
+<!ENTITY help.troubleShooting "Troubleshooting">
+<!ENTITY help.simulatorAddon "Install Simulator Add-on">
+<!ENTITY help.adbHelperAddon "Install Adb Helper Add-on">
new file mode 100644
--- /dev/null
+++ b/browser/chrome/browser/devtools/app-manager.properties
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (device.deviceSize): %1$S is the device's width, %2$S is
+# the device's height, %3$S is the device's pixel density.
+# Example: 800x480 (86 DPI).
+device.deviceSize=Device size: %1$Sx%2$S (%3$S DPI)
+# LOCALIZATION NOTE (connection.connectedToDevice, connection.connectTo):
+# %1$S is the host name, %2$S is the port number.
+connection.connectedToDevice=Connected to %1$S
+connection.connectTo=Connect to %1$S:%2$S
+project.filePickerTitle=Select a webapp folder
+project.installing=Installing…
+project.installed=Installed!
+validator.nonExistingFolder=The project folder doesn't exists
+validator.expectProjectFolder=The project folder ends up being a file
+validator.wrongManifestFileName=Packaged apps require a manifest file that can only be named 'manifest.webapp' at project root folder
+validator.invalidManifestURL=Invalid manifest URL '%S'
+# LOCALIZATION NOTE (validator.invalidManifestJSON, validator.noAccessManifestURL):
+# %1$S is the error message, %2$S is the URI of the manifest.
+validator.invalidManifestJSON=The webapp manifest isn't a valid JSON file: %1$S at: %2$S
+validator.noAccessManifestURL=Unable to read manifest file: %1$S at: %2$S
+# LOCALIZATION NOTE (validator.invalidHostedManifestURL): %1$S is the URI of
+# the manifest, %2$S is the error message.
+validator.invalidHostedManifestURL=Invalid hosted manifest URL '%1$S': %2$S
+validator.invalidProjectType=Unknown project type '%S'
+# LOCALIZATION NOTE (validator.missNameManifestProperty, validator.missIconsManifestProperty):
+# don't translate 'icons' and 'name'.
+validator.missNameManifestProperty=Missing mandatory 'name' in Manifest.
+validator.missIconsManifestProperty=Missing 'icons' in Manifest.
+validator.missIconMarketplace=app submission to the Marketplace needs at least a 128px icon
+validator.invalidAppType=Unknown app type: '%S'.
+validator.invalidHostedPriviledges=Hosted App can't be type '%S'.
+validator.noCertifiedSupport='certified' apps are not fully supported on the App manager.
--- a/browser/chrome/browser/devtools/debugger.dtd
+++ b/browser/chrome/browser/devtools/debugger.dtd
@@ -33,16 +33,21 @@
   -  the button that opens up an options context menu for the debugger UI. -->
 <!ENTITY debuggerUI.optsButton.tooltip  "Debugger Options">
 
 <!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
   -  checkbox that toggles pausing on exceptions. -->
 <!ENTITY debuggerUI.pauseExceptions     "Pause on exceptions">
 <!ENTITY debuggerUI.pauseExceptions.key "E">
 
+<!-- LOCALIZATION NOTE (debuggerUI.pauseExceptions): This is the label for the
+  -  checkbox that toggles ignoring caught exceptions. -->
+<!ENTITY debuggerUI.ignoreCaughtExceptions     "Ignore caught exceptions">
+<!ENTITY debuggerUI.ignoreCaughtExceptions.key "C">
+
 <!-- LOCALIZATION NOTE (debuggerUI.showPanesOnInit): This is the label for the
   -  checkbox that toggles visibility of panes when opening the debugger. -->
 <!ENTITY debuggerUI.showPanesOnInit     "Show panes on startup">
 <!ENTITY debuggerUI.showPanesOnInit.key "S">
 
 <!-- LOCALIZATION NOTE (debuggerUI.showVarsFilter): This is the label for the
   -  checkbox that toggles visibility of a designated variables filter box. -->
 <!ENTITY debuggerUI.showVarsFilter      "Show variables filter box">
--- a/browser/chrome/browser/devtools/debugger.properties
+++ b/browser/chrome/browser/devtools/debugger.properties
@@ -52,33 +52,25 @@ stepInTooltip=Step In (%S)
 # LOCALIZATION NOTE (stepOutTooltip): The label that is displayed on the
 # button that steps out of a function call.
 stepOutTooltip=Step Out (%S)
 
 # LOCALIZATION NOTE (emptyGlobalsText): The text to display in the menulist
 # when there are no chrome globals available.
 noGlobalsText=No globals
 
-# LOCALIZATION NOTE (noMatchingScriptsText): The text to display in the
-# menulist when there are no matching chrome globals after filtering.
-noMatchingGlobalsText=No matching globals
-
 # LOCALIZATION NOTE (noSourcesText): The text to display in the sources menu
 # when there are no scripts.
 noSourcesText=This page has no sources.
 
 # LOCALIZATION NOTE (blackBoxCheckboxTooltip) = The tooltip text to display when
 # the user hovers over the checkbox used to toggle black boxing its associated
 # source.
 blackBoxCheckboxTooltip=Toggle black boxing
 
-# LOCALIZATION NOTE (noMatchingSourcesText): The text to display in the
-# sources menu when there are no matching scripts after filtering.
-noMatchingSourcesText=No matching sources.
-
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
 noMatchingStringsText=No matches found
 
 # LOCALIZATION NOTE (emptySearchText): This is the text that appears in the
 # filter text box when it is empty and the scripts container is selected.
 emptySearchText=Search scripts (%S)
 
@@ -128,16 +120,20 @@ breakpointMenuItem.enableAll=Enable all 
 breakpointMenuItem.disableAll=Disable all breakpoints
 breakpointMenuItem.deleteAll=Remove all breakpoints
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the loading process has started but there is no file to display
 # yet.
 loadingText=Loading\u2026
 
+# LOCALIZATION NOTE (errorLoadingText): The text that is displayed in the debugger
+# viewer when there is an error loading a file
+errorLoadingText=Error loading source:\n
+
 # LOCALIZATION NOTE (emptyStackText): The text that is displayed in the watch
 # expressions list to add a new item.
 addWatchExpressionText=Add watch expression
 
 # LOCALIZATION NOTE (emptyVariablesText): The text that is displayed in the
 # variables pane when there are no variables to display.
 emptyVariablesText=No variables to display.
 
--- a/browser/chrome/browser/devtools/gcli.properties
+++ b/browser/chrome/browser/devtools/gcli.properties
@@ -44,16 +44,20 @@ cliEvalJavascript=Enter JavaScript direc
 # LOCALIZATION NOTE: This message is displayed when the command line has more
 # arguments than the current command can understand.
 cliUnusedArg=Too many arguments
 
 # LOCALIZATION NOTE: The title of the dialog which displays the options that
 # are available to the current command.
 cliOptions=Available Options
 
+# LOCALIZATION NOTE: The error message when the user types a command that
+# isn't registered
+cliUnknownCommand=Invalid Command
+
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that does not exist, but should (e.g. for use with File->Open) %1$S is a
 # filename
 fileErrNotExists='%1$S' doesn't exist
 
 # LOCALIZATION NOTE: Error message given when a file argument points to a file
 # that exists, but should not (e.g. for use with File->Save As) %1$S is a
 # filename
@@ -142,21 +146,20 @@ nodeParseNone=No matches
 # LOCALIZATION NOTE (helpDesc, helpManual, helpSearchDesc, helpSearchManual3):
 # These strings describe the "help" command, used to display a description of
 # a command (e.g. "help pref"), and its parameter 'search'.
 helpDesc=Get help on the available commands
 helpManual=Provide help either on a specific command (if a search string is provided and an exact match is found) or on the available commands (if a search string is not provided, or if no exact match is found).
 helpSearchDesc=Search string
 helpSearchManual3=search string to use in narrowing down the displayed commands. Regular expressions not supported.
 
-# LOCALIZATION NOTE (helpManSynopsis, helpManDescription, helpManParameters):
-# These strings are displayed in the help page for a command in the console.
+# LOCALIZATION NOTE (helpManSynopsis, helpManDescription): These strings are
+# displayed in the help page for a command in the console.
 helpManSynopsis=Synopsis
 helpManDescription=Description
-helpManParameters=Parameters
 
 # LOCALIZATION NOTE: This message is displayed in the help page if the command
 # has no parameters.
 helpManNone=None
 
 # LOCALIZATION NOTE: This message is displayed in response to the 'help'
 # command when used without a filter, just above the list of known commands.
 helpListAll=Available Commands:
--- a/browser/chrome/browser/devtools/gclicommands.properties
+++ b/browser/chrome/browser/devtools/gclicommands.properties
@@ -424,16 +424,20 @@ dbgBlackBoxDesc=Black box sources in the
 # LOCALIZATION NOTE (dbgBlackBoxSourceDesc) A very short string used to describe the
 # 'source' parameter to the 'dbg blackbox' command.
 dbgBlackBoxSourceDesc=A specific source to black box
 
 # LOCALIZATION NOTE (dbgBlackBoxGlobDesc) A very short string used to describe the
 # 'glob' parameter to the 'dbg blackbox' command.
 dbgBlackBoxGlobDesc=Black box all sources that match this glob (for example: "*.min.js")
 
+# LOCALIZATION NOTE (dbgBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg blackbox' command.
+dbgBlackBoxInvertDesc=Invert matching, so that we black box every source that is not the source provided or does not match the provided glob pattern.
+
 # LOCALIZATION NOTE (dbgBlackBoxEmptyDesc) A very short string used to let the
 # user know that no sources were black boxed.
 dbgBlackBoxEmptyDesc=(No sources black boxed)
 
 # LOCALIZATION NOTE (dbgBlackBoxNonEmptyDesc) A very short string used to let the
 # user know which sources were black boxed.
 dbgBlackBoxNonEmptyDesc=The following sources were black boxed:
 
@@ -462,16 +466,20 @@ dbgUnBlackBoxEmptyDesc=(Did not stop bla
 # user know which sources we stopped black boxing.
 dbgUnBlackBoxNonEmptyDesc=Stopped black boxing the following sources:
 
 # LOCALIZATION NOTE (dbgUnBlackBoxErrorDesc) A very short string used to let the
 # user know there was an error black boxing a source (whose url follows this
 # text).
 dbgUnBlackBoxErrorDesc=Error stopping black boxing:
 
+# LOCALIZATION NOTE (dbgUnBlackBoxInvertDesc) A very short string used to describe the
+# 'invert' parameter to the 'dbg unblackbox' command.
+dbgUnBlackBoxInvertDesc=Invert matching, so that we stop black boxing every source that is not the source provided or does not match the provided glob pattern.
+
 # LOCALIZATION NOTE (consolecloseDesc) A very short description of the
 # 'console close' 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.
 consolecloseDesc=Close the console
 
 # LOCALIZATION NOTE (consoleopenDesc) A very short description of the
 # 'console open' 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.
@@ -1317,16 +1325,20 @@ profilerNotFound=Profile not found
 # started yet. It also contains a hint to use the 'profile start' command to
 # start the profiler.
 profilerNotStarted3=Profiler has not been started yet. Use 'profile start' to start profiling
 
 # LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
 # we have started recording.
 profilerStarted2=Recording…
 
+# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
+# we have stopped recording.
+profilerStopped=Stopped…
+
 # 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
 
--- a/browser/chrome/browser/devtools/inspector.properties
+++ b/browser/chrome/browser/devtools/inspector.properties
@@ -30,17 +30,17 @@ debuggerPausedWarning.message=Debugger i
 # This menu appears in the Infobar (on top of the highlighted node) once
 # the node is selected.
 nodeMenu.tooltiptext=Node operations
 
 
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Inspector
-inspector.commandkey=I
+inspector.commandkey=C
 inspector.accesskey=I
 
 # LOCALIZATION NOTE (markupView.more.*)
 # When there are too many nodes to load at once, we will offer to
 # show all the nodes.
 markupView.more.showing=Some nodes were hidden.
 markupView.more.showAll=Show All %S Nodes
 inspector.tooltip=DOM and Style Inspector
--- a/browser/chrome/browser/devtools/netmonitor.dtd
+++ b/browser/chrome/browser/devtools/netmonitor.dtd
@@ -172,24 +172,34 @@
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl): This is the label displayed
   -  on the context menu that copies the selected request's url -->
 <!ENTITY netmonitorUI.context.copyUrl      "Copy URL">
 
 <!-- LOCALIZATION NOTE (netmonitorUI.context.copyUrl.accesskey): This is the access key
   -  for the Copy URL menu item displayed in the context menu for a request -->
 <!ENTITY netmonitorUI.context.copyUrl.accesskey  "C">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend): This is the label displayed
-  -  on the button in the headers tab that opens a form to resend the currently
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend): This is the label displayed
+  -  on the button in the headers tab that opens a form to edit and resend the currently
      displayed request -->
-<!ENTITY netmonitorUI.summary.resend      "Resend">
+<!ENTITY netmonitorUI.summary.editAndResend      "Edit and Resend">
+
+<!-- LOCALIZATION NOTE (debuggerUI.summary.editAndResend.accesskey): This is the access key
+  -  for the "Edit and Resend" menu item displayed in the context menu for a request -->
+<!ENTITY netmonitorUI.summary.editAndResend.accesskey  "R">
 
-<!-- LOCALIZATION NOTE (debuggerUI.summary.resend.accesskey): This is the access key
-  -  for the Resend menu item displayed in the context menu for a request -->
-<!ENTITY netmonitorUI.summary.resend.accesskey  "R">
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab):  This is the label
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container  -->
+<!ENTITY netmonitorUI.context.newTab      "Open in New Tab">
+
+<!-- LOCALIZATION NOTE (netmonitorUI.context.newTab.accesskey): This is the access key
+  -  for the Open in New Tab menu item displayed in the context menu of the
+  -  network container -->
+<!ENTITY netmonitorUI.context.newTab.accesskey  "O">
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.newRequest): This is the label displayed
   -  as the title of the new custom request form -->
 <!ENTITY netmonitorUI.custom.newRequest   "New Request">
 
 <!-- LOCALIZATION NOTE (debuggerUI.custom.query): This is the label displayed
   -  above the query string entry in the custom request form -->
 <!ENTITY netmonitorUI.custom.query        "Query String:">
--- a/browser/chrome/browser/devtools/profiler.dtd
+++ b/browser/chrome/browser/devtools/profiler.dtd
@@ -5,23 +5,15 @@
 <!-- LOCALIZATION NOTE : FILE This file contains the Profiler strings -->
 
 <!-- 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 (profilerNew.label): This is the label for the
-  -  button that creates a new profile. -->
-<!ENTITY profilerNew.label "New">
-
-<!-- LOCALIZATION NOTE (profilerStart.label): This is the label for the
-  -  button that starts the profiler. -->
-<!ENTITY profilerStart.label "Start">
-
-<!-- LOCALIZATION NOTE (profilerStop.label): This is the label for the
-  -  button that stops the profiler. -->
-<!ENTITY profilerStop.label "Stop">
-
 <!-- LOCALIZATION NOTE (profiler.importProfile): This string is displayed
   -  on a button that opens a dialog to import a saved profile data file. -->
 <!ENTITY importProfile.label "Import…">
+
+<!-- LOCALIZATION NOTE (profiler.startProfiler): This string is displayed
+  -  on a button that starts a new profile  -->
+<!ENTITY startProfiler.tooltip "Start profiling">
--- a/browser/chrome/browser/devtools/profiler.properties
+++ b/browser/chrome/browser/devtools/profiler.properties
@@ -50,44 +50,29 @@ profiler.runningTime=Running Time
 # As opposed to the total time which is how much time was spent in that
 # function and in functions it called.
 profiler.self=Self
 
 # LOCALIZATION NOTE (profiler.symbolName)
 # This string is displayed as a table header in the profiler UI.
 profiler.symbolName=Symbol Name
 
-# LOCALIZATION NOTE (profiler.startProfiling)
-# This string is displayed around the button that starts the profiler.
-# String argument will be replaced with a Start button.
-profiler.startProfiling=Click here %S to start profiling
-
-# LOCALIZATION NOTE (profiler.stopProfiling)
-# This string is displayed around the button that stops the profiler.
-# String argument will be replaced with a Stop button.
-profiler.stopProfiling = Click here %S to stop profiling
-
 # LOCALIZATION NOTE (profiler.start)
 # This string is displayed on the button that starts the profiler.
 profiler.start=Start
 
 # LOCALIZATION NOTE (profiler.stop)
 # This string is displayed on the button that stops the profiler.
 profiler.stop=Stop
 
 # LOCALIZATION NOTE (profiler.loading)
 # This string is displayed above the progress bar when the profiler
 # is busy loading and parsing the report.
 profiler.loading=Loading profile…
 
-# LOCALIZATION NOTE (profiler.alreadyRunning)
-# This string is displayed in the profiler whenever there is already
-# another running profile. Users can run only one profile at a time.
-profiler.alreadyRunning=Profiler is already running. If you want to run this profile stop Profile %S first.
-
 # LOCALIZATION NOTE (profiler.stateIdle)
 # This string is used to show that the profile in question is in IDLE
 # state meaning that it hasn't been started yet.
 profiler.stateIdle=Idle
 
 # LOCALIZATION NOTE (profiler.stateRunning)
 # This string is used to show that the profile in question is in RUNNING
 # state meaning that it has been started and currently gathering profile data.
@@ -99,16 +84,26 @@ profiler.stateRunning=Running
 profiler.stateCompleted=Completed
 
 # LOCALIZATION NOTE (profiler.sidebarNotice)
 # This string is displayed in the profiler sidebar when there are no
 # existing profiles to show (usually happens when the user opens the
 # profiler for the first time).
 profiler.sidebarNotice=There are no profiles yet.
 
+# LOCALIZATION NOTE (profiler.startProfilerString)
+# This string is displayed on the profiler button when no active
+# profiling sessions are running
+profiler.startProfilerString=Start profiling
+
+# LOCALIZATION NOTE (profiler.stopProfilerString)
+# This string is displayed on the profiler button when an active
+# profiling session is running
+profiler.stopProfilerString=Stop profiling
+
 # LOCALIZATION NOTE (profiler.save)
 # This string is displayed as a label for a button that opens a Save File
 # dialog where user can save generated profiler to a file.
 profiler.save=Save
 
 # LOCALIZATION NOTE (profiler.saveFileAs)
 # This string as a title for a Save File dialog.
 profiler.saveFileAs=Save Profile As
--- a/browser/chrome/browser/devtools/responsiveUI.properties
+++ b/browser/chrome/browser/devtools/responsiveUI.properties
@@ -7,18 +7,29 @@
 #
 # 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  (responsiveUI.rotate): label of the rotate button.
-responsiveUI.rotate=rotate
+# LOCALIZATION NOTE  (responsiveUI.rotate2): tooltip of the rotate button.
+responsiveUI.rotate2=Rotate
+
+# LOCALIZATION NOTE  (responsiveUI.screenshot): tooltip of the screenshot button.
+responsiveUI.screenshot=Screenshot
+
+# LOCALIZATION NOTE (responsiveUI.screenshotGeneratedFilename): The auto generated filename.
+# The first argument (%1$S) is the date string in yyyy-mm-dd format and the second
+# argument (%2$S) is the time string in HH.MM.SS format.
+responsiveUI.screenshotGeneratedFilename=Screen Shot %1$S at %2$S
+
+# LOCALIZATION NOTE  (responsiveUI.touch): tooltip of the touch button.
+responsiveUI.touch=Simulate touch events (page reload might be needed)
 
 # LOCALIZATION NOTE  (responsiveUI.addPreset): label of the add preset button.
 responsiveUI.addPreset=Add Preset
 
 # LOCALIZATION NOTE  (responsiveUI.removePreset): label of the remove preset button.
 responsiveUI.removePreset=Remove Preset
 
 # LOCALIZATION NOTE  (responsiveUI.customResolution): label of the first item
@@ -36,8 +47,20 @@ responsiveUI.namedResolution=%S (%S)
 responsiveUI.customNamePromptTitle=Responsive Design View
 
 # LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
 responsiveUI.close=Leave Responsive Design View
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg=Give a name to the %Sx%S preset
+
+# LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
+# overring the resizers.
+responsiveUI.resizerTooltip=Use the Control key for more precision. Use Shift key for rounded sizes.
+
+# LOCALIZATION NOTE (responsiveUI.needReload): notification that appears
+# when touch events are enabled
+responsiveUI.needReload=If touch event listeners have been added earlier, the page needs to be reloaded.
+responsiveUI.notificationReload=Reload
+responsiveUI.notificationReload_accesskey=R
+responsiveUI.dontShowReloadNotification=Never show again
+responsiveUI.dontShowReloadNotification_accesskey=N
--- a/browser/chrome/browser/devtools/scratchpad.dtd
+++ b/browser/chrome/browser/devtools/scratchpad.dtd
@@ -60,16 +60,19 @@
 <!ENTITY inspect.label                "Inspect">
 <!ENTITY inspect.accesskey            "I">
 <!ENTITY inspect.key                  "i">
 
 <!ENTITY display.label                "Display">
 <!ENTITY display.accesskey            "D">
 <!ENTITY display.key                  "l">
 
+<!ENTITY pprint.label                 "Pretty Print">
+<!ENTITY pprint.key                   "p">
+
 <!-- LOCALIZATION NOTE (environmentMenu.label, accesskey): This menu item was
   -  renamed from "Context" to avoid confusion with the right-click context
   -  menu in the text area. It refers to the JavaScript Environment (or context)
   -  the user is evaluating against. I.e., Content (current tab) or Chrome
   -  (browser).
   -->
 <!ENTITY environmentMenu.label        "Environment">
 <!ENTITY environmentMenu.accesskey    "n">
--- a/browser/chrome/browser/devtools/styleinspector.properties
+++ b/browser/chrome/browser/devtools/styleinspector.properties
@@ -30,16 +30,24 @@ rule.sourceInline=inline
 rule.sourceElement=element
 
 # LOCALIZATION NOTE (rule.inheritedFrom): Shown for CSS rules
 # that were inherited from a parent node. Will be passed a node
 # identifier of the parent node.
 # e.g "Inherited from body#bodyID"
 rule.inheritedFrom=Inherited from %S
 
+# LOCALIZATION NOTE (rule.pseudoElement): Shown for CSS rules
+# pseudo element header
+rule.pseudoElement=Pseudo-elements
+
+# LOCALIZATION NOTE (rule.selectedElement): Shown for CSS rules
+# selected element header
+rule.selectedElement=This Element
+
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to
 # quickly jump to the documentation from the Mozilla Developer Network site.
 # This is the link title shown in the hover tooltip.
 helpLinkTitle=Read the documentation for this property
 
 # LOCALIZATION NOTE (rule.warning.title): When an invalid property value is
 # entered into the rule view a warning icon is displayed. This text is used for
--- a/browser/chrome/browser/devtools/toolbox.dtd
+++ b/browser/chrome/browser/devtools/toolbox.dtd
@@ -7,16 +7,21 @@
 
 <!ENTITY closeCmd.key  "W">
 
 <!ENTITY toolboxCloseButton.tooltip    "Close Developer Tools">
 <!ENTITY toolboxOptionsButton.key      "O">
 <!ENTITY toolboxNextTool.key           "]">
 <!ENTITY toolboxPreviousTool.key       "[">
 
+<!ENTITY toolboxZoomIn.key             "+">
+<!ENTITY toolboxZoomIn.key2            "="> <!-- + is above this key on many keyboards -->
+<!ENTITY toolboxZoomOut.key            "-">
+<!ENTITY toolboxZoomReset.key          "0">
+
 <!-- LOCALIZATION NOTE (options.context.advancedSettings): This is the label for
   -  the heading of the advanced settings group in the options panel. -->
 <!ENTITY options.context.advancedSettings "Advanced settings">
 
 <!-- LOCALIZATION NOTE (options.context.requiresRestart2): This is the requires
   -  restart label at right of settings that require a browser restart to be
   -  effective. -->
 <!ENTITY options.context.requiresRestart2  "Requires browser restart">
--- a/browser/chrome/browser/devtools/toolbox.properties
+++ b/browser/chrome/browser/devtools/toolbox.properties
@@ -39,8 +39,18 @@ toolbox.defaultTitle=Developer Tools
 # for the optiosn panel tab.
 optionsButton.tooltip=Toolbox Options
 
 # LOCALIZATION NOTE (options.toolNotSupported): This is the template
 # used to add a * marker to the label for the Options Panel tool checkbox for the
 # tool which is not supported for the current toolbox target.
 # The name of the tool: %1$S.
 options.toolNotSupportedMarker=%1$S *
+
+# LOCALIZATION NOTE (scratchpad.keycode)
+# Used for opening scratchpad from the detached toolbox window
+# Needs to match scratchpad.keycode from browser.dtd
+scratchpad.keycode=VK_F4
+
+# LOCALIZATION NOTE (browserConsoleCmd.commandkey)
+# Used for toggling the browser console from the detached toolbox window
+# Needs to match browserConsoleCmd.commandkey from browser.dtd
+browserConsoleCmd.commandkey=j
--- a/browser/chrome/browser/devtools/webConsole.dtd
+++ b/browser/chrome/browser/devtools/webConsole.dtd
@@ -63,35 +63,35 @@
 <!ENTITY btnPageSecurity.accesskey "S">
 
 <!-- LOCALIZATION NOTE (btnPageLogging): This is used as the text of the
   -  the toolbar. It shows or hides messages that the web developer inserted on
   -  the page for debugging purposes, using calls such console.log() and
   -  console.error(). -->
 <!ENTITY btnPageLogging.label   "Logging">
 <!ENTITY btnPageLogging.tooltip "Log messages sent to the window.console object">
-<!ENTITY btnPageLogging.accesskey "L">
+<!ENTITY btnPageLogging.accesskey2 "R">
 <!ENTITY btnConsoleErrors       "Errors">
 <!ENTITY btnConsoleInfo         "Info">
 <!ENTITY btnConsoleWarnings     "Warnings">
 <!ENTITY btnConsoleLog          "Log">
 
 <!ENTITY filterOutput.placeholder "Filter output">
 <!ENTITY btnClear.label        "Clear">
 <!ENTITY btnClear.tooltip      "Clear the Web Console output">
-<!ENTITY btnClear.accesskey    "r">
 
 <!ENTITY fullZoomEnlargeCmd.commandkey  "+">
 <!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
 <!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">
+<!ENTITY closeCmd.key         "W">
 <!ENTITY findCmd.key          "F">
 <!ENTITY clearOutputCmd.key   "K">
+<!ENTITY clearOutputCtrl.key  "L">
--- a/browser/chrome/browser/devtools/webconsole.properties
+++ b/browser/chrome/browser/devtools/webconsole.properties
@@ -48,17 +48,17 @@ NetworkPanel.label=Inspect Network Reque
 NetworkPanel.durationMS=%Sms
 
 # LOCALIZATION NOTE (NetworkPanel.imageSizeDeltaDurationMS): this string is
 # used to show the duration between the response header and the response body
 # event. It also shows the size of the received or cached image. Parameters:
 # %1$S is the width of the inspected image, %2$S is the height of the
 # inspected image, %3$S is the duration between the response header and the
 # response body event. Example: 150x100px, Δ50ms.
-NetworkPanel.imageSizeDeltaDurationMS=%S×%Spx, Δ%Sms
+NetworkPanel.imageSizeDeltaDurationMS=%1$S×%2$Spx, Δ%3$Sms
 
 # LOCALIZATION NOTE (NetworkPanel.responseBodyUnableToDisplay.content): this
 # string is displayed within the response body section of the NetworkPanel if
 # the content type of the network request can't be displayed. E.g. any kind of
 # text is easy to display, but some audio or flash data received from the
 # server can't be displayed. Parameters: %S is the content type that can't be
 # displayed, examples are application/x-shockwave-flash, music/crescendo.
 NetworkPanel.responseBodyUnableToDisplay.content=Unable to display responses of type "%S"
@@ -70,16 +70,20 @@ ConsoleAPIDisabled=The Web Console loggi
 # the URL the correct direction. Parameters: %S is the web page URL.
 webConsoleWindowTitleAndURL=Web Console - %S
 
 # LOCALIZATION NOTE (webConsoleMixedContentWarning): the message displayed
 # after a URL in the Web Console that has been flagged for Mixed Content (i.e.
 # http content in an https page).
 webConsoleMixedContentWarning=Mixed Content
 
+# LOCALIZATION NOTE (webConsoleMoreInfoLabel): the more info tag displayed
+# after security related web console messages.
+webConsoleMoreInfoLabel=Learn More
+
 # LOCALIZATION NOTE (scratchpad.linkText): the text used in the right hand
 # side of the Web Console command line when JavaScript is being entered, to
 # indicate how to jump into scratchpad mode.
 scratchpad.linkText=Shift+RETURN - Open in Scratchpad
 
 # LOCALIZATION NOTE (gcliterm.instanceLabel): the console displays objects
 # using their type (from the constructor function) in this descriptive string.
 # Parameters: %S is the object type.
@@ -90,17 +94,17 @@ gcliterm.instanceLabel=Instance of %S
 # anonymous. See also stacktrace.outputMessage.
 stacktrace.anonymousFunction=<anonymous>
 
 # LOCALIZATION NOTE (stacktrace.outputMessage): this string is used in the Web
 # Console output to identify a web developer call to console.trace(). The
 # stack trace of JavaScript function calls is displayed. In this minimal
 # message we only show the last call. Parameters: %1$S is the file name, %2$S
 # is the function name, %3$S is the line number.
-stacktrace.outputMessage=Stack trace from %S, function %S, line %S.
+stacktrace.outputMessage=Stack trace from %1$S, function %2$S, line %3$S.
 
 # LOCALIZATION NOTE (timerStarted): this string is used to display the result
 # of the console.time() call. Parameters: %S is the name of the timer.
 timerStarted=%S: timer started
 
 # LOCALIZATION NOTE (timeEnd): this string is used to display the result of
 # the console.timeEnd() call. Parameters: %1$S is the name of the timer, %2$S
 # is the number of milliseconds.
@@ -159,27 +163,36 @@ 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 (NetworkPanel.fetchRemainingResponseContentLink): the
 # string  displayed in the network panel when the response body is only
 # partially available. Parameters: %S is the amount of bytes that need to be
 # fetched.
-NetworkPanel.fetchRemainingResponseContentLink=Fetch the remaining %1$S bytes
+NetworkPanel.fetchRemainingResponseContentLink=Fetch the remaining %S bytes
 
 # LOCALIZATION NOTE (NetworkPanel.fetchRemainingRequestContentLink): the
 # string displayed in the network panel when the request body is only
 # partially available. Parameters: %S is the amount of bytes that need to be
 # fetched.
-NetworkPanel.fetchRemainingRequestContentLink=Fetch the request body (%1$S bytes)
+NetworkPanel.fetchRemainingRequestContentLink=Fetch the request body (%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
+
+# LOCALIZATION NOTE (messageRepeats.tooltip2): the tooltip text that is displayed
+# when you hover the red bubble that shows how many times a message is repeated
+# in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of message repeats
+# example: 3 repeats
+messageRepeats.tooltip2=#1 repeat;#1 repeats
--- a/browser/chrome/browser/feeds/subscribe.properties
+++ b/browser/chrome/browser/feeds/subscribe.properties
@@ -44,10 +44,8 @@ feedSubscriptionVideoPodcast1=This is a 
 feedSubscriptionFeed2=You can subscribe to this feed to receive updates when this content changes.
 feedSubscriptionAudioPodcast2=You can subscribe to this podcast to receive updates when this content changes.
 feedSubscriptionVideoPodcast2=You can subscribe to this video podcast to receive updates when this content changes.
 
 # Protocol Handling
 # "Add %appName (%appDomain) as an application for %protocolType links?"
 addProtocolHandler=Add %S (%S) as an application for %S links?
 addProtocolHandlerAddButton=Add Application
-# "%appName has already been added as an application for %protocolType links."
-protocolHandlerRegistered=%S has already been added as an application for %S links.
--- a/browser/chrome/browser/preferences/tabs.dtd
+++ b/browser/chrome/browser/preferences/tabs.dtd
@@ -14,8 +14,9 @@
 <!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">
+<!ENTITY tabsGroup.label          "Tabs">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutAddons.dtd
@@ -0,0 +1,18 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY % brandDTD
+     SYSTEM "chrome://branding/locale/brand.dtd">
+   %brandDTD;
+
+<!ENTITY aboutAddons.title              "&brandShortName; Add-ons are a Work In Progress">
+<!ENTITY aboutAddons.messageTitle       "Uh-Oh!">
+<!ENTITY aboutAddons.message            "Sorry, &brandShortName; is busy working on supporting add-ons for you.">
+<!-- LOCALIZATION NOTE (aboutAddons.goBackToStartStart, aboutAddons.goBacktoStartLink, aboutAddons.goBacktoStartEnd):
+     These three entities form a single sentence. aboutAddons.goBackToStartStart is the start of the sentence,
+     aboutAddons.goBacktoStartLink is a clickable link the middle and aboutAddons.goBacktoStartEnd is the end of the sentence.
+     -->
+<!ENTITY aboutAddons.goBackToStartStart "Go back to the ">
+<!ENTITY aboutAddons.goBacktoStartLink  "&brandShortName; Start Page">
+<!ENTITY aboutAddons.goBacktoStartEnd   ".">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutCertError.dtd
@@ -0,0 +1,38 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
+<!-- These strings are used by Firefox's custom about:certerror page,
+a replacement for the standard security certificate errors produced
+by NSS/PSM via netError.xhtml. -->
+
+<!ENTITY certerror.pagetitle  "Untrusted Connection">
+<!ENTITY certerror.longpagetitle "This Connection is Untrusted">
+
+<!-- Localization note (certerror.introPara1) - The string "#1" will
+be replaced at runtime with the name of the server to which the user
+was trying to connect. -->
+<!ENTITY certerror.introPara1 "You have asked &brandShortName; to connect
+securely to <b>#1</b>, but we can't confirm that your connection is secure.">
+
+<!ENTITY certerror.whatShouldIDo.heading "What Should I Do?">
+<!ENTITY certerror.whatShouldIDo.content "If you usually connect to
+this site without problems, this error could mean that someone is
+trying to impersonate the site, and you shouldn't continue.">
+<!ENTITY certerror.getMeOutOfHere.label "Get me out of here!">
+
+<!ENTITY certerror.expert.heading "I Understand the Risks">
+<!ENTITY certerror.expert.content "If you understand what's going on, you
+can tell &brandShortName; to start trusting this site's identification.
+<b>Even if you trust the site, this error could mean that someone is
+tampering with your connection.</b>">
+<!ENTITY certerror.expert.contentPara2 "Don't add an exception unless
+you know there's a good reason why this site doesn't use trusted identification.">
+<!ENTITY certerror.addTemporaryException.label "Visit site">
+<!ENTITY certerror.addPermanentException.label "Add permanent exception">
+
+<!ENTITY certerror.technical.heading "Technical Details">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/aboutPanel.dtd
@@ -0,0 +1,52 @@
+<!-- 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 aboutHeader.title          "About">
+<!ENTITY aboutHeader.product.label  "&brandShortName;">
+<!ENTITY aboutHeader.company.label  "By &vendorShortName;">
+<!ENTITY aboutHeader.policy.label   "Read the &brandShortName; privacy policy online">
+<!-- LOCALIZATION NOTE (update.checkingForUpdates): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingForUpdates  "Checking for updates…">
+<!-- LOCALIZATION NOTE (update.checkingAddonCompat): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.checkingAddonCompat "Checking Add-on compatibility…">
+<!-- LOCALIZATION NOTE (update.noUpdatesFound): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.noUpdatesFound      "&brandShortName; is up to date">
+<!-- LOCALIZATION NOTE (update.adminDisabled): try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.adminDisabled       "Updates disabled by your system administrator">
+<!-- LOCALIZATION NOTE (update.otherInstanceHandlingUpdates): try to make the localized text short -->
+<!ENTITY update.otherInstanceHandlingUpdates      "&brandShortName; is being updated by another instance">
+
+<!-- LOCALIZATION NOTE (update.failed.start,update.failed.linkText,update.failed.end):
+     update.failed.start, update.failed.linkText, and update.failed.end all go into
+     one line with linkText being wrapped in an anchor that links to a site to download
+     the latest version of Firefox (e.g. http://www.firefox.com). As this is all in
+     one line, try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.failed.start        "Update failed. ">
+<!ENTITY update.failed.linkText     "Download the latest version">
+<!ENTITY update.failed.end          "">
+
+<!-- LOCALIZATION NOTE (update.manual.start,update.manual.end): update.manual.start and update.manual.end
+     all go into one line and have an anchor in between with text that is the same as the link to a site
+     to download the latest version of Firefox (e.g. http://www.firefox.com). As this is all in one line,
+     try to make the localized text short (see bug 596813 for screenshots). -->
+<!ENTITY update.manual.start        "Updates available at ">
+<!ENTITY update.manual.end          "">
+
+<!-- LOCALIZATION NOTE (update.downloading.start,update.downloading.end): update.downloading.start and 
+     update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
+     is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
+     the "em dash" (long dash).
+     example: Downloading update — 111 KB of 13 MB -->
+<!ENTITY update.downloading.start   "Downloading update — ">
+<!ENTITY update.downloading.end     "">
+
+<!ENTITY update.applying            "Applying update…">
+
+<!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
+     channel.description.end create one sentence, with the current channel label inserted in between.
+     example: You are currently on the _Stable_ update channel. -->
+<!ENTITY channel.description.start  "You are currently on the ">
+<!ENTITY channel.description.end    " update channel. ">
+
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/browser.dtd
@@ -0,0 +1,109 @@
+<!-- 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/. -->
+
+<!-- NAVBAR AND AUTOCOMPLETE -->
+
+<!ENTITY urlbar.emptytext      "Enter Search or Address">
+
+<!ENTITY back.label            "Back">
+<!ENTITY forward.label         "Forwards">
+<!ENTITY newtab.label          "New Tab">
+<!ENTITY closetab.label        "Close Tab">
+
+<!ENTITY autocompleteResultsHeader.label  "Your Results">
+
+<!ENTITY appbarErrorConsole.label   "Open error console">
+<!ENTITY appbarJSShell.label        "Open JavaScript shell">
+<!ENTITY appbarFindInPage2.label    "Find in page">
+<!ENTITY appbarViewOnDesktop2.label "View on desktop">
+
+<!ENTITY topSitesHeader.label        "Top Sites">
+<!ENTITY bookmarksHeader.label       "Bookmarks">
+<!ENTITY recentHistoryHeader.label   "Recent History">
+<!ENTITY remoteTabsHeader.label      "Tabs from Other Devices">
+
+<!-- LOCALIZATION NOTE (narrowTopSitesHeader.label,
+                        narrowBookmarksHeader.label,
+                        narrowHistoryHeader.label,
+                        narrowRemoteTabsHeader.label )
+     are shortened versions of topSitesHeader.label, bookmarksHeader.label, recentHistoryHeader.label
+     and remoteTabsHeader.label. Need to be two words or shorter to fit in narrow vertical space.
+      -->
+<!ENTITY narrowTopSitesHeader.label      "Top Sites">
+<!ENTITY narrowBookmarksHeader.label     "Bookmarks">
+<!ENTITY narrowRecentHistoryHeader.label "Recent History">
+<!ENTITY narrowRemoteTabsHeader.label    "Remote Tabs">
+
+<!ENTITY downloadsHeader.label     "Downloads">
+<!ENTITY downloadShowPage.label    "Go to Page">
+<!ENTITY downloadShow2.label       "Find">
+<!ENTITY downloadOpen2.label       "Open">
+<!ENTITY downloadCancel.label      "Cancel">
+<!ENTITY downloadPause.label       "Pause">
+<!ENTITY downloadResume.label      "Resume">
+<!ENTITY downloadRetry.label       "Retry">
+<!ENTITY downloadRemove.label      "Remove">
+<!ENTITY downloadDelete.label      "Delete">
+<!ENTITY downloadFailed.label      "Failed">
+
+<!ENTITY allBookmarks.label        "See all bookmarks">
+
+<!ENTITY consoleHeader.label       "Error Console">
+<!ENTITY consoleAll.label          "All">
+<!ENTITY consoleErrors.label       "Errors">
+<!ENTITY consoleWarnings.label     "Warnings">
+<!ENTITY consoleMessages.label     "Messages">
+<!ENTITY consoleCodeEval.label     "Code:">
+<!ENTITY consoleClear.label        "Clear">
+<!ENTITY consoleEvaluate.label     "…">
+<!ENTITY consoleErrFile.label      "Source File:">
+<!ENTITY consoleErrLine.label      "Line:">
+<!ENTITY consoleErrColumn.label    "Column:">
+
+<!--  TEXT CONTEXT MENU -->
+<!ENTITY contextTextCut.label              "Cut">
+<!ENTITY contextTextCopy.label             "Copy">
+<!ENTITY contextTextPaste.label            "Paste">
+<!-- unique item that is only added to the url bar context menu -->
+<!ENTITY contextTextPasteAndGo.label       "Paste &amp; go">
+<!ENTITY contextTextSelect.label           "Select">
+<!ENTITY contextTextSelectAll.label        "Select all">
+
+<!-- LINK CONTEXT MENU -->
+<!ENTITY contextOpenLinkTab.label          "Open link in new tab">
+<!ENTITY contextCopyLinkHref.label         "Copy link">
+<!ENTITY contextBookmarkLinkHref.label     "Bookmark link">
+
+<!-- IMAGE CONTEXT MENU -->
+<!-- LOCALIZATION NOTE (contextSaveImageLib.label): saves an image to the users "pictures library"
+     (Explorer -> left hand side navigation pane -> Libraries -> Pictures) -->
+<!ENTITY contextSaveImageLib.label         "Save to picture library">
+<!ENTITY contextCopyImage.label            "Copy image">
+<!ENTITY contextCopyImageLocation.label    "Copy image location">
+<!ENTITY contextOpenImageTab.label         "Open image in new tab">
+
+<!-- VIDEO CONTEXT MENU -->
+<!ENTITY contextSaveVideoLib.label         "Save to video library">
+<!ENTITY contextCopyVideoLocation.label    "Copy video location">
+<!ENTITY contextOpenVideoTab.label         "Open video in new tab">
+
+<!-- KEYBOARD SHORTCUTS -->
+<!ENTITY reload.key "r">
+<!ENTITY focusURL.key "l">
+<!ENTITY urlbar.accesskey "d">
+<!ENTITY openFile.key "o">
+<!ENTITY savePage.key "s">
+<!ENTITY find.key "f">
+<!ENTITY findNext.key "g">
+<!ENTITY quit.key "q">
+<!ENTITY addBookmark.key "d">
+<!ENTITY newTab.key "t">
+<!ENTITY newTab2.key "n">
+<!ENTITY closeTab.key "w">
+
+<!-- DEVELOPER SHORTCUTS (control+shift+key) -->
+<!ENTITY jsConsole.key "j">
+<!ENTITY optionsFlyout.key "o">
+<!ENTITY syncFlyout.key "s">
+<!ENTITY aboutFlyout.key "a">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/browser.properties
@@ -0,0 +1,144 @@
+# 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 Capitalized phrases like "Top Sites", "Bookmarks",
+# and "Recent History" are typically used as proper noun phrases to refer to
+# the specific visual set (usually displayed as a grid) of top sites,
+# bookmarks, etc. displayed on screen, rather than those concepts in general.
+# Buttons (like with contextAppbar2.pin.topSites) refer to actions against
+# the specific on-screen sets with similarly-named headings.
+
+# LOCALIZATION NOTE (browser.search.contextTextSearchLabel2): search context
+# menu item text will be: |Search (browser.search.defaultenginename) for "string"|
+# browser.search.defaultenginename is defined in region.properties
+browser.search.contextTextSearchLabel2=Search %S for "%S"
+
+# Contextual Appbar - Button Labels
+
+contextAppbar2.pin.topSites=Pin to Top Sites
+contextAppbar2.pin.bookmarks=Pin to Bookmarks
+contextAppbar2.pin.recentHistory=Pin to Recent History
+contextAppbar2.pin.downloads=Pin to Downloads
+
+contextAppbar2.unpin.topSites=Unpin from Top Sites
+contextAppbar2.unpin.bookmarks=Unpin from Bookmarks
+contextAppbar2.unpin.recentHistory=Unpin from Recent History
+contextAppbar2.unpin.downloads=Unpin from Downloads
+
+# LOCALIZATION NOTE (contextAppbar2.delete): Deletes selected pages.
+contextAppbar2.delete=Delete
+
+# LOCALIZATION NOTE (contextAppbar2.restore): Undoes a previous deletion.
+# Button with this label only appears immediately after a deletion.
+contextAppbar2.restore=Undo delete
+
+# LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
+contextAppbar2.clear=Clear selection
+
+# Settings Charms
+aboutCharm1=About
+optionsCharm=Options
+helpOnlineCharm=Help (online)
+
+# General
+# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Save..." file picker dialog
+browserForSaveLocation=Save Location
+# LOCALIZATION NOTE (browserForSaveLocation): Title for the "Open..." file picker dialog
+browserForOpenLocation=Open Location
+
+# Download Manager
+downloadsUnknownSize=Unknown size
+downloadRun=Run
+downloadSave=Save
+downloadCancel=Cancel
+downloadTryAgain=Try Again
+downloadRunNow=Run it now
+# LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
+downloadShowInFiles=Show in Files
+
+# Alerts
+alertLinkBookmarked=Bookmark added
+alertDownloads=Downloads
+alertDownloadsStart=Downloading: %S
+alertDownloadsDone=%S has finished downloading
+# LOCALIZATION NOTE (alertDownloadsStart2): Used in a notification bar for download progress
+# #1 is the file name, #2 is the amount downloaded so far / total amount to download, and #3 is seconds remaining.
+alertDownloadsStart2=Downloading #1, #2, #3
+alertDownloadsDone2=%S has been downloaded
+alertTapToSave=Tap to save this file.
+alertDownloadsSize=Download too big
+alertDownloadsNoSpace=Not enough storage space
+# LOCALIZATION NOTE (alertDownloadSave): #1 is the file name, #2 is the file size, #3 is the file host
+alertDownloadSave=Do you want to run or save #1 (#2) from #3?
+# LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining
+alertDownloadMultiple=Downloading one file, #2, #3;Downloading #1 files, #2, #3
+# LOCALIZATION NOTE (alertMultipleDownloadsComplete): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of downloads completed
+alertMultipleDownloadsComplete=One download has been completed;#1 downloads have been completed
+alertDownloadFailed=Sorry, downloading %S failed.
+
+# Popup Blocker
+# LOCALIZATION NOTE (popupWarning.message): Semi-colon 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.
+popupButtonAllowOnce2=Allow once
+popupButtonAlwaysAllow3=Always allow
+popupButtonNeverWarn3=Never allow
+
+# ContentPermissionsPrompt
+contentPermissions.alwaysForSite=Always for this site
+contentPermissions.neverForSite=Never for this site
+
+# Geolocation UI
+# LOCALIZATION NOTE (geolocation2.allow): If you're having trouble with the
+# word Share, please use Allow and Block in your language.
+geolocation2.allow=Share location
+
+# LOCALIZATION NOTE (geolocation2.wantsTo offlineApps.wantsTo indexedDBQuota.wantsTo):
+# %S is the domain name of the web site.
+geolocation2.wantsTo=Share your location with %S?
+
+geolocation.learnMore=Learn more…
+
+# Error Console
+typeError=Error:
+typeWarning=Warning:
+
+# Offline web applications
+offlineApps.allow=Allow
+offlineApps.wantsTo=%S wants to store data on your device for offline use.
+
+# IndexedDB Quota increases
+indexedDBQuota.allow=Allow
+indexedDBQuota.wantsTo=%S wants to store a lot of data on your device for offline use.
+
+tabs.emptyTabTitle=New Tab
+
+# Open Search
+# LOCALIZATION NOTE (opensearch.search.header): %S is the word or phrase
+# typed by the user in the urlbar to search
+opensearch.search.header=Search for “%S” on:
+
+# Check for Updates in the About Panel - button labels and accesskeys
+# LOCALIZATION NOTE - all of the following update buttons labels will only be
+# displayed one at a time. So, if a button is displayed nothing else will
+# be displayed alongside of the button. The button when displayed is located
+# directly under the Firefox version in the about dialog (see bug 596813 for
+# screenshots).
+update.checkInsideButton.label=Check for Updates
+update.checkInsideButton.accesskey=C
+update.resumeButton.label=Resume Downloading %S…
+update.resumeButton.accesskey=D
+update.openUpdateUI.applyButton.label=Apply Update…
+update.openUpdateUI.applyButton.accesskey=A
+update.restart.updateButton.label=Restart to Update
+update.restart.updateButton.accesskey=R
+update.openUpdateUI.upgradeButton.label=Upgrade Now…
+update.openUpdateUI.upgradeButton.accesskey=U
+update.restart.upgradeButton.label=Upgrade Now
+update.restart.upgradeButton.accesskey=U
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/checkbox.dtd
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY checkbox.on.label    "On">
+<!ENTITY checkbox.off.label     "Off">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/config.dtd
@@ -0,0 +1,16 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY empty.label            "Search">
+<!ENTITY newpref.label          "Add a New Preference">
+<!ENTITY addpref.name           "Name">
+<!ENTITY addpref.value          "Value">
+
+<!ENTITY cancel.label           "Cancel">
+<!ENTITY reset.label            "Reset">
+<!ENTITY done.label             "Done">
+
+<!ENTITY integer.label          "Integer">
+<!ENTITY string.label           "String">
+<!ENTITY boolean.label          "Boolean">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/crashprompt.properties
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE (crashprompt.messagebody2): %1$S - short brand name, %2$S - vendor name
+crashprompt.messagebody2=We are sorry, %1$S just recovered from a crash. Sending crash reports will help %2$S make %1$S more stable and secure. You can always change your preference in Settings/Options.
+crashprompt.dialog.title=Would you like to send Mozilla crash reports?
+crashprompt.dialog.privacyLink=Privacy statement of crash-reporting feature
+crashprompt.dialog.acceptbutton=Send reports
+crashprompt.dialog.refusebutton=Don't send
+crashprompt.dialog.title2=Privacy statement of crash-reporting feature
+crashprompt.dialog.statement1=Firefox has a crash-reporting feature that sends a report to Mozilla when Firefox crashes. Mozilla uses information in crash reports to diagnose and correct problems in Firefox that cause crashes. Though this feature starts automatically after Firefox crashes, it does not send information to Mozilla until you explicitly authorise it to do so. By default, this feature sends a variety of Non-Personal Information to Mozilla, including the stack trace (a detailed description of which parts of the Firefox code were active at the time of the crash) and the type of computer you are using. Additional information is collected by the crash reporting feature. Which crash reporting feature is used and what additional information collected by Firefox depends on which version of Firefox you are using.
+crashprompt.dialog.statement2=For current versions of Firefox, “Firefox Crash Reporter” is Firefox’s crash reporting feature. With this feature, you may have the option to include Personal Information (including your email address), Potentially Personal Information (including your IP address and the URL of the site you were visiting when Firefox crashed), and a comment. Firefox Crash Reporter also sends a list of all add-ons that you were using at the time of the crash, the time since (i) the last crash, (ii) the last install, and (iii) the start-up of the program. Mozilla only makes Non-Personal Information (i.e., generic information about your computer, the stack trace, and any comment given by the user) available in the public reports available online at http://crash-stats.mozilla.com/.
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/passwordmgr.properties
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+rememberPassword = Use Password Manager to remember this password.
+savePasswordTitle = Confirm
+# 1st string is product name, 2nd is the username for the login, 3rd is the
+#   login's hostname. Note that long usernames may be truncated.
+saveLoginText = Do you want %1$S to remember the password for "%2$S" on %3$S?
+# 1st string is product name, 2nd is the login's hostname
+saveLoginTextNoUsername = Do you want %1$S to remember this password on %2$S?
+notifyBarNotForThisSiteButtonText = Not for this site
+notifyBarNotForThisSiteButtonAccessKey =
+notifyBarRememberPasswordButtonText = Remember password
+notifyBarRememberPasswordButtonAccessKey =
+passwordChangeTitle = Confirm Password Change
+passwordChangeText = Would you like to change the stored password for %S?
+passwordChangeTextNoUser = Would you like to change the stored password for this login?
+notifyBarChangeButtonText = Change
+notifyBarChangeButtonAccessKey =
+notifyBarDontChangeButtonText2 = Don't change
+notifyBarDontChangeButtonAccessKey =
+userSelectText = Please confirm which user you are changing the password for
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/phishing.dtd
@@ -0,0 +1,17 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY safeb.palm.accept.label "Get me out of here!">
+<!ENTITY safeb.palm.decline.label "Ignore this warning">
+<!ENTITY safeb.palm.notforgery.label2 "This isn't a web forgery…">
+<!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
+
+<!ENTITY safeb.blocked.malwarePage.title "Reported Attack Page!">
+<!-- Localization note (safeb.blocked.malware.shortDesc) - Please don't translate the contents of the <span id="malware_sitename"/> tag.  It will be replaced at runtime with a domain name (e.g. www.badsite.com) -->
+<!ENTITY safeb.blocked.malwarePage.shortDesc "This web page at <span id='malware_sitename'/> has been reported as an attack page and has been blocked based on your security preferences.">
+<!ENTITY safeb.blocked.malwarePage.longDesc "<p>Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.</p><p>Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.</p>">
+
+<!ENTITY safeb.blocked.phishingPage.title2 "Suspected Web Forgery!">
+<!ENTITY safeb.blocked.phishingPage.shortDesc2 "Entering any personal information on this page may result in identity theft or other fraud.">
+<!ENTITY safeb.blocked.phishingPage.longDesc2 "<p>These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.</p>">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/preferences.dtd
@@ -0,0 +1,42 @@
+<!-- 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/. -->
+
+<!-- ## Sync Flyout Panel ## -->
+<!-- see sync.dtd -->
+
+<!-- ## Options Flyout Panel ## -->
+<!ENTITY optionsHeader.title                                     "Options">
+<!ENTITY optionsHeader.startup.title                             "Startup">
+<!ENTITY optionsHeader.homepage.title                            "When &brandShortName; starts, show">
+<!ENTITY optionsHeader.homepage.startPage.button                 "start page">
+<!ENTITY optionsHeader.homepage.sessionRestore.button            "tabs from last time">
+<!ENTITY optionsHeader.char.title                                "Character Encoding">
+<!ENTITY optionsHeader.char.autodetect.label                     "Auto-detect">
+<!ENTITY optionsHeader.char.options.label                        "Show encoding options on the App Bar">
+
+<!ENTITY clearPrivateData.title                                  "Clear Private Data">
+<!ENTITY clearPrivateData.label                                  "Clear your browsing history, passwords, cookies, and form data on this device">
+<!ENTITY clearPrivateData.button                                 "Clear">
+<!ENTITY clearPrivateData.done                                   "Done!">
+<!ENTITY clearPrivateData.history                                "Browsing history">
+<!ENTITY clearPrivateData.otherdata                              "Other data (passwords, cache, cookies, etc)">
+<!ENTITY clearPrivateData.downloadHist                           "Download history">
+<!ENTITY clearPrivateData.cookies                                "Cookies">
+<!ENTITY clearPrivateData.cache                                  "Cache">
+<!ENTITY clearPrivateData.sitePref                               "Site preferences">
+<!ENTITY clearPrivateData.formSearchHist                         "Form &amp; search history">
+<!ENTITY clearPrivateData.passwords                              "Saved passwords">
+<!ENTITY clearPrivateData.offline                                "Offline web site data">
+<!ENTITY clearPrivateData.logins                                 "Active logins">
+
+<!ENTITY optionsHeader.privacy.passwords.label                   "Remember Passwords">
+<!ENTITY doNotTrack.title                                        "Do Not Track">
+<!ENTITY doNotTrack.desc                                         "Tell sites:">
+<!ENTITY doNotTrack.options.trackingNotOkay                      "I do not want to be tracked">
+<!ENTITY doNotTrack.options.noPreference                         "Nothing about my tracking preferences">
+<!ENTITY doNotTrack.options.trackingOkay                         "I want to be tracked">
+<!ENTITY optionsHeader.reporting.title                           "Crash Reporter">
+<!ENTITY optionsHeader.reporting.crashes.label                   "&brandShortName; submits crash reports to help Mozilla make your browser more stable and secure">
+<!ENTITY optionsHeader.telemetry.title                            "Telemetry">
+<!ENTITY optionsHeader.telemetry.label                            "Shares usage statistics about &brandShortName; with Mozilla to help us make your browser better">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/sync.dtd
@@ -0,0 +1,58 @@
+<!-- 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/. -->
+
+<!-- Flyout -->
+<!ENTITY sync.flyout.title                     "&syncBrand.shortName.label;">
+
+<!-- Flyout when not connected -->
+<!ENTITY sync.flyout.presetup.description1     "Access your bookmarks, passwords, and open tabs across your devices">
+<!ENTITY sync.flyout.presetup.setup.label      "Set Up &syncBrand.shortName.label;">
+
+<!-- Flyout when setting up sync -->
+<!ENTITY sync.flyout.setup.title               "Set Up &syncBrand.shortName.label;">
+<!ENTITY sync.flyout.setup.description1        "If you have a &syncBrand.shortName.label; account, select &quot;Pair a Device&quot; on your other device and enter this code.">
+<!ENTITY sync.flyout.setup.description2        "If you don&apos;t have a &syncBrand.shortName.label; account, you can create one on your &brandShortName; desktop browser.">
+<!ENTITY sync.flyout.setup.manual.label_2      "I&apos;m not near my computer…">
+<!ENTITY sync.flyout.setup.description3        "Note:">
+<!ENTITY sync.flyout.setup.description4_2      "To find &quot;Pair a Device&quot;,">
+<!ENTITY sync.flyout.setup.description5_2      "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then select &quot;&syncBrand.shortName.label;&quot;">
+<!ENTITY sync.flyout.setup.description6_2      "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
+
+<!-- Flyout when setting up manually -->
+<!ENTITY sync.flyout.manualsetup.description1_2  "Please enter your &syncBrand.shortName.label; account information and the Recovery Key generated by your computer">
+<!ENTITY sync.flyout.manualsetup.account.placeholder "Account Name">
+<!ENTITY sync.flyout.manualsetup.password.placeholder "Password">
+<!ENTITY sync.flyout.manualsetup.recoveryKey.placeholder "Recovery Key">
+<!ENTITY sync.flyout.manualsetup.connect.label           "Connect">
+
+<!-- Flyout when user has just connected -->
+<!ENTITY sync.flyout.setupsuccess.description1      "You just connected &brandShortName; to &syncBrand.shortName.label; account">
+<!ENTITY sync.flyout.setupsuccess.description2      "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your synchronised tabs can be found on &brandShortName; Start Page">
+
+<!-- Flyout when setup failed -->
+<!ENTITY sync.flyout.setupfailure.description       "&brandShortName; could not connect to your &syncBrand.shortName.label; account.">
+<!ENTITY sync.flyout.setupfailure.cancelButton      "Cancel">
+<!ENTITY sync.flyout.setupfailure.tryAgainButton    "Try Again">
+
+<!-- Flyout when connected and functioning normally -->
+<!ENTITY sync.flyout.connected.account                    "Account:">
+<!ENTITY sync.flyout.connected.device                     "Your device:">
+<!ENTITY sync.flyout.connected.disconnect                 "Disconnect">
+<!ENTITY sync.flyout.connected.disconnectWarningHeader    "Disconnect your device with &syncBrand.shortName.label;?">
+<!ENTITY sync.flyout.connected.disconnectWarning          "All your personal data on both this device and &syncBrand.shortName.label; account will remain intact.">
+<!ENTITY sync.flyout.connected.cancel                     "Cancel">
+<!ENTITY sync.flyout.connected.pair                       "Pair a Device">
+
+<!-- Flyout when pairing a device -->
+<!ENTITY sync.flyout.pairNewDevice.description            "On the new device you want to pair with, select &quot;Set Up &syncBrand.shortName.label;&quot; and enter the code the device produces">
+<!ENTITY sync.flyout.pairNewDevice.pair                   "Pair">
+<!ENTITY sync.flyout.pairNewDevice.note1                  "Note:">
+<!ENTITY sync.flyout.pairNewDevice.note2_2                "To find the code,">
+<!ENTITY sync.flyout.pairNewDevice.note3_2                "[Desktop] Open &quot;Options&quot; or &quot;Preferences&quot; and then follow the steps: &syncBrand.shortName.label; -&gt; Set up &syncBrand.shortName.label; -&gt; I have an account">
+<!ENTITY sync.flyout.pairNewDevice.note4                  "[Android] More &gt; Settings &gt; &syncBrand.shortName.label;">
+<!ENTITY sync.flyout.pairNewDevice.failure                "Please try again">
+
+<!-- Flyout when a device has been successfully paired -->
+<!ENTITY sync.flyout.pairSuccess.description1             "The new device has been successfully added.">
+<!ENTITY sync.flyout.pairSuccess.description2             "Your &syncBrand.shortName.label; data is now being downloaded in the background. Your remote tabs can be found on &brandShortName; Start Page.">
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/sync.properties
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE: Used in the default os description when a new account
+# is being set up. Should be unique to Metro, so that it does not conflict
+# with Desktop. See /services/sync/modules/engines/clients.js locaName.
+sync.defaultAccountApplication=Metro %S
+
+# %S is the date and time at which the last sync successfully completed
+sync.flyout.connected.lastSynced=Last synchronisation: %S
+# %S is the username logged in
+sync.flyout.connected.account=Account: %S
+# %S is the name that the user has chosen for this device
+sync.flyout.connected.device=Your device: %S
--- a/browser/pdfviewer/viewer.properties
+++ b/browser/pdfviewer/viewer.properties
@@ -36,16 +36,32 @@ presentation_mode.title=Switch to Presen
 presentation_mode_label=Presentation Mode
 open_file.title=Open File
 open_file_label=Open
 download.title=Download
 download_label=Download
 bookmark.title=Current view (copy or open in new window)
 bookmark_label=Current View
 
+# Secondary toolbar and context menu
+tools.title=Tools
+tools_label=Tools
+first_page.title=Go to First Page
+first_page.label=Go to First Page
+first_page_label=Go to First Page
+last_page.title=Go to Last Page
+last_page.label=Go to Last Page
+last_page_label=Go to Last Page
+page_rotate_cw.title=Rotate Clockwise
+page_rotate_cw.label=Rotate Clockwise
+page_rotate_cw_label=Rotate Clockwise
+page_rotate_ccw.title=Rotate Counter-Clockwise
+page_rotate_ccw.label=Rotate Counter-Clockwise
+page_rotate_ccw_label=Rotate Counter-Clockwise
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
 toggle_sidebar.title=Toggle Sidebar
 toggle_sidebar_label=Toggle Sidebar
 outline.title=Show Document Outline
 outline_label=Document Outline
 thumbs.title=Show Thumbnails
@@ -56,22 +72,16 @@ findbar_label=Find
 # 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}}
 
-# Context menu
-first_page.label=Go to First Page
-last_page.label=Go to Last Page
-page_rotate_cw.label=Rotate Clockwise
-page_rotate_ccw.label=Rotate Counter-Clockwise
-
 # Find panel button title and messages
 find_label=Find:
 find_previous.title=Find the previous occurrence of the phrase
 find_previous_label=Previous
 find_next.title=Find the next occurrence of the phrase
 find_next_label=Next
 find_highlight=Highlight all
 find_match_case_label=Match case
--- a/webapprt/webapprt/webapp.dtd
+++ b/webapprt/webapprt/webapp.dtd
@@ -13,22 +13,24 @@
 
 <!ENTITY quitApplicationCmdWin.label        "Exit">
 <!ENTITY quitApplicationCmdWin.accesskey    "x">
 <!ENTITY quitApplicationCmd.label           "Quit">
 <!ENTITY quitApplicationCmd.accesskey       "Q">
 <!-- On Mac, we create the Quit and Hide command labels dynamically,
    - using properties in window.properties, in order to include the name
    - of the webapp in the labels without creating a DTD file for it. -->
-<!ENTITY quitApplicationCmdMac.key          "Q">
 <!ENTITY hideThisAppCmdMac.key              "H">
 <!ENTITY hideOtherAppsCmdMac.label          "Hide Others">
 <!ENTITY hideOtherAppsCmdMac.key            "H">
 <!ENTITY showAllAppsCmdMac.label            "Show All">
 
+<!-- LOCALIZATION NOTE(quitApplicationCmdUnix.key): This keyboard shortcut is used by both Linux and OSX -->
+<!ENTITY quitApplicationCmdUnix.key          "Q">
+
 <!ENTITY editMenu.label                     "Edit">
 <!ENTITY editMenu.accesskey                 "E">
 <!ENTITY undoCmd.label                      "Undo">
 <!ENTITY undoCmd.key                        "Z">
 <!ENTITY undoCmd.accesskey                  "U">
 <!ENTITY redoCmd.label                      "Redo">
 <!ENTITY redoCmd.key                        "Y">
 <!ENTITY redoCmd.accesskey                  "R">
--- a/webapprt/webapprt/webapp.properties
+++ b/webapprt/webapprt/webapp.properties
@@ -15,20 +15,28 @@ quitApplicationCmdMac.label=Quit %S
 # LOCALIZATION NOTE (hideApplicationCmdMac.label): %S will be replaced with
 # the name of the webapp.
 hideApplicationCmdMac.label=Hide %S
 
 # LOCALIZATION NOTE (geolocation.title): %S will be replaced with the name of
 # the webapp.
 geolocation.title=%S - Share Location
 geolocation.description=Do you want to share your location?
-geolocation.sharelocation=Share Location
-geolocation.dontshare=Don't Share
+geolocation.allow=Share Location
+geolocation.deny=Don't Share
 geolocation.remember=Remember my choice
 
+# LOCALIZATION NOTE (desktop-notification.title): %S will be replaced with the
+# name of the webapp.
+desktop-notification.title=%S - Show notifications
+desktop-notification.description=Do you want to allow notifications?
+desktop-notification.allow=Show
+desktop-notification.deny=Don't show
+desktop-notification.remember=Remember my choice
+
 # LOCALIZATION NOTE (webapps.install.title): %S will be replaced with the name
 # of the webapp being installed.
 webapps.install.title=Install %S
 # LOCALIZATION NOTE (webapps.install.description): %S will be replaced with the
 # name of the webapp being installed.
 webapps.install.description=Do you want to install %S?
 webapps.install.install=Install App
 webapps.install.dontinstall=Don't Install