--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties@@ -1346,24 +1346,28 @@ listenDesc=Open a remote debug port # LOCALIZATION NOTE (listenManual2) A longer description of the 'listen' # command. listenManual2=%1$S 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 (listenFailed) Text of a failure message during the+# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the # execution of the 'listen' command.-listenFailed=Listen failed.+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 initialized+ # LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual, # mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe # the 'media' commands and all available parameters. mediaDesc=CSS media type emulation mediaEmulateDesc=Emulate a specified CSS media type mediaEmulateManual=View the document as if rendered on a device supporting the given media type, with the relevant CSS rules applied. mediaEmulateType=The media type to emulate mediaResetDesc=Stop emulating a CSS media type

--- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd@@ -62,17 +62,17 @@ - boolean preference in about:config, in the options panel. --> <!ENTITY options.enableChrome.label4 "Enable chrome and addon debugging"> <!ENTITY options.enableChrome.tooltip2 "Turning this option on will allow you to use various developer tools in browser context and debug addons from the Add-On Manager"> <!-- LOCALIZATION NOTE (options.enableRemote.label3): This is the label for the - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - boolean preference in about:config, in the options panel. --> <!ENTITY options.enableRemote.label3 "Enable remote debugging">-<!ENTITY options.enableRemote.tooltip2 "Turning this option on will start a debugger server and allow other instances of Firefox to debug this instance">+<!ENTITY options.enableRemote.tooltip "Turning this option on will allow the developer tools to debug remote Firefox instance like Firefox OS"> <!-- LOCALIZATION NOTE (options.disableJavaScript.label, - options.disableJavaScript.tooltip): This is the options panel label and - tooltip for the checkbox that toggles JavaScript on or off. --> <!ENTITY options.disableJavaScript.label "Disable JavaScript *"> <!ENTITY options.disableJavaScript.tooltip "Turning this option on will disable JavaScript for the current tab. If the tab or the toolbox is closed then this setting will be forgotten."> <!-- LOCALIZATION NOTE (options.disableCache.label,

--- a/testing/mochitest/mochitest_options.py+++ b/testing/mochitest/mochitest_options.py@@ -510,16 +510,17 @@ class MochitestOptions(optparse.OptionPa if options.manifestFile and options.testManifest: self.error("Unable to support both --manifest and --test-manifest/--run-only-tests at the same time") if options.webapprtContent and options.webapprtChrome: self.error("Only one of --webapprt-content and --webapprt-chrome may be given.") if options.jsdebugger: options.extraPrefs += [+ "devtools.debugger.remote-enabled=true", "devtools.debugger.chrome-enabled=true", "devtools.chrome.enabled=true", "devtools.debugger.prompt-connection=false" ] options.autorun = False if options.debugOnFailure and not options.jsdebugger: self.error("--debug-on-failure should be used together with --jsdebugger.")

--- a/toolkit/locales/en-US/chrome/global/devtools/debugger.properties+++ b/toolkit/locales/en-US/chrome/global/devtools/debugger.properties@@ -17,19 +17,8 @@ remoteIncomingPromptTitle=Incoming Conne # LOCALIZATION NOTE (remoteIncomingPromptMessage): The message displayed on the # dialog that prompts the user to allow the incoming connection. remoteIncomingPromptMessage=An incoming request to permit remote debugging connection was detected. A remote client can take complete control over your browser! Allow connection? # LOCALIZATION NOTE (remoteIncomingPromptDisable): The label displayed on the # third button in the incoming connection dialog that lets the user disable the # remote debugger server. remoteIncomingPromptDisable=Disable--# LOCALIZATION NOTE (debuggerStarted.*): The message is displayed in a system-# notification box when the debugger is started. %S is the port or path the-# server is listening to.-debuggerStartedAlert.title=Debugger Server now running-debuggerStartedAlert.detailPort=Listening on port %S-debuggerStartedAlert.detailPath=Listening on %S--# LOCALIZATION NOTE (debuggerStopped.title): The message is displayed in a system-# notification box when the debugger is stopped.-debuggerStopped.title=Debugger Server stopped