Bug 1312041 - remove requireRawId rewriting in favor of Loader paths; r=jryans

MozReview-Commit-ID: 6OSszbKpp74 --HG-- extra : rebase_source : 475b4a2de10d65cadd6198e49e5ff5cfb4e9b871
2016-10-25 21:30:18 -06:00 · 2016-10-25 21:30:18 -06:00 · 1fc208e8d8
--- a/devtools/client/animationinspector/animation-controller.js
+++ b/devtools/client/animationinspector/animation-controller.js
@ -22,7 +22,8 @@ loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
 loader.lazyRequireGetter(this, "AnimationsFront", "devtools/shared/fronts/animation", true);

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties");
+const L10N =
+      new LocalizationHelper("devtools/client/locales/animationinspector.properties");

 // Global toolbox/inspector, set when startup is called.
 var gToolbox, gInspector;
--- a/devtools/client/animationinspector/components/animation-time-block.js
+++ b/devtools/client/animationinspector/components/animation-time-block.js
@ -10,7 +10,8 @@ const EventEmitter = require("devtools/shared/event-emitter");
 const {createNode, TimeScale} = require("devtools/client/animationinspector/utils");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties");
+const L10N =
+      new LocalizationHelper("devtools/client/locales/animationinspector.properties");

 // In the createPathSegments function, an animation duration is divided by
 // DURATION_RESOLUTION in order to draw the way the animation progresses.
--- a/devtools/client/animationinspector/components/rate-selector.js
+++ b/devtools/client/animationinspector/components/rate-selector.js
@ -9,7 +9,8 @@
 const EventEmitter = require("devtools/shared/event-emitter");
 const {createNode} = require("devtools/client/animationinspector/utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties");
+const L10N =
+      new LocalizationHelper("devtools/client/locales/animationinspector.properties");

 // List of playback rate presets displayed in the timeline toolbar.
 const PLAYBACK_RATES = [.1, .25, .5, 1, 2, 5, 10];
--- a/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js
+++ b/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js
@ -5,7 +5,7 @@
 "use strict";

 const LAYOUT_ERRORS_L10N =
-  new LocalizationHelper("global/locale/layout_errors.properties");
+  new LocalizationHelper("toolkit/locales/layout_errors.properties");

 // Test that when an animation is selected, its list of animated properties is
 // displayed below it.
--- a/devtools/client/animationinspector/test/head.js
+++ b/devtools/client/animationinspector/test/head.js
@ -15,7 +15,7 @@ const FRAME_SCRIPT_URL = CHROME_URL_ROOT + "doc_frame_script.js";
 const COMMON_FRAME_SCRIPT_URL = "chrome://devtools/content/shared/frame-script-utils.js";
 const TAB_NAME = "animationinspector";
 const ANIMATION_L10N =
