diff --git a/mozilla/browser/base/content/browser-menubar.inc b/mozilla/browser/base/content/browser-menubar.inc index 7efddf88133..cc98b6568ad 100644 --- a/mozilla/browser/base/content/browser-menubar.inc +++ b/mozilla/browser/base/content/browser-menubar.inc @@ -478,7 +478,7 @@ command="Tools:Addons"/> #ifdef XP_WIN - - + + diff --git a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf index 16da8e55abd..5cd9d327761 100644 --- a/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf +++ b/mozilla/browser/locales/en-US/chrome/help/firebird-toc.rdf @@ -328,7 +328,7 @@ - + diff --git a/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml b/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml index 54395bfce7e..c44d823e11f 100644 --- a/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml +++ b/mozilla/browser/locales/en-US/chrome/help/menu_reference.xhtml @@ -330,8 +330,8 @@ Contributors: this dialog. For more information, see the Themes help topic.

-

JavaScript Console

-

Opens the JavaScript Console, which tracks problems with JavaScript code. +

Error Console

+

Opens the Error Console, which tracks problems with JavaScript code. JavaScript is a scripting language commonly used to construct web pages. Programmers use JavaScript to make web pages more interactive; JavaScript is often used to dynamically validate forms and select buttons.

diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index f2b262dbd4f..9585b0d4101 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -167,7 +167,7 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel) return NS_ERROR_FAILURE; } - // If mURI is just "javascript:", we bring up the JavaScript console + // If mURI is just "javascript:", we bring up the Error console // and return NS_ERROR_DOM_RETVAL_UNDEFINED. if (script.IsEmpty()) { rv = BringUpConsole(domWindow); diff --git a/mozilla/extensions/help/resources/content/help.js b/mozilla/extensions/help/resources/content/help.js index 4504d7b116d..12e46649fdd 100644 --- a/mozilla/extensions/help/resources/content/help.js +++ b/mozilla/extensions/help/resources/content/help.js @@ -675,7 +675,7 @@ function getAttribute(datasource, resource, attributeResourceName, defaultValue) var literal = datasource.GetTarget(resource, attributeResourceName, true); return literal instanceof Components.interfaces.nsIRDFLiteral ? literal.Value : defaultValue; } -// Write debug string to javascript console. +// Write debug string to error console. function log(aText) { CONSOLE_SERVICE.logStringMessage(aText); } diff --git a/mozilla/extensions/help/resources/locale/en-US/developer_tools.xhtml b/mozilla/extensions/help/resources/locale/en-US/developer_tools.xhtml index deaca0ca5c9..58d18ebc647 100644 --- a/mozilla/extensions/help/resources/locale/en-US/developer_tools.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/developer_tools.xhtml @@ -23,7 +23,7 @@
  • - JavaScript Console: the console + Error Console: the console window displays JavaScript warnings, errors, and notices that occur in Web applications as well as the &brandShortName; application itself.
    • diff --git a/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf index 69b1da8500c..f5aac007c53 100644 --- a/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf +++ b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf @@ -535,6 +535,11 @@ + + + @@ -887,11 +892,6 @@ - - - - + diff --git a/mozilla/extensions/inspector/resources/content/utils.js b/mozilla/extensions/inspector/resources/content/utils.js index c61e77736d3..9595840db3f 100644 --- a/mozilla/extensions/inspector/resources/content/utils.js +++ b/mozilla/extensions/inspector/resources/content/utils.js @@ -143,7 +143,7 @@ function debug(aText) //dump(aText); } -// dump text to the Javascript Console +// dump text to the Error Console function consoleDump(aText) { var csClass = Components.classes['@mozilla.org/consoleservice;1']; diff --git a/mozilla/extensions/manticore/browser/browser-menu.xml b/mozilla/extensions/manticore/browser/browser-menu.xml index d3637107eff..ded2f5753c9 100644 --- a/mozilla/extensions/manticore/browser/browser-menu.xml +++ b/mozilla/extensions/manticore/browser/browser-menu.xml @@ -99,7 +99,7 @@ - + diff --git a/mozilla/extensions/webservices/soap/tests/soapcall.html b/mozilla/extensions/webservices/soap/tests/soapcall.html index 42627ca1d2c..d47b84d285f 100644 --- a/mozilla/extensions/webservices/soap/tests/soapcall.html +++ b/mozilla/extensions/webservices/soap/tests/soapcall.html @@ -35,6 +35,6 @@ function showCall(syncCall, faultCall) { }

    -

    The SOAP call was not encoded. Look at the Javascript console to determine why. +

    The SOAP call was not encoded. Look at the Error console to determine why. diff --git a/mozilla/extensions/webservices/soap/tests/soapstatistics.html b/mozilla/extensions/webservices/soap/tests/soapstatistics.html index 5f99e81aa6f..73ca544bdf8 100644 --- a/mozilla/extensions/webservices/soap/tests/soapstatistics.html +++ b/mozilla/extensions/webservices/soap/tests/soapstatistics.html @@ -58,6 +58,6 @@ function soapcall() { } -

    SOAP call did not complete. Look at the Javascript console to determine why. +

    SOAP call did not complete. Look at the Error console to determine why. diff --git a/mozilla/extensions/xforms/nsXFormsUtils.cpp b/mozilla/extensions/xforms/nsXFormsUtils.cpp index 19ba23aa204..0ff6d48a7ba 100644 --- a/mozilla/extensions/xforms/nsXFormsUtils.cpp +++ b/mozilla/extensions/xforms/nsXFormsUtils.cpp @@ -1579,7 +1579,7 @@ nsXFormsUtils::ReportError(const nsString& aMessageName, const PRUnichar **aPara } - // Log the message to JavaScript Console + // Log the message to Error Console #ifdef DEBUG printf("ERR: %s\n", NS_ConvertUTF16toUTF8(msg).get()); #endif diff --git a/mozilla/extensions/xforms/nsXFormsUtils.h b/mozilla/extensions/xforms/nsXFormsUtils.h index 1084e867eab..4c271312892 100644 --- a/mozilla/extensions/xforms/nsXFormsUtils.h +++ b/mozilla/extensions/xforms/nsXFormsUtils.h @@ -433,7 +433,7 @@ public: nsAString &aNSUri); /** - * Outputs to the JavaScript console. + * Outputs to the Error console. * * @param aMessageName Name of string to output, which is loaded from xforms.properties diff --git a/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd b/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd index d096d3e14e3..2fa1ce12619 100644 --- a/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd +++ b/mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd @@ -57,7 +57,7 @@ - + diff --git a/mozilla/js/rhino/docs/RhinoDebugger.html b/mozilla/js/rhino/docs/RhinoDebugger.html index 884ed6f458a..e0a79c45631 100644 --- a/mozilla/js/rhino/docs/RhinoDebugger.html +++ b/mozilla/js/rhino/docs/RhinoDebugger.html @@ -19,7 +19,7 @@

    1. Console Window
      2. -

      The debugger redirects the System.out, System.in, and System.err streams to an internal JavaScript console window which provides an editable command line for you to enter JavaScript code and view system output. The console window maintains a history of the commands you have entered. You may move backward and forward through the history list by pressing the Up/Down arrow keys on the keyboard.

      +

      The debugger redirects the System.out, System.in, and System.err streams to an internal Error console window which provides an editable command line for you to enter JavaScript code and view system output. The console window maintains a history of the commands you have entered. You may move backward and forward through the history list by pressing the Up/Down arrow keys on the keyboard.

    2. Opening Scripts

      3. You may select the File->Open menu item on the menu bar to load JavaScript scripts contained in files. This action will display a file-selection dialog box prompting you for the location of a script to load. The selected file will be compiled and displayed in a new window.

    3. Running Scripts
      4. diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 0ec4e4628e5..db56d57bb73 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -115,7 +115,7 @@ Reporter(JSContext *cx, const char *message, JSErrorReport *rep) /* * Make an nsIScriptError, populate it with information from this * error, then log it with the console service. The UI can then - * poll the service to update the JavaScript console. + * poll the service to update the Error console. */ nsCOMPtr errorObject = do_CreateInstance(NS_SCRIPTERROR_CONTRACTID); diff --git a/mozilla/layout/style/nsCSSScanner.cpp b/mozilla/layout/style/nsCSSScanner.cpp index edc00943796..f2155305ab2 100644 --- a/mozilla/layout/style/nsCSSScanner.cpp +++ b/mozilla/layout/style/nsCSSScanner.cpp @@ -327,7 +327,7 @@ void nsCSSScanner::OutputError() NS_ConvertUTF16toUTF8(mError).get()); #endif - // Log it to the JavaScript console + // Log it to the Error console if (InitGlobals() && gReportErrors) { nsresult rv; diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul index fb2483da1d7..0768a08b82c 100644 --- a/mozilla/mail/base/content/mailWindowOverlay.xul +++ b/mozilla/mail/base/content/mailWindowOverlay.xul @@ -1748,7 +1748,7 @@ - + #ifndef XP_UNIX diff --git a/mozilla/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd b/mozilla/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd index 3770b88bca9..7e1091d5bb6 100644 --- a/mozilla/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd +++ b/mozilla/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd @@ -18,8 +18,8 @@ - - + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd b/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd index 311f70952ba..9e6928cc37c 100644 --- a/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd +++ b/mozilla/mail/locales/en-US/chrome/messenger/messenger.dtd @@ -401,8 +401,8 @@ - - + + diff --git a/mozilla/modules/plugin/samples/simple/SimpleScriptableTest.html b/mozilla/modules/plugin/samples/simple/SimpleScriptableTest.html index 5313cd1b884..adf5ae2e288 100644 --- a/mozilla/modules/plugin/samples/simple/SimpleScriptableTest.html +++ b/mozilla/modules/plugin/samples/simple/SimpleScriptableTest.html @@ -90,7 +90,7 @@ contents of 'it':

    4. Can't load pluign: Copy the compiled plugin to your plugins directory -

    5. JavaScript error in the JavaScript console talking about how +

    6. JavaScript error in the Error console talking about how XPConnect can't build a wrapper: Copy the type library (nsISimplePluginInstance.xpt) to the mozilla components directory. diff --git a/mozilla/themes/classic/global/mac/console.css b/mozilla/themes/classic/global/mac/console.css index 11bae4e5817..668cdfbd459 100644 --- a/mozilla/themes/classic/global/mac/console.css +++ b/mozilla/themes/classic/global/mac/console.css @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ /* ===== console.css ==================================================== - == Styles used by the JavaScript Console window. + == Styles used by the Error Console window. ======================================================================= */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/mozilla/themes/classic/global/win/console.css b/mozilla/themes/classic/global/win/console.css index 11bae4e5817..668cdfbd459 100644 --- a/mozilla/themes/classic/global/win/console.css +++ b/mozilla/themes/classic/global/win/console.css @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ /* ===== console.css ==================================================== - == Styles used by the JavaScript Console window. + == Styles used by the Error Console window. ======================================================================= */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/mozilla/themes/modern/global/console.css b/mozilla/themes/modern/global/console.css index f0328cc4f8d..b727db852b3 100644 --- a/mozilla/themes/modern/global/console.css +++ b/mozilla/themes/modern/global/console.css @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ /* ===== console.css ==================================================== - == Styles used by the JavaScript Console window. + == Styles used by the Error Console window. ======================================================================= */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/mozilla/toolkit/components/console/content/console.xul b/mozilla/toolkit/components/console/content/console.xul index 2e23d683206..84974591cd4 100644 --- a/mozilla/toolkit/components/console/content/console.xul +++ b/mozilla/toolkit/components/console/content/console.xul @@ -48,7 +48,7 @@ - + diff --git a/mozilla/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties b/mozilla/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties index 4e50178324a..26d874bb5b4 100644 --- a/mozilla/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties +++ b/mozilla/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties @@ -102,7 +102,7 @@ ERROR=ERROR error0=Success error999=Restart to complete error-202=Access denied -error-203=Unexpected installation error\nReview the JavaScript Console log for more details. +error-203=Unexpected installation error\nReview the Error Console log for more details. error-204=Install script not found error-207=Not a valid install package error-208=Invalid argument diff --git a/mozilla/toolkit/themes/pinstripe/global/console/console.css b/mozilla/toolkit/themes/pinstripe/global/console/console.css index 5c317dc3bd5..6ebf1e5dd9a 100644 --- a/mozilla/toolkit/themes/pinstripe/global/console/console.css +++ b/mozilla/toolkit/themes/pinstripe/global/console/console.css @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ /* ===== console.css ==================================================== - == Styles used by the JavaScript Console window. + == Styles used by the Error Console window. ======================================================================= */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); diff --git a/mozilla/toolkit/themes/winstripe/global/console/console.css b/mozilla/toolkit/themes/winstripe/global/console/console.css index ce76fe2aa6d..16aa649eeb7 100644 --- a/mozilla/toolkit/themes/winstripe/global/console/console.css +++ b/mozilla/toolkit/themes/winstripe/global/console/console.css @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ /* ===== console.css ==================================================== - == Styles used by the JavaScript Console window. + == Styles used by the Error Console window. ====================================================================== */ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @@ -138,7 +138,7 @@ toolbarseparator { min-height: 1em; } -/* ::::: Fix JavaScript Console toolbar button text spacing ::::: */ +/* ::::: Fix Error Console toolbar button text spacing ::::: */ .toolbarbutton-text { -moz-padding-start: 0px; diff --git a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul index 88caf6a9e8f..c02929ba210 100644 --- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul +++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul @@ -29,7 +29,7 @@ - + diff --git a/mozilla/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd b/mozilla/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd index 43bab80a74f..d7756e34e82 100644 --- a/mozilla/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd +++ b/mozilla/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd @@ -13,8 +13,8 @@ - - + + diff --git a/mozilla/xpfe/components/console/resources/locale/en-US/console.dtd b/mozilla/xpfe/components/console/resources/locale/en-US/console.dtd index ffc8b64bc59..de28f2f92e2 100644 --- a/mozilla/xpfe/components/console/resources/locale/en-US/console.dtd +++ b/mozilla/xpfe/components/console/resources/locale/en-US/console.dtd @@ -35,7 +35,7 @@ ***** END LICENSE BLOCK ***** --> - +