From cfecfe32682eaa5d834443ddc00f75a0d686983a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 4 Nov 2015 15:35:53 -0600 Subject: [PATCH] Bug 1182722 - Move DevTools l10n files. r=ochameau,glandium,Pike,bgrins Move DevTools l10n files under /devtools/client and /devtools/shared. A script is attached to the bug for l10n repos to migrate their strings. --- b2g/locales/filter.py | 1 + browser/locales/Makefile.in | 3 +- browser/locales/filter.py | 1 + browser/locales/jar.mn | 54 ------------------- browser/locales/l10n.ini | 1 + .../aboutdebugging/aboutdebugging.xhtml | 4 +- .../aboutdebugging/components/addons.js | 2 +- .../aboutdebugging/components/target-list.js | 2 +- .../aboutdebugging/components/target.js | 2 +- .../aboutdebugging/components/workers.js | 2 +- .../animation-controller.js | 2 +- .../animation-inspector.xhtml | 2 +- .../client/animationinspector/components.js | 2 +- ...browser_animation_running_on_compositor.js | 2 +- .../client/canvasdebugger/canvasdebugger.js | 4 +- .../client/canvasdebugger/canvasdebugger.xul | 2 +- .../client/debugger/debugger-controller.js | 2 +- devtools/client/debugger/debugger.xul | 2 +- devtools/client/definitions.js | 26 ++++----- devtools/client/eyedropper/eyedropper.js | 2 +- .../client/fontinspector/font-inspector.xhtml | 2 +- devtools/client/framework/connect/connect.js | 2 +- .../client/framework/connect/connect.xhtml | 2 +- .../dev-edition-promo/dev-edition-promo.xul | 2 +- devtools/client/framework/gDevTools.jsm | 2 +- devtools/client/framework/sidebar.js | 2 +- devtools/client/framework/toolbox-options.js | 2 +- devtools/client/framework/toolbox-options.xul | 2 +- .../framework/toolbox-process-window.xul | 2 +- devtools/client/framework/toolbox-window.xul | 2 +- devtools/client/framework/toolbox.js | 2 +- devtools/client/framework/toolbox.xul | 2 +- devtools/client/inspector/inspector-panel.js | 4 +- devtools/client/inspector/inspector.xul | 2 +- devtools/client/jsonview/converter-child.js | 2 +- devtools/client/layoutview/view.js | 2 +- devtools/client/layoutview/view.xhtml | 2 +- .../client/locales/en-US}/VariablesView.dtd | 0 .../client/locales/en-US}/aboutdebugging.dtd | 0 .../locales/en-US}/aboutdebugging.properties | 0 .../locales/en-US}/animationinspector.dtd | 0 .../en-US}/animationinspector.properties | 0 .../locales/en-US}/app-manager.properties | 0 .../locales/en-US}/appcacheutils.properties | 0 .../client/locales/en-US}/canvasdebugger.dtd | 0 .../locales/en-US}/canvasdebugger.properties | 0 .../locales/en-US}/connection-screen.dtd | 0 .../en-US}/connection-screen.properties | 0 .../client/locales/en-US}/debugger.dtd | 0 .../client/locales/en-US}/debugger.properties | 0 .../client/locales/en-US}/device.properties | 0 .../locales/en-US}/eyedropper.properties | 0 .../client/locales/en-US}/filterwidget.dtd | 0 .../locales/en-US}/filterwidget.properties | 0 .../client/locales/en-US}/font-inspector.dtd | 0 .../client/locales/en-US}/graphs.properties | 0 .../client/locales/en-US}/har.properties | 0 .../client/locales/en-US}/inspector.dtd | 0 .../locales/en-US}/inspector.properties | 0 .../client/locales/en-US}/jsonview.properties | 0 .../client/locales/en-US}/layoutview.dtd | 0 .../client/locales/en-US}/markers.properties | 0 .../client/locales/en-US}/memory.properties | 0 .../client/locales/en-US}/netmonitor.dtd | 0 .../locales/en-US}/netmonitor.properties | 0 .../client/locales/en-US}/performance.dtd | 0 .../locales/en-US}/performance.properties | 0 .../locales/en-US}/projecteditor.properties | 0 .../client/locales/en-US}/promisedebugger.dtd | 0 .../locales/en-US}/promisedebugger.properties | 0 .../locales/en-US}/responsiveUI.properties | 0 .../client/locales/en-US}/scratchpad.dtd | 0 .../locales/en-US}/scratchpad.properties | 0 .../client/locales/en-US}/shadereditor.dtd | 0 .../locales/en-US}/shadereditor.properties | 0 .../client/locales/en-US}/shared.properties | 0 .../client/locales/en-US}/sourceeditor.dtd | 0 .../locales/en-US}/sourceeditor.properties | 0 .../client/locales/en-US}/storage.properties | 0 .../client/locales/en-US}/styleeditor.dtd | 0 .../locales/en-US}/styleeditor.properties | 0 .../client/locales/en-US}/styleinspector.dtd | 0 .../client/locales/en-US}/tilt.properties | 0 .../client/locales/en-US}/toolbox.dtd | 0 .../client/locales/en-US}/toolbox.properties | 0 .../client/locales/en-US}/webConsole.dtd | 0 .../client/locales/en-US}/webaudioeditor.dtd | 0 .../locales/en-US}/webaudioeditor.properties | 0 .../locales/en-US}/webconsole.properties | 0 .../client/locales/en-US}/webide.dtd | 0 .../client/locales/en-US}/webide.properties | 0 devtools/client/locales/jar.mn | 8 +++ devtools/client/locales/moz.build | 7 +++ devtools/client/markupview/markup-view.js | 2 +- .../test/browser_markupview_links_04.js | 4 +- devtools/client/memory/utils.js | 2 +- devtools/client/moz.build | 1 + devtools/client/netmonitor/har/har-builder.js | 2 +- .../netmonitor/netmonitor-controller.js | 2 +- devtools/client/netmonitor/netmonitor.xul | 2 +- .../test/browser_net_prefs-and-l10n.js | 2 +- devtools/client/performance/modules/global.js | 4 +- devtools/client/performance/performance.xul | 2 +- .../chrome/content/projecteditor-loader.xul | 2 +- .../chrome/content/projecteditor.xul | 4 +- .../client/projecteditor/lib/helpers/l10n.js | 2 +- .../lib/plugins/app-manager/plugin.js | 2 +- .../promisedebugger/promise-debugger.xhtml | 2 +- .../responsivedesign/responsivedesign.jsm | 4 +- devtools/client/scratchpad/scratchpad.js | 2 +- devtools/client/scratchpad/scratchpad.xul | 4 +- devtools/client/shadereditor/shadereditor.js | 2 +- devtools/client/shadereditor/shadereditor.xul | 2 +- devtools/client/shared/AppCacheUtils.jsm | 2 +- devtools/client/shared/DeveloperToolbar.jsm | 2 +- devtools/client/shared/devices.js | 2 +- .../shared/test/browser_filter-editor-02.js | 2 +- .../shared/test/browser_filter-editor-06.js | 2 +- .../shared/test/browser_filter-editor-07.js | 2 +- devtools/client/shared/widgets/Chart.jsm | 2 +- .../client/shared/widgets/FilterWidget.js | 2 +- .../client/shared/widgets/LineGraphWidget.js | 2 +- .../client/shared/widgets/MdnDocsWidget.js | 2 +- devtools/client/shared/widgets/Tooltip.js | 2 +- .../client/shared/widgets/VariablesView.jsm | 2 +- .../client/shared/widgets/VariablesView.xul | 2 +- .../widgets/VariablesViewController.jsm | 2 +- .../client/shared/widgets/filter-frame.xhtml | 2 +- devtools/client/sourceeditor/editor.js | 2 +- .../test/browser_editor_find_again.js | 2 +- devtools/client/storage/ui.js | 2 +- .../client/styleeditor/StyleEditorUtil.jsm | 2 +- .../client/styleeditor/styleeditor-panel.js | 2 +- devtools/client/styleeditor/styleeditor.xul | 6 +-- .../client/styleinspector/computed-view.js | 2 +- .../client/styleinspector/computedview.xhtml | 2 +- .../client/styleinspector/cssruleview.xhtml | 2 +- devtools/client/styleinspector/rule-view.js | 2 +- .../styleinspector/style-inspector-menu.js | 2 +- .../client/styleinspector/style-inspector.js | 2 +- .../test/browser_ruleview_content_02.js | 2 +- .../test/browser_ruleview_media-queries.js | 2 +- ...r_styleinspector_context-menu-copy-urls.js | 14 ++--- devtools/client/tilt/tilt-utils.js | 2 +- devtools/client/webaudioeditor/includes.js | 2 +- .../client/webaudioeditor/webaudioeditor.xul | 2 +- devtools/client/webconsole/console-output.js | 2 +- devtools/client/webconsole/hudservice.js | 2 +- devtools/client/webconsole/test/head.js | 2 +- devtools/client/webconsole/webconsole.js | 2 +- devtools/client/webconsole/webconsole.xul | 2 +- devtools/client/webide/content/addons.js | 2 +- devtools/client/webide/content/addons.xhtml | 2 +- devtools/client/webide/content/details.xhtml | 2 +- .../webide/content/devicepreferences.xhtml | 2 +- .../webide/content/devicesettings.xhtml | 2 +- devtools/client/webide/content/logs.xhtml | 2 +- devtools/client/webide/content/monitor.xhtml | 2 +- devtools/client/webide/content/newapp.xul | 2 +- .../webide/content/permissionstable.xhtml | 2 +- devtools/client/webide/content/prefs.xhtml | 2 +- .../webide/content/project-listing.xhtml | 2 +- .../webide/content/runtime-listing.xhtml | 2 +- .../client/webide/content/runtimedetails.js | 2 +- .../webide/content/runtimedetails.xhtml | 2 +- devtools/client/webide/content/simulator.js | 2 +- .../client/webide/content/simulator.xhtml | 2 +- devtools/client/webide/content/webide.js | 2 +- devtools/client/webide/content/webide.xul | 2 +- .../client/webide/content/wifi-auth.xhtml | 2 +- devtools/client/webide/modules/app-manager.js | 2 +- .../client/webide/modules/app-validator.js | 2 +- devtools/client/webide/modules/config-view.js | 2 +- .../client/webide/modules/project-list.js | 2 +- .../client/webide/modules/runtime-list.js | 2 +- devtools/client/webide/modules/runtimes.js | 2 +- devtools/client/webide/modules/utils.js | 2 +- .../webide/test/test_app_validator.html | 2 +- devtools/server/actors/csscoverage.js | 2 +- .../test_css-logic-media-queries.html | 2 +- devtools/shared/gcli/commands/highlight.js | 2 +- devtools/shared/gcli/source/lib/gcli/l10n.js | 2 +- .../shared/gcli/source/lib/gcli/util/l10n.js | 2 +- .../shared/locales/en-US}/csscoverage.dtd | 0 .../locales/en-US}/csscoverage.properties | 0 .../shared/locales/en-US}/debugger.properties | 0 .../shared/locales/en-US}/gcli.properties | 0 .../locales/en-US}/gclicommands.properties | 0 .../locales/en-US}/styleinspector.properties | 0 devtools/shared/locales/jar.mn | 8 +++ devtools/shared/locales/moz.build | 7 +++ devtools/shared/moz.build | 1 + devtools/shared/security/prompt.js | 2 +- devtools/shared/styleinspector/css-logic.js | 2 +- .../shared/tests/unit/test_fetch-chrome.js | 2 +- mobile/android/locales/filter.py | 1 + mobile/locales/filter.py | 1 + toolkit/locales/Makefile.in | 3 +- toolkit/locales/jar.mn | 6 --- toolkit/locales/l10n.ini | 1 + 200 files changed, 195 insertions(+), 213 deletions(-) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/VariablesView.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/aboutdebugging.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/aboutdebugging.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/animationinspector.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/animationinspector.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/app-manager.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/appcacheutils.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/canvasdebugger.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/canvasdebugger.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/connection-screen.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/connection-screen.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/debugger.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/debugger.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/device.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/eyedropper.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/filterwidget.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/filterwidget.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/font-inspector.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/graphs.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/har.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/inspector.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/inspector.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/jsonview.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/layoutview.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/markers.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/memory.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/netmonitor.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/netmonitor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/performance.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/performance.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/projecteditor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/promisedebugger.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/promisedebugger.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/responsiveUI.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/scratchpad.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/scratchpad.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/shadereditor.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/shadereditor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/shared.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/sourceeditor.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/sourceeditor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/storage.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/styleeditor.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/styleeditor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/styleinspector.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/tilt.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/toolbox.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/toolbox.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webConsole.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webaudioeditor.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webaudioeditor.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webconsole.properties (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webide.dtd (100%) rename {browser/locales/en-US/chrome/browser/devtools => devtools/client/locales/en-US}/webide.properties (100%) create mode 100644 devtools/client/locales/jar.mn create mode 100644 devtools/client/locales/moz.build rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/csscoverage.dtd (100%) rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/csscoverage.properties (100%) rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/debugger.properties (100%) rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/gcli.properties (100%) rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/gclicommands.properties (100%) rename {toolkit/locales/en-US/chrome/global/devtools => devtools/shared/locales/en-US}/styleinspector.properties (100%) create mode 100644 devtools/shared/locales/jar.mn create mode 100644 devtools/shared/locales/moz.build diff --git a/b2g/locales/filter.py b/b2g/locales/filter.py index 05f7abcdbcf..d49507adca1 100644 --- a/b2g/locales/filter.py +++ b/b2g/locales/filter.py @@ -7,6 +7,7 @@ def test(mod, path, entity = None): import re # ignore anything but b2g and specific overloads from dom and toolkit if mod not in ("netwerk", "dom", "toolkit", "security/manager", + "devtools/shared", "mobile", "b2g"): return "ignore" diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index dc832576f9b..6b38922de48 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -127,13 +127,14 @@ libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) libs-%: $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../toolkit/locales libs-$* + @$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID=$(XPI_ROOT_APPID) @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* ifdef MOZ_WEBAPP_RUNTIME @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID=$(XPI_ROOT_APPID) @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/browser/locales/filter.py b/browser/locales/filter.py index 9c912be401f..51ae5e84e5c 100755 --- a/browser/locales/filter.py +++ b/browser/locales/filter.py @@ -6,6 +6,7 @@ def test(mod, path, entity = None): import re # ignore anything but Firefox if mod not in ("netwerk", "dom", "toolkit", "security/manager", + "devtools/client", "devtools/shared", "browser", "webapprt", "extensions/reporter", "extensions/spellcheck", "other-licenses/branding/firefox", diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index f6243f1c1e7..679e5816477 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -28,60 +28,6 @@ locale/browser/browser.properties (%chrome/browser/browser.properties) locale/browser/browser-pocket.properties (%chrome/browser/browser-pocket.properties) locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) - locale/browser/devtools/aboutdebugging.dtd (%chrome/browser/devtools/aboutdebugging.dtd) - locale/browser/devtools/aboutdebugging.properties (%chrome/browser/devtools/aboutdebugging.properties) - locale/browser/devtools/animationinspector.dtd (%chrome/browser/devtools/animationinspector.dtd) - locale/browser/devtools/animationinspector.properties (%chrome/browser/devtools/animationinspector.properties) - locale/browser/devtools/appcacheutils.properties (%chrome/browser/devtools/appcacheutils.properties) - locale/browser/devtools/debugger.dtd (%chrome/browser/devtools/debugger.dtd) - locale/browser/devtools/debugger.properties (%chrome/browser/devtools/debugger.properties) - locale/browser/devtools/device.properties (%chrome/browser/devtools/device.properties) - locale/browser/devtools/filterwidget.properties (%chrome/browser/devtools/filterwidget.properties) - locale/browser/devtools/filterwidget.dtd (%chrome/browser/devtools/filterwidget.dtd) - locale/browser/devtools/netmonitor.dtd (%chrome/browser/devtools/netmonitor.dtd) - locale/browser/devtools/netmonitor.properties (%chrome/browser/devtools/netmonitor.properties) - locale/browser/devtools/shadereditor.dtd (%chrome/browser/devtools/shadereditor.dtd) - locale/browser/devtools/shadereditor.properties (%chrome/browser/devtools/shadereditor.properties) - locale/browser/devtools/canvasdebugger.dtd (%chrome/browser/devtools/canvasdebugger.dtd) - locale/browser/devtools/canvasdebugger.properties (%chrome/browser/devtools/canvasdebugger.properties) - locale/browser/devtools/webaudioeditor.dtd (%chrome/browser/devtools/webaudioeditor.dtd) - locale/browser/devtools/webaudioeditor.properties (%chrome/browser/devtools/webaudioeditor.properties) - locale/browser/devtools/webconsole.properties (%chrome/browser/devtools/webconsole.properties) - locale/browser/devtools/inspector.properties (%chrome/browser/devtools/inspector.properties) - locale/browser/devtools/jsonview.properties (%chrome/browser/devtools/jsonview.properties) - locale/browser/devtools/tilt.properties (%chrome/browser/devtools/tilt.properties) - locale/browser/devtools/shared.properties (%chrome/browser/devtools/shared.properties) - locale/browser/devtools/scratchpad.properties (%chrome/browser/devtools/scratchpad.properties) - locale/browser/devtools/scratchpad.dtd (%chrome/browser/devtools/scratchpad.dtd) - locale/browser/devtools/storage.properties (%chrome/browser/devtools/storage.properties) - locale/browser/devtools/styleeditor.properties (%chrome/browser/devtools/styleeditor.properties) - locale/browser/devtools/styleeditor.dtd (%chrome/browser/devtools/styleeditor.dtd) - locale/browser/devtools/styleinspector.dtd (%chrome/browser/devtools/styleinspector.dtd) - locale/browser/devtools/webConsole.dtd (%chrome/browser/devtools/webConsole.dtd) - locale/browser/devtools/VariablesView.dtd (%chrome/browser/devtools/VariablesView.dtd) - locale/browser/devtools/sourceeditor.properties (%chrome/browser/devtools/sourceeditor.properties) - locale/browser/devtools/sourceeditor.dtd (%chrome/browser/devtools/sourceeditor.dtd) - locale/browser/devtools/promisedebugger.dtd (%chrome/browser/devtools/promisedebugger.dtd) - locale/browser/devtools/promisedebugger.properties (%chrome/browser/devtools/promisedebugger.properties) - locale/browser/devtools/performance.dtd (%chrome/browser/devtools/performance.dtd) - locale/browser/devtools/performance.properties (%chrome/browser/devtools/performance.properties) - locale/browser/devtools/memory.properties (%chrome/browser/devtools/memory.properties) - locale/browser/devtools/graphs.properties (%chrome/browser/devtools/graphs.properties) - locale/browser/devtools/layoutview.dtd (%chrome/browser/devtools/layoutview.dtd) - locale/browser/devtools/responsiveUI.properties (%chrome/browser/devtools/responsiveUI.properties) - locale/browser/devtools/toolbox.dtd (%chrome/browser/devtools/toolbox.dtd) - locale/browser/devtools/toolbox.properties (%chrome/browser/devtools/toolbox.properties) - locale/browser/devtools/inspector.dtd (%chrome/browser/devtools/inspector.dtd) - locale/browser/devtools/markers.properties (%chrome/browser/devtools/markers.properties) - locale/browser/devtools/projecteditor.properties (%chrome/browser/devtools/projecteditor.properties) - locale/browser/devtools/eyedropper.properties (%chrome/browser/devtools/eyedropper.properties) - locale/browser/devtools/connection-screen.dtd (%chrome/browser/devtools/connection-screen.dtd) - locale/browser/devtools/connection-screen.properties (%chrome/browser/devtools/connection-screen.properties) - locale/browser/devtools/font-inspector.dtd (%chrome/browser/devtools/font-inspector.dtd) - locale/browser/devtools/har.properties (%chrome/browser/devtools/har.properties) - locale/browser/devtools/app-manager.properties (%chrome/browser/devtools/app-manager.properties) - locale/browser/devtools/webide.dtd (%chrome/browser/devtools/webide.dtd) - locale/browser/devtools/webide.properties (%chrome/browser/devtools/webide.properties) locale/browser/lightweightThemes.properties (%chrome/browser/lightweightThemes.properties) locale/browser/loop/loop.properties (%chrome/browser/loop/loop.properties) locale/browser/newTab.dtd (%chrome/browser/newTab.dtd) diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini index 5056b5ddc46..0ff0da90958 100644 --- a/browser/locales/l10n.ini +++ b/browser/locales/l10n.ini @@ -11,6 +11,7 @@ dirs = browser extensions/reporter other-licenses/branding/firefox browser/branding/official + devtools/client [includes] # non-central apps might want to use %(topsrcdir)s here, or other vars diff --git a/devtools/client/aboutdebugging/aboutdebugging.xhtml b/devtools/client/aboutdebugging/aboutdebugging.xhtml index af401d02d5f..2de443a1c7e 100644 --- a/devtools/client/aboutdebugging/aboutdebugging.xhtml +++ b/devtools/client/aboutdebugging/aboutdebugging.xhtml @@ -5,8 +5,8 @@ %htmlDTD; - %toolboxDTD; - %aboutdebuggingDTD; + %toolboxDTD; + %aboutdebuggingDTD; ]> diff --git a/devtools/client/aboutdebugging/components/addons.js b/devtools/client/aboutdebugging/components/addons.js index b4f6592eb39..1589d5c58b7 100644 --- a/devtools/client/aboutdebugging/components/addons.js +++ b/devtools/client/aboutdebugging/components/addons.js @@ -17,7 +17,7 @@ loader.lazyImporter(this, "AddonManager", const ExtensionIcon = "chrome://mozapps/skin/extensions/extensionGeneric.svg"; const Strings = Services.strings.createBundle( - "chrome://browser/locale/devtools/aboutdebugging.properties"); + "chrome://devtools/locale/aboutdebugging.properties"); exports.AddonsComponent = React.createClass({ displayName: "AddonsComponent", diff --git a/devtools/client/aboutdebugging/components/target-list.js b/devtools/client/aboutdebugging/components/target-list.js index d26b27051c1..81886046b84 100644 --- a/devtools/client/aboutdebugging/components/target-list.js +++ b/devtools/client/aboutdebugging/components/target-list.js @@ -13,7 +13,7 @@ loader.lazyRequireGetter(this, "TargetComponent", loader.lazyRequireGetter(this, "Services"); const Strings = Services.strings.createBundle( - "chrome://browser/locale/devtools/aboutdebugging.properties"); + "chrome://devtools/locale/aboutdebugging.properties"); const LocaleCompare = (a, b) => { return a.name.toLowerCase().localeCompare(b.name.toLowerCase()); }; diff --git a/devtools/client/aboutdebugging/components/target.js b/devtools/client/aboutdebugging/components/target.js index 0cb5ff49ab3..9359692c980 100644 --- a/devtools/client/aboutdebugging/components/target.js +++ b/devtools/client/aboutdebugging/components/target.js @@ -21,7 +21,7 @@ loader.lazyImporter(this, "gDevTools", "resource://devtools/client/framework/gDevTools.jsm"); const Strings = Services.strings.createBundle( - "chrome://browser/locale/devtools/aboutdebugging.properties"); + "chrome://devtools/locale/aboutdebugging.properties"); exports.TargetComponent = React.createClass({ displayName: "TargetComponent", diff --git a/devtools/client/aboutdebugging/components/workers.js b/devtools/client/aboutdebugging/components/workers.js index 72fb7474c89..556afa9c786 100644 --- a/devtools/client/aboutdebugging/components/workers.js +++ b/devtools/client/aboutdebugging/components/workers.js @@ -15,7 +15,7 @@ loader.lazyRequireGetter(this, "TargetListComponent", loader.lazyRequireGetter(this, "Services"); const Strings = Services.strings.createBundle( - "chrome://browser/locale/devtools/aboutdebugging.properties"); + "chrome://devtools/locale/aboutdebugging.properties"); exports.WorkersComponent = React.createClass({ displayName: "WorkersComponent", diff --git a/devtools/client/animationinspector/animation-controller.js b/devtools/client/animationinspector/animation-controller.js index e90512978c9..def44654433 100644 --- a/devtools/client/animationinspector/animation-controller.js +++ b/devtools/client/animationinspector/animation-controller.js @@ -20,7 +20,7 @@ loader.lazyRequireGetter(this, "EventEmitter", loader.lazyRequireGetter(this, "AnimationsFront", "devtools/server/actors/animation", true); -const STRINGS_URI = "chrome://browser/locale/devtools/animationinspector.properties"; +const STRINGS_URI = "chrome://devtools/locale/animationinspector.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); // Global toolbox/inspector, set when startup is called. diff --git a/devtools/client/animationinspector/animation-inspector.xhtml b/devtools/client/animationinspector/animation-inspector.xhtml index 582275af8ee..126d6114655 100644 --- a/devtools/client/animationinspector/animation-inspector.xhtml +++ b/devtools/client/animationinspector/animation-inspector.xhtml @@ -3,7 +3,7 @@ - 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/. --> + %animationinspectorDTD; ]> diff --git a/devtools/client/animationinspector/components.js b/devtools/client/animationinspector/components.js index ebeb0a22138..e0aa4a535a9 100644 --- a/devtools/client/animationinspector/components.js +++ b/devtools/client/animationinspector/components.js @@ -29,7 +29,7 @@ const { TargetNodeHighlighter } = require("devtools/client/animationinspector/utils"); -const STRINGS_URI = "chrome://browser/locale/devtools/animationinspector.properties"; +const STRINGS_URI = "chrome://devtools/locale/animationinspector.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); const MILLIS_TIME_FORMAT_MAX_DURATION = 4000; // The minimum spacing between 2 time graduation headers in the timeline (px). diff --git a/devtools/client/animationinspector/test/browser_animation_running_on_compositor.js b/devtools/client/animationinspector/test/browser_animation_running_on_compositor.js index c8e12fc02b3..6b84f800c76 100644 --- a/devtools/client/animationinspector/test/browser_animation_running_on_compositor.js +++ b/devtools/client/animationinspector/test/browser_animation_running_on_compositor.js @@ -7,7 +7,7 @@ // Test that when animations displayed in the timeline are running on the // compositor, they get a special icon and information in the tooltip. -const STRINGS_URI = "chrome://browser/locale/devtools/animationinspector.properties"; +const STRINGS_URI = "chrome://devtools/locale/animationinspector.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); add_task(function*() { diff --git a/devtools/client/canvasdebugger/canvasdebugger.js b/devtools/client/canvasdebugger/canvasdebugger.js index 03fdef73bd6..e5a1b0e2eb1 100644 --- a/devtools/client/canvasdebugger/canvasdebugger.js +++ b/devtools/client/canvasdebugger/canvasdebugger.js @@ -80,8 +80,8 @@ const EVENTS = { XPCOMUtils.defineConstant(this, "EVENTS", EVENTS); const HTML_NS = "http://www.w3.org/1999/xhtml"; -const STRINGS_URI = "chrome://browser/locale/devtools/canvasdebugger.properties"; -const SHARED_STRINGS_URI = "chrome://browser/locale/devtools/shared.properties"; +const STRINGS_URI = "chrome://devtools/locale/canvasdebugger.properties"; +const SHARED_STRINGS_URI = "chrome://devtools/locale/shared.properties"; const SNAPSHOT_START_RECORDING_DELAY = 10; // ms const SNAPSHOT_DATA_EXPORT_MAX_BLOCK = 1000; // ms diff --git a/devtools/client/canvasdebugger/canvasdebugger.xul b/devtools/client/canvasdebugger/canvasdebugger.xul index 8410d8c1ae8..dbe0a87a89f 100644 --- a/devtools/client/canvasdebugger/canvasdebugger.xul +++ b/devtools/client/canvasdebugger/canvasdebugger.xul @@ -8,7 +8,7 @@ + %canvasDebuggerDTD; ]> diff --git a/devtools/client/debugger/debugger-controller.js b/devtools/client/debugger/debugger-controller.js index 3eca0b9a157..bcb6088c2cc 100644 --- a/devtools/client/debugger/debugger-controller.js +++ b/devtools/client/debugger/debugger-controller.js @@ -7,7 +7,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu } = Components; -const DBG_STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties"; +const DBG_STRINGS_URI = "chrome://devtools/locale/debugger.properties"; const NEW_SOURCE_IGNORED_URLS = ["debugger eval code", "XStringBundle"]; const NEW_SOURCE_DISPLAY_DELAY = 200; // ms const FETCH_SOURCE_RESPONSE_DELAY = 200; // ms diff --git a/devtools/client/debugger/debugger.xul b/devtools/client/debugger/debugger.xul index 0c7b2881c9f..c3afc3b07c6 100644 --- a/devtools/client/debugger/debugger.xul +++ b/devtools/client/debugger/debugger.xul @@ -9,7 +9,7 @@ + %debuggerDTD; ]> diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js index 2e708d70ae8..0b03a02f8c9 100644 --- a/devtools/client/definitions.js +++ b/devtools/client/definitions.js @@ -26,19 +26,19 @@ loader.lazyGetter(this, "StoragePanel", () => require("devtools/client/storage/p loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/client/scratchpad/scratchpad-panel").ScratchpadPanel); // Strings -const toolboxProps = "chrome://browser/locale/devtools/toolbox.properties"; -const inspectorProps = "chrome://browser/locale/devtools/inspector.properties"; -const webConsoleProps = "chrome://browser/locale/devtools/webconsole.properties"; -const debuggerProps = "chrome://browser/locale/devtools/debugger.properties"; -const styleEditorProps = "chrome://browser/locale/devtools/styleeditor.properties"; -const shaderEditorProps = "chrome://browser/locale/devtools/shadereditor.properties"; -const canvasDebuggerProps = "chrome://browser/locale/devtools/canvasdebugger.properties"; -const webAudioEditorProps = "chrome://browser/locale/devtools/webaudioeditor.properties"; -const performanceProps = "chrome://browser/locale/devtools/performance.properties"; -const netMonitorProps = "chrome://browser/locale/devtools/netmonitor.properties"; -const storageProps = "chrome://browser/locale/devtools/storage.properties"; -const scratchpadProps = "chrome://browser/locale/devtools/scratchpad.properties"; -const memoryProps = "chrome://browser/locale/devtools/memory.properties"; +const toolboxProps = "chrome://devtools/locale/toolbox.properties"; +const inspectorProps = "chrome://devtools/locale/inspector.properties"; +const webConsoleProps = "chrome://devtools/locale/webconsole.properties"; +const debuggerProps = "chrome://devtools/locale/debugger.properties"; +const styleEditorProps = "chrome://devtools/locale/styleeditor.properties"; +const shaderEditorProps = "chrome://devtools/locale/shadereditor.properties"; +const canvasDebuggerProps = "chrome://devtools/locale/canvasdebugger.properties"; +const webAudioEditorProps = "chrome://devtools/locale/webaudioeditor.properties"; +const performanceProps = "chrome://devtools/locale/performance.properties"; +const netMonitorProps = "chrome://devtools/locale/netmonitor.properties"; +const storageProps = "chrome://devtools/locale/storage.properties"; +const scratchpadProps = "chrome://devtools/locale/scratchpad.properties"; +const memoryProps = "chrome://devtools/locale/memory.properties"; loader.lazyGetter(this, "toolboxStrings", () => Services.strings.createBundle(toolboxProps)); loader.lazyGetter(this, "performanceStrings",() => Services.strings.createBundle(performanceProps)); diff --git a/devtools/client/eyedropper/eyedropper.js b/devtools/client/eyedropper/eyedropper.js index 78dce69ad04..30da4f8740a 100644 --- a/devtools/client/eyedropper/eyedropper.js +++ b/devtools/client/eyedropper/eyedropper.js @@ -35,7 +35,7 @@ loader.lazyGetter(this, "XULRuntime", function() { }); loader.lazyGetter(this, "l10n", () => Services.strings - .createBundle("chrome://browser/locale/devtools/eyedropper.properties")); + .createBundle("chrome://devtools/locale/eyedropper.properties")); const EYEDROPPER_URL = "chrome://devtools/content/eyedropper/eyedropper.xul"; const CROSSHAIRS_URL = "chrome://devtools/content/eyedropper/crosshairs.css"; diff --git a/devtools/client/fontinspector/font-inspector.xhtml b/devtools/client/fontinspector/font-inspector.xhtml index 2dc1298c454..a82c35d6f65 100644 --- a/devtools/client/fontinspector/font-inspector.xhtml +++ b/devtools/client/fontinspector/font-inspector.xhtml @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %fontinspectorDTD; ]> diff --git a/devtools/client/framework/connect/connect.js b/devtools/client/framework/connect/connect.js index 4a44515aff6..0788fbc2779 100644 --- a/devtools/client/framework/connect/connect.js +++ b/devtools/client/framework/connect/connect.js @@ -21,7 +21,7 @@ var gClient; var gConnectionTimeout; XPCOMUtils.defineLazyGetter(window, 'l10n', function () { - return Services.strings.createBundle('chrome://browser/locale/devtools/connection-screen.properties'); + return Services.strings.createBundle('chrome://devtools/locale/connection-screen.properties'); }); /** diff --git a/devtools/client/framework/connect/connect.xhtml b/devtools/client/framework/connect/connect.xhtml index 06b2a567184..b19db8d707d 100644 --- a/devtools/client/framework/connect/connect.xhtml +++ b/devtools/client/framework/connect/connect.xhtml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %connectionDTD; ]> diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul b/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul index d34e1346052..b6f338bdce6 100644 --- a/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul +++ b/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul @@ -3,7 +3,7 @@ - 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/. --> + %toolboxDTD; ]> diff --git a/devtools/client/framework/gDevTools.jsm b/devtools/client/framework/gDevTools.jsm index 2f3f3d113d3..eed816114c8 100644 --- a/devtools/client/framework/gDevTools.jsm +++ b/devtools/client/framework/gDevTools.jsm @@ -37,7 +37,7 @@ const TABS_PINNED_AVG_HISTOGRAM = "DEVTOOLS_TABS_PINNED_AVERAGE_LINEAR"; const FORBIDDEN_IDS = new Set(["toolbox", ""]); const MAX_ORDINAL = 99; -const bundle = Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties"); +const bundle = Services.strings.createBundle("chrome://devtools/locale/toolbox.properties"); /** * DevTools is a class that represents a set of developer tools, it holds a diff --git a/devtools/client/framework/sidebar.js b/devtools/client/framework/sidebar.js index 990052552af..7c7f25d759d 100644 --- a/devtools/client/framework/sidebar.js +++ b/devtools/client/framework/sidebar.js @@ -533,7 +533,7 @@ ToolSidebar.prototype = { } XPCOMUtils.defineLazyGetter(this, "l10n", function() { - let bundle = Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties"); + let bundle = Services.strings.createBundle("chrome://devtools/locale/toolbox.properties"); let l10n = function(aName, ...aArgs) { try { if (aArgs.length == 0) { diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js index 2b467cf2e9a..37ec85315b2 100644 --- a/devtools/client/framework/toolbox-options.js +++ b/devtools/client/framework/toolbox-options.js @@ -13,7 +13,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "gDevTools", "resource://devtools/client exports.OptionsPanel = OptionsPanel; XPCOMUtils.defineLazyGetter(this, "l10n", function() { - let bundle = Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties"); + let bundle = Services.strings.createBundle("chrome://devtools/locale/toolbox.properties"); let l10n = function(aName, ...aArgs) { try { if (aArgs.length == 0) { diff --git a/devtools/client/framework/toolbox-options.xul b/devtools/client/framework/toolbox-options.xul index 49f17ec09c9..78a50d0db14 100644 --- a/devtools/client/framework/toolbox-options.xul +++ b/devtools/client/framework/toolbox-options.xul @@ -3,7 +3,7 @@ - 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/. --> + %toolboxDTD; ]> diff --git a/devtools/client/framework/toolbox-process-window.xul b/devtools/client/framework/toolbox-process-window.xul index d0f774b867f..f79ca12ae80 100644 --- a/devtools/client/framework/toolbox-process-window.xul +++ b/devtools/client/framework/toolbox-process-window.xul @@ -3,7 +3,7 @@ - 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/. --> + %toolboxDTD; ]> diff --git a/devtools/client/framework/toolbox-window.xul b/devtools/client/framework/toolbox-window.xul index 479c33fc0ef..2446708fbcc 100644 --- a/devtools/client/framework/toolbox-window.xul +++ b/devtools/client/framework/toolbox-window.xul @@ -3,7 +3,7 @@ - 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/. --> + %toolboxDTD; ]> diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index b8e1a86b7f9..8872985b872 100644 --- a/devtools/client/framework/toolbox.js +++ b/devtools/client/framework/toolbox.js @@ -30,7 +30,7 @@ Cu.import("resource://gre/modules/Task.jsm"); loader.lazyImporter(this, "CommandUtils", "resource://devtools/client/shared/DeveloperToolbar.jsm"); loader.lazyGetter(this, "toolboxStrings", () => { - const properties = "chrome://browser/locale/devtools/toolbox.properties"; + const properties = "chrome://devtools/locale/toolbox.properties"; const bundle = Services.strings.createBundle(properties); return (name, ...args) => { try { diff --git a/devtools/client/framework/toolbox.xul b/devtools/client/framework/toolbox.xul index 41f5e36966c..6e04b28375c 100644 --- a/devtools/client/framework/toolbox.xul +++ b/devtools/client/framework/toolbox.xul @@ -8,7 +8,7 @@ + %toolboxDTD; %editMenuStrings; diff --git a/devtools/client/inspector/inspector-panel.js b/devtools/client/inspector/inspector-panel.js index 16961339fed..c8aad6a807e 100644 --- a/devtools/client/inspector/inspector-panel.js +++ b/devtools/client/inspector/inspector-panel.js @@ -19,10 +19,10 @@ loader.lazyGetter(this, "ToolSidebar", () => require("devtools/client/framework/ loader.lazyGetter(this, "SelectorSearch", () => require("devtools/client/inspector/selector-search").SelectorSearch); loader.lazyGetter(this, "strings", () => { - return Services.strings.createBundle("chrome://browser/locale/devtools/inspector.properties"); + return Services.strings.createBundle("chrome://devtools/locale/inspector.properties"); }); loader.lazyGetter(this, "toolboxStrings", () => { - return Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties"); + return Services.strings.createBundle("chrome://devtools/locale/toolbox.properties"); }); loader.lazyGetter(this, "clipboardHelper", () => { return Cc["@mozilla.org/widget/clipboardhelper;1"].getService(Ci.nsIClipboardHelper); diff --git a/devtools/client/inspector/inspector.xul b/devtools/client/inspector/inspector.xul index 5c904b6aa6e..ed0b67c053b 100644 --- a/devtools/client/inspector/inspector.xul +++ b/devtools/client/inspector/inspector.xul @@ -9,7 +9,7 @@ + %inspectorDTD; ]> diff --git a/devtools/client/jsonview/converter-child.js b/devtools/client/jsonview/converter-child.js index 3e09ffe4177..fc301cbc622 100644 --- a/devtools/client/jsonview/converter-child.js +++ b/devtools/client/jsonview/converter-child.js @@ -34,7 +34,7 @@ const CLASS_ID = "{d8c9acee-dec5-11e4-8c75-1681e6b88ec1}"; // Localization var jsonViewStrings = Services.strings.createBundle( - "chrome://browser/locale/devtools/jsonview.properties"); + "chrome://devtools/locale/jsonview.properties"); /** * This object detects 'application/vnd.mozilla.json.view' content type diff --git a/devtools/client/layoutview/view.js b/devtools/client/layoutview/view.js index 41bf0002d1e..51abdcb0f5e 100644 --- a/devtools/client/layoutview/view.js +++ b/devtools/client/layoutview/view.js @@ -16,7 +16,7 @@ Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm"); const {InplaceEditor, editableItem} = require("devtools/client/shared/inplace-editor"); const {ReflowFront} = require("devtools/server/actors/layout"); -const STRINGS_URI = "chrome://browser/locale/devtools/shared.properties"; +const STRINGS_URI = "chrome://devtools/locale/shared.properties"; const SHARED_L10N = new ViewHelpers.L10N(STRINGS_URI); const NUMERIC = /^-?[\d\.]+$/; const LONG_TEXT_ROTATE_LIMIT = 3; diff --git a/devtools/client/layoutview/view.xhtml b/devtools/client/layoutview/view.xhtml index 5f14913fdae..6bda485faf1 100644 --- a/devtools/client/layoutview/view.xhtml +++ b/devtools/client/layoutview/view.xhtml @@ -3,7 +3,7 @@ - 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/. --> + %layoutviewDTD; ]> diff --git a/browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd b/devtools/client/locales/en-US/VariablesView.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd rename to devtools/client/locales/en-US/VariablesView.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd b/devtools/client/locales/en-US/aboutdebugging.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd rename to devtools/client/locales/en-US/aboutdebugging.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties b/devtools/client/locales/en-US/aboutdebugging.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties rename to devtools/client/locales/en-US/aboutdebugging.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd b/devtools/client/locales/en-US/animationinspector.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd rename to devtools/client/locales/en-US/animationinspector.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/animationinspector.properties b/devtools/client/locales/en-US/animationinspector.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/animationinspector.properties rename to devtools/client/locales/en-US/animationinspector.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/app-manager.properties b/devtools/client/locales/en-US/app-manager.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/app-manager.properties rename to devtools/client/locales/en-US/app-manager.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties b/devtools/client/locales/en-US/appcacheutils.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties rename to devtools/client/locales/en-US/appcacheutils.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd b/devtools/client/locales/en-US/canvasdebugger.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd rename to devtools/client/locales/en-US/canvasdebugger.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties b/devtools/client/locales/en-US/canvasdebugger.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties rename to devtools/client/locales/en-US/canvasdebugger.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd rename to devtools/client/locales/en-US/connection-screen.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/connection-screen.properties b/devtools/client/locales/en-US/connection-screen.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/connection-screen.properties rename to devtools/client/locales/en-US/connection-screen.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd b/devtools/client/locales/en-US/debugger.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/debugger.dtd rename to devtools/client/locales/en-US/debugger.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/devtools/client/locales/en-US/debugger.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/debugger.properties rename to devtools/client/locales/en-US/debugger.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/device.properties b/devtools/client/locales/en-US/device.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/device.properties rename to devtools/client/locales/en-US/device.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/eyedropper.properties b/devtools/client/locales/en-US/eyedropper.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/eyedropper.properties rename to devtools/client/locales/en-US/eyedropper.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd b/devtools/client/locales/en-US/filterwidget.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd rename to devtools/client/locales/en-US/filterwidget.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/filterwidget.properties b/devtools/client/locales/en-US/filterwidget.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/filterwidget.properties rename to devtools/client/locales/en-US/filterwidget.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd b/devtools/client/locales/en-US/font-inspector.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd rename to devtools/client/locales/en-US/font-inspector.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/graphs.properties b/devtools/client/locales/en-US/graphs.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/graphs.properties rename to devtools/client/locales/en-US/graphs.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/har.properties b/devtools/client/locales/en-US/har.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/har.properties rename to devtools/client/locales/en-US/har.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.dtd b/devtools/client/locales/en-US/inspector.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/inspector.dtd rename to devtools/client/locales/en-US/inspector.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/inspector.properties b/devtools/client/locales/en-US/inspector.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/inspector.properties rename to devtools/client/locales/en-US/inspector.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/jsonview.properties b/devtools/client/locales/en-US/jsonview.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/jsonview.properties rename to devtools/client/locales/en-US/jsonview.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/layoutview.dtd b/devtools/client/locales/en-US/layoutview.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/layoutview.dtd rename to devtools/client/locales/en-US/layoutview.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/markers.properties b/devtools/client/locales/en-US/markers.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/markers.properties rename to devtools/client/locales/en-US/markers.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/memory.properties b/devtools/client/locales/en-US/memory.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/memory.properties rename to devtools/client/locales/en-US/memory.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd b/devtools/client/locales/en-US/netmonitor.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd rename to devtools/client/locales/en-US/netmonitor.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/netmonitor.properties b/devtools/client/locales/en-US/netmonitor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/netmonitor.properties rename to devtools/client/locales/en-US/netmonitor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/performance.dtd b/devtools/client/locales/en-US/performance.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/performance.dtd rename to devtools/client/locales/en-US/performance.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/performance.properties b/devtools/client/locales/en-US/performance.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/performance.properties rename to devtools/client/locales/en-US/performance.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/projecteditor.properties b/devtools/client/locales/en-US/projecteditor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/projecteditor.properties rename to devtools/client/locales/en-US/projecteditor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd b/devtools/client/locales/en-US/promisedebugger.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd rename to devtools/client/locales/en-US/promisedebugger.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties b/devtools/client/locales/en-US/promisedebugger.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties rename to devtools/client/locales/en-US/promisedebugger.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties b/devtools/client/locales/en-US/responsiveUI.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties rename to devtools/client/locales/en-US/responsiveUI.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd b/devtools/client/locales/en-US/scratchpad.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd rename to devtools/client/locales/en-US/scratchpad.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/scratchpad.properties b/devtools/client/locales/en-US/scratchpad.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/scratchpad.properties rename to devtools/client/locales/en-US/scratchpad.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd b/devtools/client/locales/en-US/shadereditor.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd rename to devtools/client/locales/en-US/shadereditor.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/shadereditor.properties b/devtools/client/locales/en-US/shadereditor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/shadereditor.properties rename to devtools/client/locales/en-US/shadereditor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/shared.properties b/devtools/client/locales/en-US/shared.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/shared.properties rename to devtools/client/locales/en-US/shared.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd b/devtools/client/locales/en-US/sourceeditor.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd rename to devtools/client/locales/en-US/sourceeditor.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties rename to devtools/client/locales/en-US/sourceeditor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/storage.properties b/devtools/client/locales/en-US/storage.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/storage.properties rename to devtools/client/locales/en-US/storage.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd b/devtools/client/locales/en-US/styleeditor.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd rename to devtools/client/locales/en-US/styleeditor.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/styleeditor.properties b/devtools/client/locales/en-US/styleeditor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/styleeditor.properties rename to devtools/client/locales/en-US/styleeditor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd b/devtools/client/locales/en-US/styleinspector.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd rename to devtools/client/locales/en-US/styleinspector.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/tilt.properties b/devtools/client/locales/en-US/tilt.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/tilt.properties rename to devtools/client/locales/en-US/tilt.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/toolbox.dtd rename to devtools/client/locales/en-US/toolbox.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.properties b/devtools/client/locales/en-US/toolbox.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/toolbox.properties rename to devtools/client/locales/en-US/toolbox.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd b/devtools/client/locales/en-US/webConsole.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webConsole.dtd rename to devtools/client/locales/en-US/webConsole.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd b/devtools/client/locales/en-US/webaudioeditor.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd rename to devtools/client/locales/en-US/webaudioeditor.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties b/devtools/client/locales/en-US/webaudioeditor.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties rename to devtools/client/locales/en-US/webaudioeditor.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/webconsole.properties b/devtools/client/locales/en-US/webconsole.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webconsole.properties rename to devtools/client/locales/en-US/webconsole.properties diff --git a/browser/locales/en-US/chrome/browser/devtools/webide.dtd b/devtools/client/locales/en-US/webide.dtd similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webide.dtd rename to devtools/client/locales/en-US/webide.dtd diff --git a/browser/locales/en-US/chrome/browser/devtools/webide.properties b/devtools/client/locales/en-US/webide.properties similarity index 100% rename from browser/locales/en-US/chrome/browser/devtools/webide.properties rename to devtools/client/locales/en-US/webide.properties diff --git a/devtools/client/locales/jar.mn b/devtools/client/locales/jar.mn new file mode 100644 index 00000000000..43ce3aef2c6 --- /dev/null +++ b/devtools/client/locales/jar.mn @@ -0,0 +1,8 @@ +#filter substitution +# 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/. + +@AB_CD@.jar: +% locale devtools @AB_CD@ %locale/@AB_CD@/devtools/client/ + locale/@AB_CD@/devtools/client/ (%*) diff --git a/devtools/client/locales/moz.build b/devtools/client/locales/moz.build new file mode 100644 index 00000000000..3bbe6729759 --- /dev/null +++ b/devtools/client/locales/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/devtools/client/markupview/markup-view.js b/devtools/client/markupview/markup-view.js index 2e2855e8bf2..f494fda0ede 100644 --- a/devtools/client/markupview/markup-view.js +++ b/devtools/client/markupview/markup-view.js @@ -3093,7 +3093,7 @@ function map(value, oldMin, oldMax, newMin, newMax) { } loader.lazyGetter(MarkupView.prototype, "strings", () => Services.strings.createBundle( - "chrome://browser/locale/devtools/inspector.properties" + "chrome://devtools/locale/inspector.properties" )); XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() { diff --git a/devtools/client/markupview/test/browser_markupview_links_04.js b/devtools/client/markupview/test/browser_markupview_links_04.js index 12582313b80..0dc8ed3bbb6 100644 --- a/devtools/client/markupview/test/browser_markupview_links_04.js +++ b/devtools/client/markupview/test/browser_markupview_links_04.js @@ -9,9 +9,9 @@ const TEST_URL = TEST_URL_ROOT + "doc_markup_links.html"; const STRINGS = Services.strings - .createBundle("chrome://browser/locale/devtools/inspector.properties"); + .createBundle("chrome://devtools/locale/inspector.properties"); const TOOLBOX_STRINGS = Services.strings - .createBundle("chrome://browser/locale/devtools/toolbox.properties"); + .createBundle("chrome://devtools/locale/toolbox.properties"); // The test case array contains objects with the following properties: // - selector: css selector for the node to select in the inspector diff --git a/devtools/client/memory/utils.js b/devtools/client/memory/utils.js index 528c0faa4c1..ac2a0d5d18f 100644 --- a/devtools/client/memory/utils.js +++ b/devtools/client/memory/utils.js @@ -5,7 +5,7 @@ const { Cu } = require("chrome"); Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm"); -const STRINGS_URI = "chrome://browser/locale/devtools/memory.properties" +const STRINGS_URI = "chrome://devtools/locale/memory.properties" const L10N = exports.L10N = new ViewHelpers.L10N(STRINGS_URI); const { URL } = require("sdk/url"); diff --git a/devtools/client/moz.build b/devtools/client/moz.build index a66a464011e..e5530094c1a 100644 --- a/devtools/client/moz.build +++ b/devtools/client/moz.build @@ -18,6 +18,7 @@ DIRS += [ 'inspector', 'jsonview', 'layoutview', + 'locales', 'markupview', 'memory', 'netmonitor', diff --git a/devtools/client/netmonitor/har/har-builder.js b/devtools/client/netmonitor/har/har-builder.js index a3e7ba20a2b..61e01c3f951 100644 --- a/devtools/client/netmonitor/har/har-builder.js +++ b/devtools/client/netmonitor/har/har-builder.js @@ -15,7 +15,7 @@ loader.lazyGetter(this, "appInfo", () => { }); loader.lazyGetter(this, "L10N", () => { - return new ViewHelpers.L10N("chrome://browser/locale/devtools/har.properties"); + return new ViewHelpers.L10N("chrome://devtools/locale/har.properties"); }); const HAR_VERSION = "1.1"; diff --git a/devtools/client/netmonitor/netmonitor-controller.js b/devtools/client/netmonitor/netmonitor-controller.js index ff88a9cfc46..23e62c7fb96 100644 --- a/devtools/client/netmonitor/netmonitor-controller.js +++ b/devtools/client/netmonitor/netmonitor-controller.js @@ -7,7 +7,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu } = Components; -const NET_STRINGS_URI = "chrome://browser/locale/devtools/netmonitor.properties"; +const NET_STRINGS_URI = "chrome://devtools/locale/netmonitor.properties"; const PKI_STRINGS_URI = "chrome://pippki/locale/pippki.properties"; const LISTENERS = [ "NetworkActivity" ]; const NET_PREFS = { "NetworkMonitor.saveRequestAndResponseBodies": true }; diff --git a/devtools/client/netmonitor/netmonitor.xul b/devtools/client/netmonitor/netmonitor.xul index a9d99b09513..62cb3baf979 100644 --- a/devtools/client/netmonitor/netmonitor.xul +++ b/devtools/client/netmonitor/netmonitor.xul @@ -9,7 +9,7 @@ + %netmonitorDTD; %certManagerDTD; diff --git a/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js b/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js index b8bce5b77a6..6df04dfca5a 100644 --- a/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js +++ b/devtools/client/netmonitor/test/browser_net_prefs-and-l10n.js @@ -20,7 +20,7 @@ function test() { ok(L10N.stringBundle, "The localization object should have a string bundle available."); - let bundleName = "chrome://browser/locale/devtools/netmonitor.properties"; + let bundleName = "chrome://devtools/locale/netmonitor.properties"; let stringBundle = Services.strings.createBundle(bundleName); is(L10N.getStr("netmonitor.label"), diff --git a/devtools/client/performance/modules/global.js b/devtools/client/performance/modules/global.js index 2154c88df7f..67738de517e 100644 --- a/devtools/client/performance/modules/global.js +++ b/devtools/client/performance/modules/global.js @@ -9,8 +9,8 @@ const { ViewHelpers } = require("resource://devtools/client/shared/widgets/ViewH * Localization convenience methods. */ const L10N = new ViewHelpers.MultiL10N([ - "chrome://browser/locale/devtools/markers.properties", - "chrome://browser/locale/devtools/performance.properties" + "chrome://devtools/locale/markers.properties", + "chrome://devtools/locale/performance.properties" ]); /** diff --git a/devtools/client/performance/performance.xul b/devtools/client/performance/performance.xul index 8e9066afe71..2302736afe4 100644 --- a/devtools/client/performance/performance.xul +++ b/devtools/client/performance/performance.xul @@ -8,7 +8,7 @@ + %performanceDTD; ]> diff --git a/devtools/client/projecteditor/chrome/content/projecteditor-loader.xul b/devtools/client/projecteditor/chrome/content/projecteditor-loader.xul index 797d462eb02..84db8ea481b 100644 --- a/devtools/client/projecteditor/chrome/content/projecteditor-loader.xul +++ b/devtools/client/projecteditor/chrome/content/projecteditor-loader.xul @@ -3,7 +3,7 @@ - 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/. --> + %toolboxDTD; ]> diff --git a/devtools/client/projecteditor/chrome/content/projecteditor.xul b/devtools/client/projecteditor/chrome/content/projecteditor.xul index 250a0e60c41..61da3e292ed 100644 --- a/devtools/client/projecteditor/chrome/content/projecteditor.xul +++ b/devtools/client/projecteditor/chrome/content/projecteditor.xul @@ -12,11 +12,11 @@ + %scratchpadDTD; %editMenuStrings; - + %sourceEditorStrings; ]> diff --git a/devtools/client/projecteditor/lib/helpers/l10n.js b/devtools/client/projecteditor/lib/helpers/l10n.js index 912ecd0c482..b85b08f8972 100644 --- a/devtools/client/projecteditor/lib/helpers/l10n.js +++ b/devtools/client/projecteditor/lib/helpers/l10n.js @@ -10,7 +10,7 @@ const { Cu, Cc, Ci } = require("chrome"); const { ViewHelpers } = Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm", {}); -const ITCHPAD_STRINGS_URI = "chrome://browser/locale/devtools/projecteditor.properties"; +const ITCHPAD_STRINGS_URI = "chrome://devtools/locale/projecteditor.properties"; const L10N = new ViewHelpers.L10N(ITCHPAD_STRINGS_URI).stringBundle; function getLocalizedString (name) { diff --git a/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js b/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js index 62ebc2327d1..354de9ebfe2 100644 --- a/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js +++ b/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js @@ -7,7 +7,7 @@ var { registerPlugin, Plugin } = require("devtools/client/projecteditor/lib/plug const { AppProjectEditor } = require("./app-project-editor"); const OPTION_URL = "chrome://devtools/skin/images/tool-options.svg"; const {Services} = Cu.import("resource://gre/modules/Services.jsm"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var AppManagerRenderer = Class({ extends: Plugin, diff --git a/devtools/client/promisedebugger/promise-debugger.xhtml b/devtools/client/promisedebugger/promise-debugger.xhtml index 3fd6e7811bb..e4064a99529 100644 --- a/devtools/client/promisedebugger/promise-debugger.xhtml +++ b/devtools/client/promisedebugger/promise-debugger.xhtml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %promisedebuggerDTD; ]> diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm index 222c51b60d5..bb030d24d76 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.jsm @@ -35,7 +35,7 @@ const ROUND_RATIO = 10; const INPUT_PARSER = /(\d+)[^\d]+(\d+)/; -const SHARED_L10N = new ViewHelpers.L10N("chrome://browser/locale/devtools/shared.properties"); +const SHARED_L10N = new ViewHelpers.L10N("chrome://devtools/locale/shared.properties"); var ActiveTabs = new Map(); @@ -1018,5 +1018,5 @@ ResponsiveUI.prototype = { } XPCOMUtils.defineLazyGetter(ResponsiveUI.prototype, "strings", function () { - return Services.strings.createBundle("chrome://browser/locale/devtools/responsiveUI.properties"); + return Services.strings.createBundle("chrome://devtools/locale/responsiveUI.properties"); }); diff --git a/devtools/client/scratchpad/scratchpad.js b/devtools/client/scratchpad/scratchpad.js index b8acf9d1d94..ead372e941b 100644 --- a/devtools/client/scratchpad/scratchpad.js +++ b/devtools/client/scratchpad/scratchpad.js @@ -30,7 +30,7 @@ const MAXIMUM_FONT_SIZE = 96; const MINIMUM_FONT_SIZE = 6; const NORMAL_FONT_SIZE = 12; -const SCRATCHPAD_L10N = "chrome://browser/locale/devtools/scratchpad.properties"; +const SCRATCHPAD_L10N = "chrome://devtools/locale/scratchpad.properties"; const DEVTOOLS_CHROME_ENABLED = "devtools.chrome.enabled"; const PREF_RECENT_FILES_MAX = "devtools.scratchpad.recentFilesMax"; const SHOW_LINE_NUMBERS = "devtools.scratchpad.lineNumbers"; diff --git a/devtools/client/scratchpad/scratchpad.xul b/devtools/client/scratchpad/scratchpad.xul index 6fb675a9898..5d03943ccce 100644 --- a/devtools/client/scratchpad/scratchpad.xul +++ b/devtools/client/scratchpad/scratchpad.xul @@ -5,11 +5,11 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %scratchpadDTD; %editMenuStrings; - + %sourceEditorStrings; ]> diff --git a/devtools/client/shadereditor/shadereditor.js b/devtools/client/shadereditor/shadereditor.js index bede25122d2..4eec168e171 100644 --- a/devtools/client/shadereditor/shadereditor.js +++ b/devtools/client/shadereditor/shadereditor.js @@ -40,7 +40,7 @@ const EVENTS = { }; XPCOMUtils.defineConstant(this, "EVENTS", EVENTS); -const STRINGS_URI = "chrome://browser/locale/devtools/shadereditor.properties" +const STRINGS_URI = "chrome://devtools/locale/shadereditor.properties" const HIGHLIGHT_TINT = [1, 0, 0.25, 1]; // rgba const TYPING_MAX_DELAY = 500; // ms const SHADERS_AUTOGROW_ITEMS = 4; diff --git a/devtools/client/shadereditor/shadereditor.xul b/devtools/client/shadereditor/shadereditor.xul index 85b8d91827d..773876af3af 100644 --- a/devtools/client/shadereditor/shadereditor.xul +++ b/devtools/client/shadereditor/shadereditor.xul @@ -8,7 +8,7 @@ + %debuggerDTD; ]> diff --git a/devtools/client/shared/AppCacheUtils.jsm b/devtools/client/shared/AppCacheUtils.jsm index 060f54e92db..10a387f6910 100644 --- a/devtools/client/shared/AppCacheUtils.jsm +++ b/devtools/client/shared/AppCacheUtils.jsm @@ -617,7 +617,7 @@ ManifestParser.prototype = { }; XPCOMUtils.defineLazyGetter(this, "l10n", () => Services.strings - .createBundle("chrome://browser/locale/devtools/appcacheutils.properties")); + .createBundle("chrome://devtools/locale/appcacheutils.properties")); XPCOMUtils.defineLazyGetter(this, "appcacheservice", function() { return Cc["@mozilla.org/network/application-cache-service;1"] diff --git a/devtools/client/shared/DeveloperToolbar.jsm b/devtools/client/shared/DeveloperToolbar.jsm index ef965d66185..24f73ed40d6 100644 --- a/devtools/client/shared/DeveloperToolbar.jsm +++ b/devtools/client/shared/DeveloperToolbar.jsm @@ -36,7 +36,7 @@ XPCOMUtils.defineLazyGetter(this, "prefBranch", function() { }); XPCOMUtils.defineLazyGetter(this, "toolboxStrings", function () { - return Services.strings.createBundle("chrome://browser/locale/devtools/toolbox.properties"); + return Services.strings.createBundle("chrome://devtools/locale/toolbox.properties"); }); const Telemetry = require("devtools/client/shared/telemetry"); diff --git a/devtools/client/shared/devices.js b/devtools/client/shared/devices.js index d149787f091..b76b12604f7 100644 --- a/devtools/client/shared/devices.js +++ b/devtools/client/shared/devices.js @@ -10,7 +10,7 @@ const { Services } = require("resource://gre/modules/Services.jsm"); const promise = require("promise"); const DEVICES_URL = "devtools.devices.url"; -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/device.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/device.properties"); /* This is a catalog of common web-enabled devices and their properties, * intended for (mobile) device emulation. diff --git a/devtools/client/shared/test/browser_filter-editor-02.js b/devtools/client/shared/test/browser_filter-editor-02.js index 18144444e48..857e7fe1f59 100644 --- a/devtools/client/shared/test/browser_filter-editor-02.js +++ b/devtools/client/shared/test/browser_filter-editor-02.js @@ -9,7 +9,7 @@ const TEST_URI = "chrome://devtools/content/shared/widgets/filter-frame.xhtml"; const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWidget"); const { ViewHelpers } = Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm", {}); -const STRINGS_URI = "chrome://browser/locale/devtools/filterwidget.properties"; +const STRINGS_URI = "chrome://devtools/locale/filterwidget.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); add_task(function*() { diff --git a/devtools/client/shared/test/browser_filter-editor-06.js b/devtools/client/shared/test/browser_filter-editor-06.js index 5d319865b51..07972ac39f7 100644 --- a/devtools/client/shared/test/browser_filter-editor-06.js +++ b/devtools/client/shared/test/browser_filter-editor-06.js @@ -11,7 +11,7 @@ const { Cu } = require("chrome"); const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWidget"); const { ViewHelpers } = Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm", {}); -const STRINGS_URI = "chrome://browser/locale/devtools/filterwidget.properties"; +const STRINGS_URI = "chrome://devtools/locale/filterwidget.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); add_task(function*() { diff --git a/devtools/client/shared/test/browser_filter-editor-07.js b/devtools/client/shared/test/browser_filter-editor-07.js index 54b4fef9306..7bd53b0b711 100644 --- a/devtools/client/shared/test/browser_filter-editor-07.js +++ b/devtools/client/shared/test/browser_filter-editor-07.js @@ -11,7 +11,7 @@ const { Cu } = require("chrome"); const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWidget"); const { ViewHelpers } = Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm", {}); -const STRINGS_URI = "chrome://browser/locale/devtools/filterwidget.properties"; +const STRINGS_URI = "chrome://devtools/locale/filterwidget.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); add_task(function*() { diff --git a/devtools/client/shared/widgets/Chart.jsm b/devtools/client/shared/widgets/Chart.jsm index 0eb8160653a..baeb273a64b 100644 --- a/devtools/client/shared/widgets/Chart.jsm +++ b/devtools/client/shared/widgets/Chart.jsm @@ -8,7 +8,7 @@ const Ci = Components.interfaces; const Cu = Components.utils; -const NET_STRINGS_URI = "chrome://browser/locale/devtools/netmonitor.properties"; +const NET_STRINGS_URI = "chrome://devtools/locale/netmonitor.properties"; const SVG_NS = "http://www.w3.org/2000/svg"; const PI = Math.PI; const TAU = PI * 2; diff --git a/devtools/client/shared/widgets/FilterWidget.js b/devtools/client/shared/widgets/FilterWidget.js index c79eecfe1f7..9ac6d429e15 100644 --- a/devtools/client/shared/widgets/FilterWidget.js +++ b/devtools/client/shared/widgets/FilterWidget.js @@ -14,7 +14,7 @@ const { Cu, Cc, Ci } = require("chrome"); const { ViewHelpers } = Cu.import("resource://devtools/client/shared/widgets/ViewHelpers.jsm", {}); -const STRINGS_URI = "chrome://browser/locale/devtools/filterwidget.properties"; +const STRINGS_URI = "chrome://devtools/locale/filterwidget.properties"; const L10N = new ViewHelpers.L10N(STRINGS_URI); const {cssTokenizer} = require("devtools/client/shared/css-parsing-utils"); diff --git a/devtools/client/shared/widgets/LineGraphWidget.js b/devtools/client/shared/widgets/LineGraphWidget.js index 2447c728dc3..f5c987dd96d 100644 --- a/devtools/client/shared/widgets/LineGraphWidget.js +++ b/devtools/client/shared/widgets/LineGraphWidget.js @@ -7,7 +7,7 @@ const { ViewHelpers, Heritage } = require("resource://devtools/client/shared/wid const { AbstractCanvasGraph, CanvasGraphUtils } = require("devtools/client/shared/widgets/Graphs"); const HTML_NS = "http://www.w3.org/1999/xhtml"; -const L10N = new ViewHelpers.L10N("chrome://browser/locale/devtools/graphs.properties"); +const L10N = new ViewHelpers.L10N("chrome://devtools/locale/graphs.properties"); // Line graph constants. diff --git a/devtools/client/shared/widgets/MdnDocsWidget.js b/devtools/client/shared/widgets/MdnDocsWidget.js index 38dcb94a675..37cbd466c46 100644 --- a/devtools/client/shared/widgets/MdnDocsWidget.js +++ b/devtools/client/shared/widgets/MdnDocsWidget.js @@ -382,7 +382,7 @@ var l10n = new L10N(); loader.lazyGetter(L10N.prototype, "strings", () => { return Services.strings.createBundle( - "chrome://browser/locale/devtools/inspector.properties"); + "chrome://devtools/locale/inspector.properties"); }); /** diff --git a/devtools/client/shared/widgets/Tooltip.js b/devtools/client/shared/widgets/Tooltip.js index 83a82598eab..489eb4ad97f 100644 --- a/devtools/client/shared/widgets/Tooltip.js +++ b/devtools/client/shared/widgets/Tooltip.js @@ -1719,5 +1719,5 @@ var l10n = new L10N(); loader.lazyGetter(L10N.prototype, "strings", () => { return Services.strings.createBundle( - "chrome://browser/locale/devtools/inspector.properties"); + "chrome://devtools/locale/inspector.properties"); }); diff --git a/devtools/client/shared/widgets/VariablesView.jsm b/devtools/client/shared/widgets/VariablesView.jsm index ccbfa037a86..f8a27b69664 100644 --- a/devtools/client/shared/widgets/VariablesView.jsm +++ b/devtools/client/shared/widgets/VariablesView.jsm @@ -8,7 +8,7 @@ const Ci = Components.interfaces; const Cu = Components.utils; -const DBG_STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties"; +const DBG_STRINGS_URI = "chrome://devtools/locale/debugger.properties"; const LAZY_EMPTY_DELAY = 150; // ms const LAZY_EXPAND_DELAY = 50; // ms const SCROLL_PAGE_SIZE_DEFAULT = 0; diff --git a/devtools/client/shared/widgets/VariablesView.xul b/devtools/client/shared/widgets/VariablesView.xul index 147b25cca17..dc1a8e351b3 100644 --- a/devtools/client/shared/widgets/VariablesView.xul +++ b/devtools/client/shared/widgets/VariablesView.xul @@ -7,7 +7,7 @@ + %viewDTD; ]> + %filterwidgetDTD; ]> diff --git a/devtools/client/sourceeditor/editor.js b/devtools/client/sourceeditor/editor.js index 512cf9f8e64..c3274891b70 100644 --- a/devtools/client/sourceeditor/editor.js +++ b/devtools/client/sourceeditor/editor.js @@ -19,7 +19,7 @@ const ENABLE_CODE_FOLDING = "devtools.editor.enableCodeFolding"; const KEYMAP = "devtools.editor.keymap"; const AUTO_CLOSE = "devtools.editor.autoclosebrackets"; const AUTOCOMPLETE = "devtools.editor.autocomplete"; -const L10N_BUNDLE = "chrome://browser/locale/devtools/sourceeditor.properties"; +const L10N_BUNDLE = "chrome://devtools/locale/sourceeditor.properties"; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; const VALID_KEYMAPS = new Set(["emacs", "vim", "sublime"]); diff --git a/devtools/client/sourceeditor/test/browser_editor_find_again.js b/devtools/client/sourceeditor/test/browser_editor_find_again.js index b105eab9954..7780d5c7633 100644 --- a/devtools/client/sourceeditor/test/browser_editor_find_again.js +++ b/devtools/client/sourceeditor/test/browser_editor_find_again.js @@ -5,7 +5,7 @@ "use strict"; -const L10N_BUNDLE = "chrome://browser/locale/devtools/sourceeditor.properties"; +const L10N_BUNDLE = "chrome://devtools/locale/sourceeditor.properties"; const L10N = Services.strings.createBundle(L10N_BUNDLE); const FIND_KEY = L10N.GetStringFromName("find.commandkey"); diff --git a/devtools/client/storage/ui.js b/devtools/client/storage/ui.js index 2bba31312b9..446b1da0ddd 100644 --- a/devtools/client/storage/ui.js +++ b/devtools/client/storage/ui.js @@ -22,7 +22,7 @@ const Telemetry = require("devtools/client/shared/telemetry"); /** * Localization convenience methods. */ -const STORAGE_STRINGS = "chrome://browser/locale/devtools/storage.properties"; +const STORAGE_STRINGS = "chrome://devtools/locale/storage.properties"; const L10N = new ViewHelpers.L10N(STORAGE_STRINGS); const GENERIC_VARIABLES_VIEW_SETTINGS = { diff --git a/devtools/client/styleeditor/StyleEditorUtil.jsm b/devtools/client/styleeditor/StyleEditorUtil.jsm index f80942d850d..13eaa9c21c7 100644 --- a/devtools/client/styleeditor/StyleEditorUtil.jsm +++ b/devtools/client/styleeditor/StyleEditorUtil.jsm @@ -20,7 +20,7 @@ const Cu = Components.utils; Cu.import("resource://gre/modules/Services.jsm"); -const PROPERTIES_URL = "chrome://browser/locale/devtools/styleeditor.properties"; +const PROPERTIES_URL = "chrome://devtools/locale/styleeditor.properties"; const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); const console = require("resource://gre/modules/Console.jsm").console; diff --git a/devtools/client/styleeditor/styleeditor-panel.js b/devtools/client/styleeditor/styleeditor-panel.js index 6ca3ea0b314..ad659dbfe02 100644 --- a/devtools/client/styleeditor/styleeditor-panel.js +++ b/devtools/client/styleeditor/styleeditor-panel.js @@ -151,5 +151,5 @@ StyleEditorPanel.prototype = { XPCOMUtils.defineLazyGetter(StyleEditorPanel.prototype, "strings", function () { return Services.strings.createBundle( - "chrome://browser/locale/devtools/styleeditor.properties"); + "chrome://devtools/locale/styleeditor.properties"); }); diff --git a/devtools/client/styleeditor/styleeditor.xul b/devtools/client/styleeditor/styleeditor.xul index 7fe0040cd7d..73fe4c67680 100644 --- a/devtools/client/styleeditor/styleeditor.xul +++ b/devtools/client/styleeditor/styleeditor.xul @@ -3,13 +3,13 @@ - 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/. --> + %styleEditorDTD; %editMenuStrings; - + %sourceEditorStrings; - + %csscoverageDTD; ]> diff --git a/devtools/client/styleinspector/computed-view.js b/devtools/client/styleinspector/computed-view.js index bf6e7b3faf2..7d1df2c6497 100644 --- a/devtools/client/styleinspector/computed-view.js +++ b/devtools/client/styleinspector/computed-view.js @@ -225,7 +225,7 @@ CssComputedView.l10n = function(name) { XPCOMUtils.defineLazyGetter(CssComputedView, "_strings", function() { return Services.strings.createBundle( - "chrome://global/locale/devtools/styleinspector.properties"); + "chrome://devtools-shared/locale/styleinspector.properties"); }); XPCOMUtils.defineLazyGetter(this, "clipboardHelper", function() { diff --git a/devtools/client/styleinspector/computedview.xhtml b/devtools/client/styleinspector/computedview.xhtml index 24a33653345..b32a2c0b353 100644 --- a/devtools/client/styleinspector/computedview.xhtml +++ b/devtools/client/styleinspector/computedview.xhtml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %inspectorDTD; diff --git a/devtools/client/styleinspector/cssruleview.xhtml b/devtools/client/styleinspector/cssruleview.xhtml index 2b325398dab..3fd37655ba6 100644 --- a/devtools/client/styleinspector/cssruleview.xhtml +++ b/devtools/client/styleinspector/cssruleview.xhtml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %inspectorDTD; ]> diff --git a/devtools/client/styleinspector/rule-view.js b/devtools/client/styleinspector/rule-view.js index fbadea8cc0b..88948d2fe2b 100644 --- a/devtools/client/styleinspector/rule-view.js +++ b/devtools/client/styleinspector/rule-view.js @@ -4049,7 +4049,7 @@ XPCOMUtils.defineLazyGetter(this, "osString", function() { XPCOMUtils.defineLazyGetter(this, "_strings", function() { return Services.strings.createBundle( - "chrome://global/locale/devtools/styleinspector.properties"); + "chrome://devtools-shared/locale/styleinspector.properties"); }); XPCOMUtils.defineLazyGetter(this, "domUtils", function() { diff --git a/devtools/client/styleinspector/style-inspector-menu.js b/devtools/client/styleinspector/style-inspector-menu.js index 3fbebc92f05..4c554585e79 100644 --- a/devtools/client/styleinspector/style-inspector-menu.js +++ b/devtools/client/styleinspector/style-inspector-menu.js @@ -16,7 +16,7 @@ loader.lazyServiceGetter(this, "clipboardHelper", "@mozilla.org/widget/clipboardhelper;1", "nsIClipboardHelper"); loader.lazyGetter(this, "_strings", () => { return Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties"); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties"); }); const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; diff --git a/devtools/client/styleinspector/style-inspector.js b/devtools/client/styleinspector/style-inspector.js index 3a87d8c47da..953f211cf97 100644 --- a/devtools/client/styleinspector/style-inspector.js +++ b/devtools/client/styleinspector/style-inspector.js @@ -19,7 +19,7 @@ loader.lazyGetter(this, "RuleView", loader.lazyGetter(this, "ComputedView", () => require("devtools/client/styleinspector/computed-view")); loader.lazyGetter(this, "_strings", () => Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties")); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties")); // This module doesn't currently export any symbols directly, it only // registers inspector tools. diff --git a/devtools/client/styleinspector/test/browser_ruleview_content_02.js b/devtools/client/styleinspector/test/browser_ruleview_content_02.js index 2c5d9cad0ec..5faac6954a6 100644 --- a/devtools/client/styleinspector/test/browser_ruleview_content_02.js +++ b/devtools/client/styleinspector/test/browser_ruleview_content_02.js @@ -16,7 +16,7 @@ const CONTENT = '\ '; const STRINGS = Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties"); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties"); add_task(function*() { yield addTab("data:text/html;charset=utf-8," + CONTENT); diff --git a/devtools/client/styleinspector/test/browser_ruleview_media-queries.js b/devtools/client/styleinspector/test/browser_ruleview_media-queries.js index 576c8e992a3..1346a8e9452 100644 --- a/devtools/client/styleinspector/test/browser_ruleview_media-queries.js +++ b/devtools/client/styleinspector/test/browser_ruleview_media-queries.js @@ -17,7 +17,7 @@ add_task(function*() { let elementStyle = view._elementStyle; let _strings = Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties"); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties"); let inline = _strings.GetStringFromName("rule.sourceInline"); diff --git a/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js b/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js index bbb7fc2f42a..0a299fdb237 100644 --- a/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js +++ b/devtools/client/styleinspector/test/browser_styleinspector_context-menu-copy-urls.js @@ -5,12 +5,14 @@ /* Tests both Copy URL and Copy Data URL context menu items */ -const PROPERTIES_URL = "chrome://global/locale/devtools/styleinspector.properties"; +const PROPERTIES_URL = "chrome://devtools-shared/locale/styleinspector.properties"; const TEST_DATA_URI = "data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs="; -// invalid URL still needs to be reachable otherwise getImageDataUrl will timeout. -// Reusing the properties bundle URL as a workaround -const INVALID_IMAGE_URI = PROPERTIES_URL; +// Invalid URL still needs to be reachable otherwise getImageDataUrl will +// timeout. DevTools chrome:// URLs aren't content accessible, so use some +// random resource:// URL here. +const INVALID_IMAGE_URI = + "resource://devtools/client/definitions.js"; const ERROR_MESSAGE = Services.strings .createBundle(PROPERTIES_URL) @@ -44,7 +46,7 @@ function* startTest() { yield testCopyUrlToClipboard(ruleViewData, "url", ".valid-background", TEST_DATA_URI); info("Test invalid background image URL in rue view"); yield testCopyUrlToClipboard(ruleViewData, "data-uri", ".invalid-background", ERROR_MESSAGE); - yield testCopyUrlToClipboard(ruleViewData, "url", ".invalid-background", PROPERTIES_URL); + yield testCopyUrlToClipboard(ruleViewData, "url", ".invalid-background", INVALID_IMAGE_URI); info("Opening computed view"); let computedViewData = yield openComputedView(); @@ -54,7 +56,7 @@ function* startTest() { yield testCopyUrlToClipboard(computedViewData, "url", ".valid-background", TEST_DATA_URI); info("Test invalid background image URL in computed view"); yield testCopyUrlToClipboard(computedViewData, "data-uri", ".invalid-background", ERROR_MESSAGE); - yield testCopyUrlToClipboard(computedViewData, "url", ".invalid-background", PROPERTIES_URL); + yield testCopyUrlToClipboard(computedViewData, "url", ".invalid-background", INVALID_IMAGE_URI); } function* testCopyUrlToClipboard({view, inspector}, type, selector, expected) { diff --git a/devtools/client/tilt/tilt-utils.js b/devtools/client/tilt/tilt-utils.js index bde8a53abda..43c070a1214 100644 --- a/devtools/client/tilt/tilt-utils.js +++ b/devtools/client/tilt/tilt-utils.js @@ -610,5 +610,5 @@ TiltUtils.bindObjectFunc(TiltUtils.DOM); // set the necessary string bundle XPCOMUtils.defineLazyGetter(TiltUtils.L10n, "stringBundle", function() { return Services.strings.createBundle( - "chrome://browser/locale/devtools/tilt.properties"); + "chrome://devtools/locale/tilt.properties"); }); diff --git a/devtools/client/webaudioeditor/includes.js b/devtools/client/webaudioeditor/includes.js index d0c456e43fd..b7911c7ec49 100644 --- a/devtools/client/webaudioeditor/includes.js +++ b/devtools/client/webaudioeditor/includes.js @@ -18,7 +18,7 @@ var { EventTarget } = require("sdk/event/target"); const { Task } = Cu.import("resource://gre/modules/Task.jsm", {}); const { Class } = require("sdk/core/heritage"); const EventEmitter = require("devtools/shared/event-emitter"); -const STRINGS_URI = "chrome://browser/locale/devtools/webaudioeditor.properties" +const STRINGS_URI = "chrome://devtools/locale/webaudioeditor.properties" const L10N = new ViewHelpers.L10N(STRINGS_URI); const Telemetry = require("devtools/client/shared/telemetry"); const telemetry = new Telemetry(); diff --git a/devtools/client/webaudioeditor/webaudioeditor.xul b/devtools/client/webaudioeditor/webaudioeditor.xul index e9670c989f2..f6b4a4b84c9 100644 --- a/devtools/client/webaudioeditor/webaudioeditor.xul +++ b/devtools/client/webaudioeditor/webaudioeditor.xul @@ -8,7 +8,7 @@ + %debuggerDTD; ]> diff --git a/devtools/client/webconsole/console-output.js b/devtools/client/webconsole/console-output.js index d951454aa5d..d11815efe3b 100644 --- a/devtools/client/webconsole/console-output.js +++ b/devtools/client/webconsole/console-output.js @@ -23,7 +23,7 @@ const Heritage = require("sdk/core/heritage"); const URI = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); const XHTML_NS = "http://www.w3.org/1999/xhtml"; const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties"; +const STRINGS_URI = "chrome://devtools/locale/webconsole.properties"; const WebConsoleUtils = require("devtools/shared/webconsole/utils").Utils; const l10n = new WebConsoleUtils.l10n(STRINGS_URI); diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 99313f5adb3..30cb602fbe2 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -23,7 +23,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", loader.lazyGetter(this, "showDoorhanger", () => require("devtools/client/shared/doorhanger").showDoorhanger); loader.lazyRequireGetter(this, "sourceUtils", "devtools/client/shared/source-utils"); -const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties"; +const STRINGS_URI = "chrome://devtools/locale/webconsole.properties"; var l10n = new WebConsoleUtils.l10n(STRINGS_URI); const BROWSER_CONSOLE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no"; diff --git a/devtools/client/webconsole/test/head.js b/devtools/client/webconsole/test/head.js index 81fa550a98e..de47a13a444 100644 --- a/devtools/client/webconsole/test/head.js +++ b/devtools/client/webconsole/test/head.js @@ -36,7 +36,7 @@ const SEVERITY_LOG = 3; // The indent of a console group in pixels. const GROUP_INDENT = 12; -const WEBCONSOLE_STRINGS_URI = "chrome://browser/locale/devtools/" + +const WEBCONSOLE_STRINGS_URI = "chrome://devtools/locale/" + "webconsole.properties"; var WCUL10n = new WebConsoleUtils.l10n(WEBCONSOLE_STRINGS_URI); diff --git a/devtools/client/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js index d33e5691544..0641bc7cb9d 100644 --- a/devtools/client/webconsole/webconsole.js +++ b/devtools/client/webconsole/webconsole.js @@ -30,7 +30,7 @@ loader.lazyImporter(this, "VariablesViewController", "resource://devtools/client loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); loader.lazyImporter(this, "gDevTools", "resource://devtools/client/framework/gDevTools.jsm"); -const STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties"; +const STRINGS_URI = "chrome://devtools/locale/webconsole.properties"; var l10n = new WebConsoleUtils.l10n(STRINGS_URI); const XHTML_NS = "http://www.w3.org/1999/xhtml"; diff --git a/devtools/client/webconsole/webconsole.xul b/devtools/client/webconsole/webconsole.xul index 332a50d09ad..e7052f5b98b 100644 --- a/devtools/client/webconsole/webconsole.xul +++ b/devtools/client/webconsole/webconsole.xul @@ -3,7 +3,7 @@ - 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/. --> + %webConsoleDTD; ]> diff --git a/devtools/client/webide/content/addons.js b/devtools/client/webide/content/addons.js index d38dfe0e96a..74087e19ae5 100644 --- a/devtools/client/webide/content/addons.js +++ b/devtools/client/webide/content/addons.js @@ -6,7 +6,7 @@ var Cu = Components.utils; const {Services} = Cu.import("resource://gre/modules/Services.jsm"); const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); const {GetAvailableAddons, ForgetAddonsList} = require("devtools/client/webide/modules/addons"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); window.addEventListener("load", function onLoad() { window.removeEventListener("load", onLoad); diff --git a/devtools/client/webide/content/addons.xhtml b/devtools/client/webide/content/addons.xhtml index 7f6ac74cc01..6f3bc1e7c9a 100644 --- a/devtools/client/webide/content/addons.xhtml +++ b/devtools/client/webide/content/addons.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/details.xhtml b/devtools/client/webide/content/details.xhtml index 13960131856..a04c37b0cc9 100644 --- a/devtools/client/webide/content/details.xhtml +++ b/devtools/client/webide/content/details.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/devicepreferences.xhtml b/devtools/client/webide/content/devicepreferences.xhtml index 71be76f2860..dafb6f15ff1 100644 --- a/devtools/client/webide/content/devicepreferences.xhtml +++ b/devtools/client/webide/content/devicepreferences.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/devicesettings.xhtml b/devtools/client/webide/content/devicesettings.xhtml index 32119104df1..0406c6f076f 100644 --- a/devtools/client/webide/content/devicesettings.xhtml +++ b/devtools/client/webide/content/devicesettings.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/logs.xhtml b/devtools/client/webide/content/logs.xhtml index 0d4436a383b..e6e0e3e2ceb 100644 --- a/devtools/client/webide/content/logs.xhtml +++ b/devtools/client/webide/content/logs.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/monitor.xhtml b/devtools/client/webide/content/monitor.xhtml index 29be9d002d7..552f3826c1e 100644 --- a/devtools/client/webide/content/monitor.xhtml +++ b/devtools/client/webide/content/monitor.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/newapp.xul b/devtools/client/webide/content/newapp.xul index 1ba317c8df8..7ff083519cb 100644 --- a/devtools/client/webide/content/newapp.xul +++ b/devtools/client/webide/content/newapp.xul @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/permissionstable.xhtml b/devtools/client/webide/content/permissionstable.xhtml index 6ad42bd914f..361cfece882 100644 --- a/devtools/client/webide/content/permissionstable.xhtml +++ b/devtools/client/webide/content/permissionstable.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/prefs.xhtml b/devtools/client/webide/content/prefs.xhtml index 222b801e8ed..726ca772cbb 100644 --- a/devtools/client/webide/content/prefs.xhtml +++ b/devtools/client/webide/content/prefs.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/project-listing.xhtml b/devtools/client/webide/content/project-listing.xhtml index 0f7c0c7c2e2..309ab911535 100644 --- a/devtools/client/webide/content/project-listing.xhtml +++ b/devtools/client/webide/content/project-listing.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/runtime-listing.xhtml b/devtools/client/webide/content/runtime-listing.xhtml index aaae153b801..5cc2c1d1b77 100644 --- a/devtools/client/webide/content/runtime-listing.xhtml +++ b/devtools/client/webide/content/runtime-listing.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/runtimedetails.js b/devtools/client/webide/content/runtimedetails.js index 4e587e229a2..cb8b55324cf 100644 --- a/devtools/client/webide/content/runtimedetails.js +++ b/devtools/client/webide/content/runtimedetails.js @@ -8,7 +8,7 @@ const {require} = Cu.import("resource://devtools/shared/Loader.jsm", {}); const {AppManager} = require("devtools/client/webide/modules/app-manager"); const {Connection} = require("devtools/shared/client/connection-manager"); const {RuntimeTypes} = require("devtools/client/webide/modules/runtimes"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); const UNRESTRICTED_HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Running_and_debugging_apps#Unrestricted_app_debugging_%28including_certified_apps_main_process_etc.%29"; diff --git a/devtools/client/webide/content/runtimedetails.xhtml b/devtools/client/webide/content/runtimedetails.xhtml index 7a46fd30751..b2f74728adc 100644 --- a/devtools/client/webide/content/runtimedetails.xhtml +++ b/devtools/client/webide/content/runtimedetails.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/simulator.js b/devtools/client/webide/content/simulator.js index ea406cc0d7e..d08008043cd 100644 --- a/devtools/client/webide/content/simulator.js +++ b/devtools/client/webide/content/simulator.js @@ -12,7 +12,7 @@ const EventEmitter = require('devtools/shared/event-emitter'); const promise = require("promise"); const utils = require("devtools/client/webide/modules/utils"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var SimulatorEditor = { diff --git a/devtools/client/webide/content/simulator.xhtml b/devtools/client/webide/content/simulator.xhtml index 586448fe898..b69db7ef198 100644 --- a/devtools/client/webide/content/simulator.xhtml +++ b/devtools/client/webide/content/simulator.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/webide.js b/devtools/client/webide/content/webide.js index 12fdb801e69..03b83862bd3 100644 --- a/devtools/client/webide/content/webide.js +++ b/devtools/client/webide/content/webide.js @@ -26,7 +26,7 @@ const {RuntimeScanners} = require("devtools/client/webide/modules/runtimes"); const {showDoorhanger} = require("devtools/client/shared/doorhanger"); const {Simulators} = require("devtools/client/webide/modules/simulators"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); const HTML = "http://www.w3.org/1999/xhtml"; const HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Troubleshooting"; diff --git a/devtools/client/webide/content/webide.xul b/devtools/client/webide/content/webide.xul index 17c464cb40b..3dfa2fbbccc 100644 --- a/devtools/client/webide/content/webide.xul +++ b/devtools/client/webide/content/webide.xul @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/content/wifi-auth.xhtml b/devtools/client/webide/content/wifi-auth.xhtml index ce71144dccb..41d1d8526d3 100644 --- a/devtools/client/webide/content/wifi-auth.xhtml +++ b/devtools/client/webide/content/wifi-auth.xhtml @@ -5,7 +5,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + %webideDTD; ]> diff --git a/devtools/client/webide/modules/app-manager.js b/devtools/client/webide/modules/app-manager.js index 3368077946a..85d4ea6c999 100644 --- a/devtools/client/webide/modules/app-manager.js +++ b/devtools/client/webide/modules/app-manager.js @@ -25,7 +25,7 @@ const {NetUtil} = Cu.import("resource://gre/modules/NetUtil.jsm", {}); const Telemetry = require("devtools/client/shared/telemetry"); const {ProjectBuilding} = require("./build"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var AppManager = exports.AppManager = { diff --git a/devtools/client/webide/modules/app-validator.js b/devtools/client/webide/modules/app-validator.js index af45dc5fb2e..8f880a0fe78 100644 --- a/devtools/client/webide/modules/app-validator.js +++ b/devtools/client/webide/modules/app-validator.js @@ -10,7 +10,7 @@ const {FileUtils} = Cu.import("resource://gre/modules/FileUtils.jsm", {}); const Services = require("Services"); const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); var XMLHttpRequest = CC("@mozilla.org/xmlextras/xmlhttprequest;1"); -var strings = Services.strings.createBundle("chrome://browser/locale/devtools/app-manager.properties"); +var strings = Services.strings.createBundle("chrome://devtools/locale/app-manager.properties"); function AppValidator({ type, location }) { this.type = type; diff --git a/devtools/client/webide/modules/config-view.js b/devtools/client/webide/modules/config-view.js index beabf7c7d19..445bbe42458 100644 --- a/devtools/client/webide/modules/config-view.js +++ b/devtools/client/webide/modules/config-view.js @@ -6,7 +6,7 @@ const {Cu} = require("chrome"); const EventEmitter = require("devtools/shared/event-emitter"); const {Services} = Cu.import("resource://gre/modules/Services.jsm"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var ConfigView; diff --git a/devtools/client/webide/modules/project-list.js b/devtools/client/webide/modules/project-list.js index 658dba4fe3c..77981a1004d 100644 --- a/devtools/client/webide/modules/project-list.js +++ b/devtools/client/webide/modules/project-list.js @@ -13,7 +13,7 @@ const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); const utils = require("devtools/client/webide/modules/utils"); const Telemetry = require("devtools/client/shared/telemetry"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var ProjectList; diff --git a/devtools/client/webide/modules/runtime-list.js b/devtools/client/webide/modules/runtime-list.js index e6d7d086868..953c3f4c5e1 100644 --- a/devtools/client/webide/modules/runtime-list.js +++ b/devtools/client/webide/modules/runtime-list.js @@ -12,7 +12,7 @@ const {Devices} = Cu.import("resource://devtools/shared/apps/Devices.jsm"); const {Task} = Cu.import("resource://gre/modules/Task.jsm", {}); const utils = require("devtools/client/webide/modules/utils"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); var RuntimeList; diff --git a/devtools/client/webide/modules/runtimes.js b/devtools/client/webide/modules/runtimes.js index ac177025f9a..a5006dacd60 100644 --- a/devtools/client/webide/modules/runtimes.js +++ b/devtools/client/webide/modules/runtimes.js @@ -16,7 +16,7 @@ loader.lazyRequireGetter(this, "AuthenticationResult", loader.lazyRequireGetter(this, "DevToolsUtils", "devtools/shared/DevToolsUtils"); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); /** * Runtime and Scanner API diff --git a/devtools/client/webide/modules/utils.js b/devtools/client/webide/modules/utils.js index 2d942c36927..645fe53c095 100644 --- a/devtools/client/webide/modules/utils.js +++ b/devtools/client/webide/modules/utils.js @@ -5,7 +5,7 @@ const { Cc, Cu, Ci } = require("chrome"); const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm", {}); const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); -const Strings = Services.strings.createBundle("chrome://browser/locale/devtools/webide.properties"); +const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties"); function doesFileExist (location) { let file = new FileUtils.File(location); diff --git a/devtools/client/webide/test/test_app_validator.html b/devtools/client/webide/test/test_app_validator.html index 1618817bfe8..a63cd8f487d 100644 --- a/devtools/client/webide/test/test_app_validator.html +++ b/devtools/client/webide/test/test_app_validator.html @@ -26,7 +26,7 @@ "nsILocalFile", "initWithPath"); const cr = Cc["@mozilla.org/chrome/chrome-registry;1"] .getService(Ci.nsIChromeRegistry); - const strings = Services.strings.createBundle("chrome://browser/locale/devtools/app-manager.properties"); + const strings = Services.strings.createBundle("chrome://devtools/locale/app-manager.properties"); let httpserver, origin; window.onload = function() { diff --git a/devtools/server/actors/csscoverage.js b/devtools/server/actors/csscoverage.js index 738648056e7..22f1818de4e 100644 --- a/devtools/server/actors/csscoverage.js +++ b/devtools/server/actors/csscoverage.js @@ -34,7 +34,7 @@ const MAX_UNUSED_RULES = 10000; * Allow: let foo = l10n.lookup("csscoverageFoo"); */ const l10n = exports.l10n = { - _URI: "chrome://global/locale/devtools/csscoverage.properties", + _URI: "chrome://devtools-shared/locale/csscoverage.properties", lookup: function(msg) { if (this._stringBundle == null) { this._stringBundle = Services.strings.createBundle(this._URI); diff --git a/devtools/server/tests/mochitest/test_css-logic-media-queries.html b/devtools/server/tests/mochitest/test_css-logic-media-queries.html index f4b3ea9a02a..476b6120a09 100644 --- a/devtools/server/tests/mochitest/test_css-logic-media-queries.html +++ b/devtools/server/tests/mochitest/test_css-logic-media-queries.html @@ -41,7 +41,7 @@ Test that css-logic handles media-queries correctly cssLogic.processMatchedSelectors(); let _strings = Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties"); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties"); let inline = _strings.GetStringFromName("rule.sourceInline"); diff --git a/devtools/shared/gcli/commands/highlight.js b/devtools/shared/gcli/commands/highlight.js index 5268ac3b33e..2a49506b8a7 100644 --- a/devtools/shared/gcli/commands/highlight.js +++ b/devtools/shared/gcli/commands/highlight.js @@ -12,7 +12,7 @@ const { } = require("devtools/server/actors/highlighters"); XPCOMUtils.defineLazyGetter(this, "nodesSelected", function() { - return Services.strings.createBundle("chrome://global/locale/devtools/gclicommands.properties"); + return Services.strings.createBundle("chrome://devtools-shared/locale/gclicommands.properties"); }); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); diff --git a/devtools/shared/gcli/source/lib/gcli/l10n.js b/devtools/shared/gcli/source/lib/gcli/l10n.js index f33738252e7..afdab932fd9 100644 --- a/devtools/shared/gcli/source/lib/gcli/l10n.js +++ b/devtools/shared/gcli/source/lib/gcli/l10n.js @@ -26,7 +26,7 @@ var prefBranch = prefSvc.getBranch(null).QueryInterface(Ci.nsIPrefBranch); var Services = Cu.import('resource://gre/modules/Services.jsm', {}).Services; var stringBundle = Services.strings.createBundle( - 'chrome://global/locale/devtools/gclicommands.properties'); + 'chrome://devtools-shared/locale/gclicommands.properties'); /** * Lookup a string in the GCLI string bundle diff --git a/devtools/shared/gcli/source/lib/gcli/util/l10n.js b/devtools/shared/gcli/source/lib/gcli/util/l10n.js index 15c5bc8f005..56938970691 100644 --- a/devtools/shared/gcli/source/lib/gcli/util/l10n.js +++ b/devtools/shared/gcli/source/lib/gcli/util/l10n.js @@ -23,7 +23,7 @@ var Services = Cu.import('resource://gre/modules/Services.jsm', {}).Services; var imports = {}; XPCOMUtils.defineLazyGetter(imports, 'stringBundle', function () { - return Services.strings.createBundle('chrome://global/locale/devtools/gcli.properties'); + return Services.strings.createBundle('chrome://devtools-shared/locale/gcli.properties'); }); /* diff --git a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd b/devtools/shared/locales/en-US/csscoverage.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd rename to devtools/shared/locales/en-US/csscoverage.dtd diff --git a/toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties b/devtools/shared/locales/en-US/csscoverage.properties similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties rename to devtools/shared/locales/en-US/csscoverage.properties diff --git a/toolkit/locales/en-US/chrome/global/devtools/debugger.properties b/devtools/shared/locales/en-US/debugger.properties similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/debugger.properties rename to devtools/shared/locales/en-US/debugger.properties diff --git a/toolkit/locales/en-US/chrome/global/devtools/gcli.properties b/devtools/shared/locales/en-US/gcli.properties similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/gcli.properties rename to devtools/shared/locales/en-US/gcli.properties diff --git a/toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties b/devtools/shared/locales/en-US/gclicommands.properties similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties rename to devtools/shared/locales/en-US/gclicommands.properties diff --git a/toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties b/devtools/shared/locales/en-US/styleinspector.properties similarity index 100% rename from toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties rename to devtools/shared/locales/en-US/styleinspector.properties diff --git a/devtools/shared/locales/jar.mn b/devtools/shared/locales/jar.mn new file mode 100644 index 00000000000..2d33b542523 --- /dev/null +++ b/devtools/shared/locales/jar.mn @@ -0,0 +1,8 @@ +#filter substitution +# 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/. + +@AB_CD@.jar: +% locale devtools-shared @AB_CD@ %locale/@AB_CD@/devtools/shared/ + locale/@AB_CD@/devtools/shared/ (%*) diff --git a/devtools/shared/locales/moz.build b/devtools/shared/locales/moz.build new file mode 100644 index 00000000000..3bbe6729759 --- /dev/null +++ b/devtools/shared/locales/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/devtools/shared/moz.build b/devtools/shared/moz.build index b0f329915b0..f4524356b22 100644 --- a/devtools/shared/moz.build +++ b/devtools/shared/moz.build @@ -15,6 +15,7 @@ DIRS += [ 'heapsnapshot', 'jsbeautify', 'layout', + 'locales', 'performance', 'pretty-fast', 'qrcode', diff --git a/devtools/shared/security/prompt.js b/devtools/shared/security/prompt.js index 11c6b85a67b..79e9ce5cea3 100644 --- a/devtools/shared/security/prompt.js +++ b/devtools/shared/security/prompt.js @@ -15,7 +15,7 @@ loader.lazyRequireGetter(this, "AuthenticationResult", "devtools/shared/security/auth", true); DevToolsUtils.defineLazyGetter(this, "bundle", () => { - const DBG_STRINGS_URI = "chrome://global/locale/devtools/debugger.properties"; + const DBG_STRINGS_URI = "chrome://devtools-shared/locale/debugger.properties"; return Services.strings.createBundle(DBG_STRINGS_URI); }); diff --git a/devtools/shared/styleinspector/css-logic.js b/devtools/shared/styleinspector/css-logic.js index c8eeb9dd039..80f1feec647 100644 --- a/devtools/shared/styleinspector/css-logic.js +++ b/devtools/shared/styleinspector/css-logic.js @@ -847,7 +847,7 @@ CssLogic.l10n = function(aName) }; DevToolsUtils.defineLazyGetter(CssLogic, "_strings", function() { return Services.strings - .createBundle("chrome://global/locale/devtools/styleinspector.properties")}); + .createBundle("chrome://devtools-shared/locale/styleinspector.properties")}); /** * Is the given property sheet a content stylesheet? diff --git a/devtools/shared/tests/unit/test_fetch-chrome.js b/devtools/shared/tests/unit/test_fetch-chrome.js index a3351e63062..441d4c7ba97 100644 --- a/devtools/shared/tests/unit/test_fetch-chrome.js +++ b/devtools/shared/tests/unit/test_fetch-chrome.js @@ -5,7 +5,7 @@ // Tests for DevToolsUtils.fetch on chrome:// URI's. -const URL_FOUND = "chrome://global/locale/devtools/debugger.properties"; +const URL_FOUND = "chrome://devtools-shared/locale/debugger.properties"; const URL_NOT_FOUND = "chrome://this/is/not/here.js"; /** diff --git a/mobile/android/locales/filter.py b/mobile/android/locales/filter.py index 9afe0a6f59c..26f68d8f067 100644 --- a/mobile/android/locales/filter.py +++ b/mobile/android/locales/filter.py @@ -11,6 +11,7 @@ def test(mod, path, entity = None): import re # ignore anything but mobile, which is our local repo checkout name if mod not in ("netwerk", "dom", "toolkit", "security/manager", + "devtools/shared", "services/sync", "mobile", "mobile/android/base", "mobile/android"): return "ignore" diff --git a/mobile/locales/filter.py b/mobile/locales/filter.py index ccc39e7b943..c14c2d48e63 100644 --- a/mobile/locales/filter.py +++ b/mobile/locales/filter.py @@ -11,6 +11,7 @@ def test(mod, path, entity = None): import re # ignore anything but mobile, which is our local repo checkout name if mod not in ("netwerk", "dom", "toolkit", "security/manager", + "devtools/shared", "services/sync", "mobile", "mobile/android/base", "mobile/android"): return "ignore" diff --git a/toolkit/locales/Makefile.in b/toolkit/locales/Makefile.in index 4738aedf3e9..0fadfd90b37 100644 --- a/toolkit/locales/Makefile.in +++ b/toolkit/locales/Makefile.in @@ -16,9 +16,10 @@ libs-%: @$(MAKE) -C ../../netwerk/locales/ libs AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../dom/locales/ libs AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../security/manager/locales/ libs AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../../devtools/shared/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID=$(XPI_ROOT_APPID) @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* -# target to be used by multi-locale l10n builds, just add this locale +# target to be used by multi-locale l10n builds, just add this locale # like regular chrome code chrome-%: @$(MAKE) -C $(DEPTH)/netwerk/locales/ chrome AB_CD=$* diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 20d517b2bbe..efdbdbe47d0 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -35,12 +35,6 @@ locale/@AB_CD@/global/customizeToolbar.properties (%chrome/global/customizeToolbar.properties) locale/@AB_CD@/global/datetimepicker.dtd (%chrome/global/datetimepicker.dtd) locale/@AB_CD@/global/dateFormat.properties (%chrome/global/dateFormat.properties) - locale/@AB_CD@/global/devtools/csscoverage.properties (%chrome/global/devtools/csscoverage.properties) - locale/@AB_CD@/global/devtools/csscoverage.dtd (%chrome/global/devtools/csscoverage.dtd) - locale/@AB_CD@/global/devtools/debugger.properties (%chrome/global/devtools/debugger.properties) - locale/@AB_CD@/global/devtools/gcli.properties (%chrome/global/devtools/gcli.properties) - locale/@AB_CD@/global/devtools/gclicommands.properties (%chrome/global/devtools/gclicommands.properties) - locale/@AB_CD@/global/devtools/styleinspector.properties (%chrome/global/devtools/styleinspector.properties) locale/@AB_CD@/global/dialogOverlay.dtd (%chrome/global/dialogOverlay.dtd) locale/@AB_CD@/global/editMenuOverlay.dtd (%chrome/global/editMenuOverlay.dtd) locale/@AB_CD@/global/fallbackMenubar.properties (%chrome/global/fallbackMenubar.properties) diff --git a/toolkit/locales/l10n.ini b/toolkit/locales/l10n.ini index 75e566f11b5..076ed499e1c 100644 --- a/toolkit/locales/l10n.ini +++ b/toolkit/locales/l10n.ini @@ -10,3 +10,4 @@ dirs = netwerk dom toolkit security/manager + devtools/shared