-  new LocalizationHelper("devtools/locale/animationinspector.properties");
+  new LocalizationHelper("devtools/client/locales/animationinspector.properties");

 // Auto clean-up when a test ends
 registerCleanupFunction(function* () {
--- a/devtools/client/animationinspector/utils.js
+++ b/devtools/client/animationinspector/utils.js
@ -9,7 +9,8 @@
 loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties");
+const L10N =
+      new LocalizationHelper("devtools/client/locales/animationinspector.properties");

 // How many times, maximum, can we loop before we find the optimal time
 // interval in the timeline graph.
--- a/devtools/client/canvasdebugger/canvasdebugger.js
+++ b/devtools/client/canvasdebugger/canvasdebugger.js
@ -75,8 +75,8 @@ const EVENTS = {
 XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);

 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const STRINGS_URI = "devtools/locale/canvasdebugger.properties";
-const SHARED_STRINGS_URI = "devtools/locale/shared.properties";
+const STRINGS_URI = "devtools/client/locales/canvasdebugger.properties";
+const SHARED_STRINGS_URI = "devtools/client/locales/shared.properties";

 const SNAPSHOT_START_RECORDING_DELAY = 10; // ms
 const SNAPSHOT_DATA_EXPORT_MAX_BLOCK = 1000; // ms
--- 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 = "devtools/locale/debugger.properties";
+const DBG_STRINGS_URI = "devtools/client/locales/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
--- a/devtools/client/debugger/new/panel.js
+++ b/devtools/client/debugger/new/panel.js
@ -6,7 +6,7 @@
 const { Task } = require("devtools/shared/task");
 var {LocalizationHelper} = require("devtools/shared/l10n");

-const DBG_STRINGS_URI = "devtools/locale/debugger.properties";
+const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties";
 var L10N = new LocalizationHelper(DBG_STRINGS_URI);

 function DebuggerPanel(iframeWindow, toolbox) {
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@ -24,7 +24,7 @@ loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/client/scratc
 loader.lazyGetter(this, "DomPanel", () => require("devtools/client/dom/dom-panel").DomPanel);

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/startup.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/startup.properties");

 var Tools = {};
 exports.Tools = Tools;
--- a/devtools/client/dom/main.js
+++ b/devtools/client/dom/main.js
@ -20,7 +20,7 @@ XPCOMUtils.defineConstant(this, "require", require);

 // Localization
 const { LocalizationHelper } = require("devtools/shared/l10n");
-this.l10n = new LocalizationHelper("devtools/locale/dom.properties");
+this.l10n = new LocalizationHelper("devtools/client/locales/dom.properties");

 // Load DOM panel content
 require("./content/dom-view.js");
--- a/devtools/client/framework/attach-thread.js
+++ b/devtools/client/framework/attach-thread.js
@ -9,7 +9,7 @@ const Services = require("Services");
 const defer = require("devtools/shared/defer");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 function handleThreadState(toolbox, event, packet) {
  // Suppress interrupted events by default because the thread is
--- a/devtools/client/framework/browser-menus.js
+++ b/devtools/client/framework/browser-menus.js
@ -13,7 +13,7 @@
 */

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const MENUS_L10N = new LocalizationHelper("devtools/locale/menus.properties");
+const MENUS_L10N = new LocalizationHelper("devtools/client/locales/menus.properties");

 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true);
--- a/devtools/client/framework/connect/connect.js
+++ b/devtools/client/framework/connect/connect.js
@ -15,7 +15,7 @@ var {Toolbox} = require("devtools/client/framework/toolbox");
 var {DebuggerClient} = require("devtools/shared/client/main");
 var {Task} = require("devtools/shared/task");
 var {LocalizationHelper} = require("devtools/shared/l10n");
-var L10N = new LocalizationHelper("devtools/locale/connection-screen.properties");
+var L10N = new LocalizationHelper("devtools/client/locales/connection-screen.properties");

 var gClient;
 var gConnectionTimeout;
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@ -31,7 +31,7 @@ loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.
 loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 const TABS_OPEN_PEAK_HISTOGRAM = "DEVTOOLS_TABS_OPEN_PEAK_LINEAR";
 const TABS_OPEN_AVG_HISTOGRAM = "DEVTOOLS_TABS_OPEN_AVERAGE_LINEAR";
--- a/devtools/client/framework/sidebar.js
+++ b/devtools/client/framework/sidebar.js
@ -10,7 +10,7 @@ var EventEmitter = require("devtools/shared/event-emitter");
 var Telemetry = require("devtools/client/shared/telemetry");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";

--- a/devtools/client/framework/test/browser_keybindings_02.js
+++ b/devtools/client/framework/test/browser_keybindings_02.js
@ -12,7 +12,7 @@ const URL = "data:text/html;charset=utf8,test page";
 var {Toolbox} = require("devtools/client/framework/toolbox");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 function getZoomValue() {
  return parseFloat(Services.prefs.getCharPref("devtools.toolbox.zoomValue"));
--- a/devtools/client/framework/test/browser_keybindings_03.js
+++ b/devtools/client/framework/test/browser_keybindings_03.js
@ -13,7 +13,7 @@ const URL = "data:text/html;charset=utf8,test page for toolbox switching";
 var {Toolbox} = require("devtools/client/framework/toolbox");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 add_task(function* () {
  info("Create a test tab and open the toolbox");
--- a/devtools/client/framework/test/browser_toolbox_options.js
+++ b/devtools/client/framework/test/browser_toolbox_options.js
@ -11,7 +11,7 @@

 var doc = null, toolbox = null, panelWin = null, modifiedPrefs = [];
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 add_task(function* () {
  const URL = "data:text/html;charset=utf8,test for dynamically registering " +
--- a/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
+++ b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js
@ -10,7 +10,7 @@ requestLongerTimeout(2);
 var {Toolbox} = require("devtools/client/framework/toolbox");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 add_task(function* () {
  let tab = yield addTab("about:blank");
--- a/devtools/client/framework/test/browser_toolbox_window_reload_target.js
+++ b/devtools/client/framework/test/browser_toolbox_window_reload_target.js
@ -12,7 +12,7 @@ const TEST_URL = "data:text/html;charset=utf-8," +
 var {Toolbox} = require("devtools/client/framework/toolbox");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 var target, toolbox, description, reloadsSent, toolIDs;

--- a/devtools/client/framework/test/browser_toolbox_zoom.js
+++ b/devtools/client/framework/test/browser_toolbox_zoom.js
@ -8,7 +8,7 @@
 var toolbox;

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 function test() {
  addTab("about:blank").then(openToolbox);
--- a/devtools/client/framework/toolbox-host-manager.js
+++ b/devtools/client/framework/toolbox-host-manager.js
@ -1,7 +1,7 @@
 const Services = require("Services");
 const {Ci} = require("chrome");
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 const {Task} = require("devtools/shared/task");

--- a/devtools/client/framework/toolbox-options.js
+++ b/devtools/client/framework/toolbox-options.js
@ -12,7 +12,7 @@ const {Task} = require("devtools/shared/task");
 const {gDevTools} = require("devtools/client/framework/devtools");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 exports.OptionsPanel = OptionsPanel;

--- a/devtools/client/framework/toolbox.js
+++ b/devtools/client/framework/toolbox.js
@ -34,7 +34,7 @@ const { BrowserLoader } =
  Cu.import("resource://devtools/client/shared/browser-loader.js", {});

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 loader.lazyRequireGetter(this, "CommandUtils",
  "devtools/client/shared/developer-toolbar", true);
--- a/devtools/client/inspector/components/box-model.js
+++ b/devtools/client/inspector/components/box-model.js
@ -13,8 +13,8 @@ const {ReflowFront} = require("devtools/shared/fronts/layout");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const {getCssProperties} = require("devtools/shared/fronts/css-properties");

-const STRINGS_URI = "devtools/locale/shared.properties";
-const STRINGS_INSPECTOR = "devtools-shared/locale/styleinspector.properties";
+const STRINGS_URI = "devtools/client/locales/shared.properties";
+const STRINGS_INSPECTOR = "devtools/shared/locales/styleinspector.properties";
 const SHARED_L10N = new LocalizationHelper(STRINGS_URI);
 const INSPECTOR_L10N = new LocalizationHelper(STRINGS_INSPECTOR);
 const NUMERIC = /^-?[\d\.]+$/;
--- a/devtools/client/inspector/computed/computed.js
+++ b/devtools/client/inspector/computed/computed.js
@ -24,7 +24,7 @@ const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts");
 const {BoxModelView} = require("devtools/client/inspector/components/box-model");
 const clipboardHelper = require("devtools/shared/platform/clipboard");

-const STYLE_INSPECTOR_PROPERTIES = "devtools-shared/locale/styleinspector.properties";
+const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties";
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);

--- a/devtools/client/inspector/inspector.js
+++ b/devtools/client/inspector/inspector.js
@ -37,8 +37,9 @@ const {ViewHelpers} = require("devtools/client/shared/widgets/view-helpers");
 const clipboardHelper = require("devtools/shared/platform/clipboard");

 const {LocalizationHelper, localizeMarkup} = require("devtools/shared/l10n");
-const INSPECTOR_L10N = new LocalizationHelper("devtools/locale/inspector.properties");
-const TOOLBOX_L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const INSPECTOR_L10N =
+      new LocalizationHelper("devtools/client/locales/inspector.properties");
+const TOOLBOX_L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 // Sidebar dimensions
 const INITIAL_SIDEBAR_SIZE = 350;
--- a/devtools/client/inspector/inspector.xhtml
+++ b/devtools/client/inspector/inspector.xhtml
@ -34,7 +34,7 @@
    <!-- Main Panel Content -->
    <div id="inspector-main-content" class="devtools-main-content">
      <div id="inspector-toolbar" class="devtools-toolbar" nowindowdrag="true"
-                data-localization-bundle="devtools/locale/inspector.properties">
+                data-localization-bundle="devtools/client/locales/inspector.properties">
        <button id="inspector-element-add-button" class="devtools-button"
                     data-localization="title=inspectorAddNode.label"></button>
        <div class="devtools-toolbar-spacer"></div>
@ -73,7 +73,7 @@
    <!-- Sidebar panel definitions -->
    <div id="tabpanels" style="visibility:collapse">
      <div id="sidebar-panel-ruleview" class="devtools-monospace theme-sidebar inspector-tabpanel"
-                data-localization-bundle="devtools/locale/inspector.properties">
+                data-localization-bundle="devtools/client/locales/inspector.properties">
        <div id="ruleview-toolbar-container" class="devtools-toolbar">
          <div id="ruleview-toolbar">
            <div class="devtools-searchbox has-clear-btn">
@ -102,7 +102,7 @@
      </div>

      <div id="sidebar-panel-computedview" class="devtools-monospace theme-sidebar inspector-tabpanel"
-                data-localization-bundle="devtools/locale/inspector.properties">
+                data-localization-bundle="devtools/client/locales/inspector.properties">
        <div id="computedview-toolbar" class="devtools-toolbar">
          <div class="devtools-searchbox has-clear-btn">
            <input id="computedview-searchbox"
@ -121,7 +121,7 @@
        <div id="computedview-container">
          <div id="computedview-container-focusable" tabindex="-1">
            <div id="boxmodel-wrapper" tabindex="0"
-              data-localization-bundle="devtools/locale/boxmodel.properties">
+              data-localization-bundle="devtools/client/locales/boxmodel.properties">
              <div id="boxmodel-header">
                <div id="boxmodel-expander" class="expander theme-twisty expandable" open=""></div>
                <span data-localization="content=boxmodel.title"></span>
@ -185,12 +185,12 @@
      </div>

      <div id="sidebar-panel-layoutview" class="devtools-monospace theme-sidebar inspector-tabpanel"
-           data-localization-bundle="devtools/locale/inspector.properties">
+           data-localization-bundle="devtools/client/locales/inspector.properties">
        <div id="layoutview-container"></div>
      </div>

      <div id="sidebar-panel-fontinspector" class="devtools-monospace theme-sidebar inspector-tabpanel"
-                data-localization-bundle="devtools/locale/font-inspector.properties">
+                data-localization-bundle="devtools/client/locales/font-inspector.properties">
        <div class="devtools-toolbar">
          <div class="devtools-searchbox">
            <input id="font-preview-text-input" class="devtools-textinput" type="search"
--- a/devtools/client/inspector/layout/utils/l10n.js
+++ b/devtools/client/inspector/layout/utils/l10n.js
@ -5,7 +5,7 @@
 "use strict";

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/layout.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/layout.properties");

 module.exports = {
  getStr: (...args) => L10N.getStr(...args),
--- a/devtools/client/inspector/markup/markup.js
+++ b/devtools/client/inspector/markup/markup.js
@ -26,7 +26,8 @@ const MarkupReadOnlyContainer = require("devtools/client/inspector/markup/views/
 const MarkupTextContainer = require("devtools/client/inspector/markup/views/text-container");
 const RootContainer = require("devtools/client/inspector/markup/views/root-container");

-const INSPECTOR_L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const INSPECTOR_L10N =
+      new LocalizationHelper("devtools/client/locales/inspector.properties");

 // Page size for pageup/pagedown
 const PAGE_SIZE = 10;
--- a/devtools/client/inspector/markup/test/browser_markup_links_04.js
+++ b/devtools/client/inspector/markup/test/browser_markup_links_04.js
@ -9,7 +9,7 @@

 const TEST_URL = URL_ROOT + "doc_markup_links.html";

-const TOOLBOX_L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const TOOLBOX_L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 // The test case array contains objects with the following properties:
 // - selector: css selector for the node to select in the inspector
--- a/devtools/client/inspector/markup/views/text-editor.js
+++ b/devtools/client/inspector/markup/views/text-editor.js
@ -9,7 +9,8 @@ const {editableField} = require("devtools/client/shared/inplace-editor");
 const {getCssProperties} = require("devtools/shared/fronts/css-properties");
 const {LocalizationHelper} = require("devtools/shared/l10n");

-const INSPECTOR_L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const INSPECTOR_L10N =
+      new LocalizationHelper("devtools/client/locales/inspector.properties");

 /**
 * Creates a simple text editor node, used for TEXT and COMMENT
--- a/devtools/client/inspector/rules/models/rule.js
+++ b/devtools/client/inspector/rules/models/rule.js
@ -15,7 +15,7 @@ const {promiseWarn} = require("devtools/client/inspector/shared/utils");
 const {parseDeclarations} = require("devtools/shared/css/parsing-utils");
 const Services = require("Services");

-const STYLE_INSPECTOR_PROPERTIES = "devtools-shared/locale/styleinspector.properties";
+const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties";
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);

--- a/devtools/client/inspector/rules/test/head.js
+++ b/devtools/client/inspector/rules/test/head.js
@ -21,7 +21,7 @@ const ROOT_TEST_DIR = getRootDirectory(gTestPath);
 const FRAME_SCRIPT_URL = ROOT_TEST_DIR + "doc_frame_script.js";

 const STYLE_INSPECTOR_L10N
-      = new LocalizationHelper("devtools-shared/locale/styleinspector.properties");
+      = new LocalizationHelper("devtools/shared/locales/styleinspector.properties");

 registerCleanupFunction(() => {
  Services.prefs.clearUserPref("devtools.defaultColorUnit");
--- a/devtools/client/inspector/rules/views/rule-editor.js
+++ b/devtools/client/inspector/rules/views/rule-editor.js
@ -29,7 +29,7 @@ const Services = require("Services");
 const EventEmitter = require("devtools/shared/event-emitter");
 const {Task} = require("devtools/shared/task");

-const STYLE_INSPECTOR_PROPERTIES = "devtools-shared/locale/styleinspector.properties";
+const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties";
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);

--- a/devtools/client/inspector/shared/dom-node-preview.js
+++ b/devtools/client/inspector/shared/dom-node-preview.js
@ -8,7 +8,7 @@ const EventEmitter = require("devtools/shared/event-emitter");
 const {createNode} = require("devtools/client/animationinspector/utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");

-const STRINGS_URI = "devtools/locale/inspector.properties";
+const STRINGS_URI = "devtools/client/locales/inspector.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 /**
--- a/devtools/client/inspector/shared/style-inspector-menu.js
+++ b/devtools/client/inspector/shared/style-inspector-menu.js
@ -16,7 +16,7 @@ const MenuItem = require("devtools/client/framework/menu-item");
 const overlays = require("devtools/client/inspector/shared/style-inspector-overlays");
 const clipboardHelper = require("devtools/shared/platform/clipboard");

-const STYLE_INSPECTOR_PROPERTIES = "devtools-shared/locale/styleinspector.properties";
+const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties";
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES);

--- a/devtools/client/inspector/shared/test/head.js
+++ b/devtools/client/inspector/shared/test/head.js
@ -22,7 +22,7 @@ const TEST_URL_ROOT_SSL =
 const ROOT_TEST_DIR = getRootDirectory(gTestPath);
 const FRAME_SCRIPT_URL = ROOT_TEST_DIR + "doc_frame_script.js";
 const STYLE_INSPECTOR_L10N =
-      new LocalizationHelper("devtools-shared/locale/styleinspector.properties");
+      new LocalizationHelper("devtools/shared/locales/styleinspector.properties");

 // Clean-up all prefs that might have been changed during a test run
 // (safer here because if the test fails, then the pref is never reverted)
--- a/devtools/client/inspector/test/head.js
+++ b/devtools/client/inspector/test/head.js
@ -35,7 +35,8 @@ Services.scriptloader.loadSubScript(
  this);

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const INSPECTOR_L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const INSPECTOR_L10N =
+      new LocalizationHelper("devtools/client/locales/inspector.properties");

 flags.testing = true;
 registerCleanupFunction(() => {
--- a/devtools/client/memory/utils.js
+++ b/devtools/client/memory/utils.js
@ -5,7 +5,7 @@
 const { Cu, Cc, Ci } = require("chrome");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/memory.properties";
+const STRINGS_URI = "devtools/client/locales/memory.properties";
 const L10N = exports.L10N = new LocalizationHelper(STRINGS_URI);

 const { OS } = require("resource://gre/modules/osfile.jsm");
--- a/devtools/client/netmonitor/har/har-builder.js
+++ b/devtools/client/netmonitor/har/har-builder.js
@ -13,7 +13,7 @@ const { getFormDataSections } = require("devtools/client/netmonitor/request-util
 loader.lazyRequireGetter(this, "NetworkHelper", "devtools/shared/webconsole/network-helper");

 loader.lazyGetter(this, "L10N", () => {
-  return new LocalizationHelper("devtools/locale/har.properties");
+  return new LocalizationHelper("devtools/client/locales/har.properties");
 });

 const HAR_VERSION = "1.1";
--- a/devtools/client/netmonitor/l10n.js
+++ b/devtools/client/netmonitor/l10n.js
@ -2,8 +2,8 @@

 const {LocalizationHelper} = require("devtools/shared/l10n");

-const NET_STRINGS_URI = "devtools/locale/netmonitor.properties";
-const WEBCONSOLE_STRINGS_URI = "devtools/locale/webconsole.properties";
+const NET_STRINGS_URI = "devtools/client/locales/netmonitor.properties";
+const WEBCONSOLE_STRINGS_URI = "devtools/client/locales/webconsole.properties";

 exports.L10N = new LocalizationHelper(NET_STRINGS_URI);
 exports.WEBCONSOLE_L10N = new LocalizationHelper(WEBCONSOLE_STRINGS_URI);
--- a/devtools/client/netmonitor/netmonitor.xul
+++ b/devtools/client/netmonitor/netmonitor.xul
@ -18,7 +18,7 @@
  <deck id="body"
        class="theme-sidebar"
        flex="1"
-        data-localization-bundle="devtools/locale/netmonitor.properties">
+        data-localization-bundle="devtools/client/locales/netmonitor.properties">

    <vbox id="network-inspector-view" flex="1">
      <hbox id="netmonitor-toolbar" class="devtools-toolbar">
--- a/devtools/client/performance/components/jit-optimizations-item.js
+++ b/devtools/client/performance/components/jit-optimizations-item.js
@ -4,7 +4,7 @@
 "use strict";

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/jit-optimizations.properties";
+const STRINGS_URI = "devtools/client/locales/jit-optimizations.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const {PluralForm} = require("devtools/shared/plural-form");
--- a/devtools/client/performance/components/jit-optimizations.js
+++ b/devtools/client/performance/components/jit-optimizations.js
@ -4,7 +4,7 @@
 "use strict";

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/jit-optimizations.properties";
+const STRINGS_URI = "devtools/client/locales/jit-optimizations.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const { assert } = require("devtools/shared/DevToolsUtils");
--- a/devtools/client/performance/modules/global.js
+++ b/devtools/client/performance/modules/global.js
@ -10,8 +10,8 @@ const { PrefsHelper } = require("devtools/client/shared/prefs");
 * Localization convenience methods.
 */
 exports.L10N = new MultiLocalizationHelper(
-  "devtools/locale/markers.properties",
-  "devtools/locale/performance.properties"
+  "devtools/client/locales/markers.properties",
+  "devtools/client/locales/performance.properties"
 );

 /**
--- a/devtools/client/projecteditor/lib/helpers/l10n.js
+++ b/devtools/client/projecteditor/lib/helpers/l10n.js
@ -11,7 +11,7 @@
 */

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const ITCHPAD_STRINGS_URI = "devtools/locale/projecteditor.properties";
+const ITCHPAD_STRINGS_URI = "devtools/client/locales/projecteditor.properties";
 const L10N = new LocalizationHelper(ITCHPAD_STRINGS_URI);

 function getLocalizedString(name) {
--- a/devtools/client/responsive.html/utils/l10n.js
+++ b/devtools/client/responsive.html/utils/l10n.js
@ -5,7 +5,7 @@
 "use strict";

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/responsive.properties";
+const STRINGS_URI = "devtools/client/locales/responsive.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 module.exports = {
--- a/devtools/client/responsivedesign/responsivedesign.jsm
+++ b/devtools/client/responsivedesign/responsivedesign.jsm
@ -41,7 +41,7 @@ const ROUND_RATIO = 10;

 const INPUT_PARSER = /(\d+)[^\d]+(\d+)/;

-const SHARED_L10N = new LocalizationHelper("devtools/locale/shared.properties");
+const SHARED_L10N = new LocalizationHelper("devtools/client/locales/shared.properties");

 function debug(msg) {
  // dump(`RDM UI: ${msg}\n`);
--- a/devtools/client/shadereditor/shadereditor.js
+++ b/devtools/client/shadereditor/shadereditor.js
@ -38,7 +38,7 @@ const EVENTS = {
 };
 XPCOMUtils.defineConstant(this, "EVENTS", EVENTS);

-const STRINGS_URI = "devtools/locale/shadereditor.properties";
+const STRINGS_URI = "devtools/client/locales/shadereditor.properties";
 const HIGHLIGHT_TINT = [1, 0, 0.25, 1]; // rgba
 const TYPING_MAX_DELAY = 500; // ms
 const SHADERS_AUTOGROW_ITEMS = 4;
--- a/devtools/client/shared/components/frame.js
+++ b/devtools/client/shared/components/frame.js
@ -9,8 +9,8 @@ const { getSourceNames, parseURL,
        isScratchpadScheme, getSourceMappedFile } = require("devtools/client/shared/source-utils");
 const { LocalizationHelper } = require("devtools/shared/l10n");

-const l10n = new LocalizationHelper("devtools/locale/components.properties");
-const webl10n = new LocalizationHelper("devtools/locale/webconsole.properties");
+const l10n = new LocalizationHelper("devtools/client/locales/components.properties");
+const webl10n = new LocalizationHelper("devtools/client/locales/webconsole.properties");

 module.exports = createClass({
  displayName: "Frame",
--- a/devtools/client/shared/components/notification-box.js
+++ b/devtools/client/shared/components/notification-box.js
@ -7,7 +7,7 @@
 const React = require("devtools/client/shared/vendor/react");
 const Immutable = require("devtools/client/shared/vendor/immutable");
 const { LocalizationHelper } = require("devtools/shared/l10n");
-const l10n = new LocalizationHelper("devtools/locale/components.properties");
+const l10n = new LocalizationHelper("devtools/client/locales/components.properties");

 // Shortcuts
 const { PropTypes, createClass, DOM } = React;
--- a/devtools/client/shared/components/stack-trace.js
+++ b/devtools/client/shared/components/stack-trace.js
@ -9,7 +9,7 @@ const { DOM: dom, createClass, createFactory, PropTypes } = React;
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const Frame = createFactory(require("./frame"));

-const l10n = new LocalizationHelper("devtools/locale/webconsole.properties");
+const l10n = new LocalizationHelper("devtools/client/locales/webconsole.properties");

 const AsyncFrame = createFactory(createClass({
  displayName: "AsyncFrame",
--- a/devtools/client/shared/developer-toolbar.js
+++ b/devtools/client/shared/developer-toolbar.js
@ -12,7 +12,7 @@ const { TargetFactory } = require("devtools/client/framework/target");
 const Telemetry = require("devtools/client/shared/telemetry");
 const {ViewHelpers} = require("devtools/client/shared/widgets/view-helpers");
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 const NS_XHTML = "http://www.w3.org/1999/xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
--- a/devtools/client/shared/devices.js
+++ b/devtools/client/shared/devices.js
@ -8,7 +8,7 @@ const { getJSON } = require("devtools/client/shared/getjson");

 const DEVICES_URL = "devtools.devices.url";
 const { LocalizationHelper } = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/device.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/device.properties");

 /* This is a catalog of common web-enabled devices and their properties,
 * intended for (mobile) device emulation.
--- a/devtools/client/shared/source-utils.js
+++ b/devtools/client/shared/source-utils.js
@ -5,7 +5,7 @@

 const { LocalizationHelper } = require("devtools/shared/l10n");

-const l10n = new LocalizationHelper("devtools/locale/components.properties");
+const l10n = new LocalizationHelper("devtools/client/locales/components.properties");
 const UNKNOWN_SOURCE_STRING = l10n.getStr("frame.unknownSource");

 // Character codes used in various parsing helper functions.
--- 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 {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWi
 const {getClientCssProperties} = require("devtools/shared/fronts/css-properties");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/filterwidget.properties";
+const STRINGS_URI = "devtools/client/locales/filterwidget.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const TEST_URI = `data:text/html,<div id="filter-container" />`;
--- a/devtools/client/shared/test/browser_filter-editor-06.js
+++ b/devtools/client/shared/test/browser_filter-editor-06.js
@ -9,7 +9,7 @@ const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWi
 const {getClientCssProperties} = require("devtools/shared/fronts/css-properties");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/filterwidget.properties";
+const STRINGS_URI = "devtools/client/locales/filterwidget.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const TEST_URI = `data:text/html,<div id="filter-container" />`;
--- a/devtools/client/shared/test/browser_filter-editor-07.js
+++ b/devtools/client/shared/test/browser_filter-editor-07.js
@ -9,7 +9,7 @@ const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWi
 const {getClientCssProperties} = require("devtools/shared/fronts/css-properties");

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/filterwidget.properties";
+const STRINGS_URI = "devtools/client/locales/filterwidget.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const TEST_URI = `data:text/html,<div id="filter-container" />`;
--- a/devtools/client/shared/widgets/Chart.jsm
+++ b/devtools/client/shared/widgets/Chart.jsm
@ -7,7 +7,7 @@

 const Cu = Components.utils;

-const NET_STRINGS_URI = "devtools/locale/netmonitor.properties";
+const NET_STRINGS_URI = "devtools/client/locales/netmonitor.properties";
 const SVG_NS = "http://www.w3.org/2000/svg";
 const PI = Math.PI;
 const TAU = PI * 2;
--- a/devtools/client/shared/widgets/FilterWidget.js
+++ b/devtools/client/shared/widgets/FilterWidget.js
@ -14,7 +14,7 @@ const { Cc, Ci } = require("chrome");
 const XHTML_NS = "http://www.w3.org/1999/xhtml";

 const { LocalizationHelper } = require("devtools/shared/l10n");
-const STRINGS_URI = "devtools/locale/filterwidget.properties";
+const STRINGS_URI = "devtools/client/locales/filterwidget.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 const {cssTokenizer} = require("devtools/shared/css/parsing-utils");
--- a/devtools/client/shared/widgets/LineGraphWidget.js
+++ b/devtools/client/shared/widgets/LineGraphWidget.js
@ -6,7 +6,7 @@ const { AbstractCanvasGraph, CanvasGraphUtils } = require("devtools/client/share
 const { LocalizationHelper } = require("devtools/shared/l10n");

 const HTML_NS = "http://www.w3.org/1999/xhtml";
-const L10N = new LocalizationHelper("devtools/locale/graphs.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/graphs.properties");

 // Line graph constants.

--- a/devtools/client/shared/widgets/MdnDocsWidget.js
+++ b/devtools/client/shared/widgets/MdnDocsWidget.js
@ -31,7 +31,7 @@ const EventEmitter = require("devtools/shared/event-emitter");
 const {gDevTools} = require("devtools/client/framework/devtools");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

 const XHTML_NS = "http://www.w3.org/1999/xhtml";

--- a/devtools/client/shared/widgets/SideMenuWidget.jsm
+++ b/devtools/client/shared/widgets/SideMenuWidget.jsm
@ -8,7 +8,7 @@
 const Ci = Components.interfaces;
 const Cu = Components.utils;

-const SHARED_STRINGS_URI = "devtools/locale/shared.properties";
+const SHARED_STRINGS_URI = "devtools/client/locales/shared.properties";

 const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
 const EventEmitter = require("devtools/shared/event-emitter");
--- 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 = "devtools/locale/debugger.properties";
+const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties";
 const LAZY_EMPTY_DELAY = 150; // ms
 const SCROLL_PAGE_SIZE_DEFAULT = 0;
 const PAGE_SIZE_SCROLL_HEIGHT_RATIO = 100;
--- a/devtools/client/shared/widgets/VariablesViewController.jsm
+++ b/devtools/client/shared/widgets/VariablesViewController.jsm
@ -32,7 +32,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "console",

 const MAX_LONG_STRING_LENGTH = 200000;
 const MAX_PROPERTY_ITEMS = 2000;
-const DBG_STRINGS_URI = "devtools/locale/debugger.properties";
+const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties";

 this.EXPORTED_SYMBOLS = ["VariablesViewController", "StackFrameUtils"];

--- a/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
+++ b/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
@ -7,7 +7,7 @@
 "use strict";

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

 const Editor = require("devtools/client/sourceeditor/editor");
 const beautify = require("devtools/shared/jsbeautify/beautify");
--- a/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
+++ b/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
@ -7,7 +7,7 @@
 "use strict";

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

 const XHTML_NS = "http://www.w3.org/1999/xhtml";

--- a/devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js
+++ b/devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js
@ -9,7 +9,7 @@ const {colorUtils} = require("devtools/shared/css/color");
 const {Spectrum} = require("devtools/client/shared/widgets/Spectrum");
 const SwatchBasedEditorTooltip = require("devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip");
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/inspector.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");

 const Heritage = require("sdk/core/heritage");

--- a/devtools/client/shared/zoom-keys.js
+++ b/devtools/client/shared/zoom-keys.js
@ -13,7 +13,7 @@ const MIN_ZOOM = 0.5;
 const MAX_ZOOM = 2;

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");

 /**
 * Register generic keys to control zoom level of the given document.
--- a/devtools/client/sourceeditor/editor.js
+++ b/devtools/client/sourceeditor/editor.js
@ -37,7 +37,7 @@ const { getClientCssProperties } = require("devtools/shared/fronts/css-propertie
 const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts");

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/sourceeditor.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/sourceeditor.properties");

 const { OS } = Services.appinfo;

--- a/devtools/client/sourceeditor/test/browser_editor_find_again.js
+++ b/devtools/client/sourceeditor/test/browser_editor_find_again.js
@ -6,7 +6,7 @@
 "use strict";

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/sourceeditor.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/sourceeditor.properties");

 const { OS } = Services.appinfo;

--- a/devtools/client/storage/ui.js
+++ b/devtools/client/storage/ui.js
@ -24,7 +24,7 @@ loader.lazyImporter(this, "VariablesView",
 /**
 * Localization convenience methods.
 */
-const STORAGE_STRINGS = "devtools/locale/storage.properties";
+const STORAGE_STRINGS = "devtools/client/locales/storage.properties";
 const L10N = new LocalizationHelper(STORAGE_STRINGS);

 const GENERIC_VARIABLES_VIEW_SETTINGS = {
--- a/devtools/client/webaudioeditor/includes.js
+++ b/devtools/client/webaudioeditor/includes.js
@ -17,7 +17,7 @@ const { gDevTools } = require("devtools/client/framework/devtools");
 const { LocalizationHelper } = require("devtools/shared/l10n");
 const { ViewHelpers } = require("devtools/client/shared/widgets/view-helpers");

-const STRINGS_URI = "devtools/locale/webaudioeditor.properties";
+const STRINGS_URI = "devtools/client/locales/webaudioeditor.properties";
 const L10N = new LocalizationHelper(STRINGS_URI);

 loader.lazyRequireGetter(this, "LineGraphWidget",
--- a/devtools/client/webconsole/console-output.js
+++ b/devtools/client/webconsole/console-output.js
@ -19,7 +19,7 @@ loader.lazyRequireGetter(this, "ObjectClient", "devtools/shared/client/main", tr
 const { extend } = require("sdk/core/heritage");
 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 = "devtools/locale/webconsole.properties";
+const STRINGS_URI = "devtools/client/locales/webconsole.properties";

 const WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
 const { getSourceNames } = require("devtools/client/shared/source-utils");
--- a/devtools/client/webconsole/hudservice.js
+++ b/devtools/client/webconsole/hudservice.js
@ -22,7 +22,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main",
 loader.lazyRequireGetter(this, "showDoorhanger", "devtools/client/shared/doorhanger", true);
 loader.lazyRequireGetter(this, "viewSource", "devtools/client/shared/view-source");

-const STRINGS_URI = "devtools/locale/webconsole.properties";
+const STRINGS_URI = "devtools/client/locales/webconsole.properties";
 var l10n = new WebConsoleUtils.L10n(STRINGS_URI);

 const BROWSER_CONSOLE_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
--- a/devtools/client/webconsole/jsterm.js
+++ b/devtools/client/webconsole/jsterm.js
@ -27,7 +27,7 @@ loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/wi
 loader.lazyImporter(this, "VariablesViewController", "resource://devtools/client/shared/widgets/VariablesViewController.jsm");
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);

-const STRINGS_URI = "devtools/locale/webconsole.properties";
+const STRINGS_URI = "devtools/client/locales/webconsole.properties";
 var l10n = new WebConsoleUtils.L10n(STRINGS_URI);

 // Constants used for defining the direction of JSTerm input history navigation.
--- a/devtools/client/webconsole/net/main.js
+++ b/devtools/client/webconsole/net/main.js
@ -20,7 +20,7 @@ const { loadSheet } = require("sdk/stylesheet/utils");

 // Localization
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools/locale/netmonitor.properties");
+const L10N = new LocalizationHelper("devtools/client/locales/netmonitor.properties");

 // Stylesheets
 var styleSheets = [
--- a/devtools/client/webconsole/new-console-output/test/mochitest/head.js
+++ b/devtools/client/webconsole/new-console-output/test/mochitest/head.js
@ -13,7 +13,7 @@ Services.scriptloader.loadSubScript(
  this);

 var {Utils: WebConsoleUtils} = require("devtools/client/webconsole/utils");
-const WEBCONSOLE_STRINGS_URI = "devtools/locale/webconsole.properties";
+const WEBCONSOLE_STRINGS_URI = "devtools/client/locales/webconsole.properties";
 var WCUL10n = new WebConsoleUtils.L10n(WEBCONSOLE_STRINGS_URI);

 Services.prefs.setBoolPref("devtools.webconsole.new-frontend-enabled", true);
--- a/devtools/client/webconsole/new-console-output/utils/messages.js
+++ b/devtools/client/webconsole/new-console-output/utils/messages.js
@ -7,7 +7,7 @@
 "use strict";

 const WebConsoleUtils = require("devtools/client/webconsole/utils").Utils;
-const STRINGS_URI = "devtools/locale/webconsole.properties";
+const STRINGS_URI = "devtools/client/locales/webconsole.properties";
 const l10n = new WebConsoleUtils.L10n(STRINGS_URI);

 const {
--- a/devtools/client/webconsole/test/head.js
+++ b/devtools/client/webconsole/test/head.js
@ -37,7 +37,7 @@ const SEVERITY_LOG = 3;
 // The indent of a console group in pixels.
 const GROUP_INDENT = 12;

-const WEBCONSOLE_STRINGS_URI = "devtools/locale/webconsole.properties";
+const WEBCONSOLE_STRINGS_URI = "devtools/client/locales/webconsole.properties";
 var WCUL10n = new WebConsoleUtils.L10n(WEBCONSOLE_STRINGS_URI);

 const DOCS_GA_PARAMS = "?utm_source=mozilla" +
--- a/devtools/client/webconsole/webconsole.js
+++ b/devtools/client/webconsole/webconsole.js
@ -39,7 +39,7 @@ loader.lazyRequireGetter(this, "KeyShortcuts", "devtools/client/shared/key-short
 loader.lazyRequireGetter(this, "ZoomKeys", "devtools/client/shared/zoom-keys");

 const {PluralForm} = require("devtools/shared/plural-form");
-const STRINGS_URI = "devtools/locale/webconsole.properties";
+const STRINGS_URI = "devtools/client/locales/webconsole.properties";
 var l10n = new WebConsoleUtils.L10n(STRINGS_URI);

 const XHTML_NS = "http://www.w3.org/1999/xhtml";
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@ -52,6 +52,13 @@ BuiltinProvider.prototype = {
      // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
      // Allow access to xpcshell test items from the loader.
      "xpcshell-test": "resource://test",
+
+      // ⚠ DISCUSSION ON DEV-DEVELOPER-TOOLS REQUIRED BEFORE MODIFYING ⚠
+      // Allow access to locale data using paths closer to what is
+      // used in the source tree.
+      "devtools/client/locales": "chrome://devtools/locale",
+      "devtools/shared/locales": "chrome://devtools-shared/locale",
+      "toolkit/locales": "chrome://global/locale",
    };
    // When creating a Loader invisible to the Debugger, we have to ensure
    // using only modules and not depend on any JSM. As everything that is
--- a/devtools/shared/fronts/csscoverage.js
+++ b/devtools/shared/fronts/csscoverage.js
@ -8,7 +8,7 @@ const protocol = require("devtools/shared/protocol");
 const {custom} = protocol;

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools-shared/locale/csscoverage.properties");
+const L10N = new LocalizationHelper("devtools/shared/locales/csscoverage.properties");

 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);

--- a/devtools/shared/gcli/commands/highlight.js
+++ b/devtools/shared/gcli/commands/highlight.js
@ -13,7 +13,7 @@ const {

 const {PluralForm} = require("devtools/shared/plural-form");
 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools-shared/locale/gclicommands.properties");
+const L10N = new LocalizationHelper("devtools/shared/locales/gclicommands.properties");

 // How many maximum nodes can be highlighted in parallel
 const MAX_HIGHLIGHTED_ELEMENTS = 100;
--- a/devtools/shared/gcli/source/lib/gcli/l10n.js
+++ b/devtools/shared/gcli/source/lib/gcli/l10n.js
@ -23,7 +23,7 @@ var prefSvc = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefServ
 var prefBranch = prefSvc.getBranch(null).QueryInterface(Ci.nsIPrefBranch);

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools-shared/locale/gclicommands.properties");
+const L10N = new LocalizationHelper("devtools/shared/locales/gclicommands.properties");

 /**
 * Lookup a string in the GCLI string bundle
--- a/devtools/shared/gcli/source/lib/gcli/util/l10n.js
+++ b/devtools/shared/gcli/source/lib/gcli/util/l10n.js
@ -17,7 +17,7 @@
 "use strict";

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools-shared/locale/gcli.properties");
+const L10N = new LocalizationHelper("devtools/shared/locales/gcli.properties");

 /*
 * Not supported when embedded - we"re doing things the Mozilla way not the
--- a/devtools/shared/inspector/css-logic.js
+++ b/devtools/shared/inspector/css-logic.js
@ -44,7 +44,7 @@ const Services = require("Services");
 const CSSLexer = require("devtools/shared/css/lexer");
 const {LocalizationHelper} = require("devtools/shared/l10n");
 const styleInspectorL10N =
-  new LocalizationHelper("devtools-shared/locale/styleinspector.properties");
+  new LocalizationHelper("devtools/shared/locales/styleinspector.properties");

 /**
 * Special values for filter, in addition to an href these values can be used
--- a/devtools/shared/l10n.js
+++ b/devtools/shared/l10n.js
@ -26,11 +26,11 @@ const propertiesMap = {};
 // file.  In the webpack case this results in just the locale property
 // files being included in the pack; and in the devtools case this is
 // a wordy no-op.
-const reqShared = require.context("raw!devtools-shared/locale/",
+const reqShared = require.context("raw!devtools/shared/locales/",
                                  true, /^.*\.properties$/);
-const reqClient = require.context("raw!devtools/locale/",
+const reqClient = require.context("raw!devtools/client/locales/",
                                  true, /^.*\.properties$/);
-const reqGlobal = require.context("raw!global/locale/",
+const reqGlobal = require.context("raw!toolkit/locales/",
                                  true, /^.*\.properties$/);

 /**
@ -44,17 +44,17 @@ const reqGlobal = require.context("raw!global/locale/",
 function getProperties(url) {
  if (!propertiesMap[url]) {
    // See the comment above about webpack and require contexts.  Here
-    // we take an input like "devtools-shared/locale/debugger.properties"
+    // we take an input like "devtools/shared/locales/debugger.properties"
    // and decide which context require function to use.  Despite the
    // string processing here, in the end a string identical to |url|
    // ends up being passed to "require".
    let index = url.lastIndexOf("/");
-    // Turn "mumble/locale/resource.properties" => "./resource.properties".
+    // Turn "mumble/locales/resource.properties" => "./resource.properties".
    let baseName = "." + url.substr(index);
    let reqFn;
-    if (/^global/.test(url)) {
+    if (/^toolkit/.test(url)) {
      reqFn = reqGlobal;
-    } else if (/^devtools-shared/.test(url)) {
+    } else if (/^devtools\/shared/.test(url)) {
      reqFn = reqShared;
    } else {
      reqFn = reqClient;
@ -212,7 +212,7 @@ function localizeMarkup(root) {
  }
 }

-const sharedL10N = new LocalizationHelper("devtools-shared/locale/shared.properties");
+const sharedL10N = new LocalizationHelper("devtools/shared/locales/shared.properties");

 /**
 * A helper for having the same interface as LocalizationHelper, but for more
--- a/devtools/shared/loader-plugin-raw.jsm
+++ b/devtools/shared/loader-plugin-raw.jsm
@ -14,11 +14,6 @@ const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
 * https://github.com/webpack/raw-loader.
 */
 this.requireRawId = function (id, require) {
-  // Add the chrome:// protocol for properties files if missing (see Bug 1294220)
-  if (id.endsWith(".properties") && !id.startsWith("raw!chrome://")) {
-    id = id.replace("raw!", "raw!chrome://");
-  }
-
  let uri = require.resolve(id.slice(4));
  // If the original string did not end with ".js", then
  // require.resolve might have added the suffix.  We don't want to
--- a/devtools/shared/plural-form.js
+++ b/devtools/shared/plural-form.js
@ -40,7 +40,7 @@
 */

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("global/locale/intl.properties");
+const L10N = new LocalizationHelper("toolkit/locales/intl.properties");

 // These are the available plural functions that give the appropriate index
 // based on the plural rule number specified. The first element is the number
--- 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);

 const {LocalizationHelper} = require("devtools/shared/l10n");
-const L10N = new LocalizationHelper("devtools-shared/locale/debugger.properties");
+const L10N = new LocalizationHelper("devtools/shared/locales/debugger.properties");

 var Client = exports.Client = {};
 var Server = exports.Server = {};
--- a/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js
+++ b/devtools/shared/tests/browser/browser_l10n_localizeMarkup.js
@ -9,8 +9,8 @@ const { localizeMarkup, LocalizationHelper } = require("devtools/shared/l10n");

 add_task(function* () {
  info("Check that the strings used for this test are still valid");
-  let STARTUP_L10N = new LocalizationHelper("devtools/locale/startup.properties");
-  let TOOLBOX_L10N = new LocalizationHelper("devtools/locale/toolbox.properties");
+  let STARTUP_L10N = new LocalizationHelper("devtools/client/locales/startup.properties");
+  let TOOLBOX_L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties");
  let str1 = STARTUP_L10N.getStr("inspector.label");
  let str2 = STARTUP_L10N.getStr("inspector.commandkey");
  let str3 = TOOLBOX_L10N.getStr("toolbox.defaultTitle");
@ -19,7 +19,7 @@ add_task(function* () {
  info("Create the test markup");
  let div = document.createElement("div");
  div.innerHTML =
-  `<div data-localization-bundle="devtools/locale/startup.properties">
+  `<div data-localization-bundle="devtools/client/locales/startup.properties">
     <div id="d0" data-localization="content=inspector.someInvalidKey"></div>
     <div id="d1" data-localization="content=inspector.label">Text will disappear</div>
     <div id="d2" data-localization="content=inspector.label;title=inspector.commandkey">
@ -28,7 +28,7 @@ add_task(function* () {
     <div id="d3" data-localization="content=inspector.label;
                                     title=inspector.commandkey"></div>
     <div id="d4" data-localization="aria-label=inspector.label">Some content</div>
-     <div data-localization-bundle="devtools/locale/toolbox.properties">
+     <div data-localization-bundle="devtools/client/locales/toolbox.properties">
       <div id="d5" data-localization="content=toolbox.defaultTitle"></div>
     </div>
   </div>
--- a/devtools/shared/tests/unit/test_require_raw.js
+++ b/devtools/shared/tests/unit/test_require_raw.js
@ -10,7 +10,7 @@ function run_test() {
  let variableFileContents = require("raw!devtools/client/themes/variables.css");
  ok(variableFileContents.length > 0, "raw browserRequire worked");

-  let propertiesFileContents = require("raw!devtools/locale/shared.properties");
+  let propertiesFileContents = require("raw!devtools/client/locales/shared.properties");
  ok(propertiesFileContents.length > 0, "unprefixed properties raw require worked");

  let chromePropertiesFileContents =