Bug 1250120 - Change name to Responsive Design Mode in Tools -> Web Developer menu r=jryans
authorBryan Clark <clarkbw@mozilla.com>
Mon, 28 Mar 2016 20:46:18 -0700
changeset 290794 1e908cdc6c424be15d00ddefa9667f9b07531ccb
parent 290793 e56e76ec40cb0e8f11278a5e61414972b771e9fd
child 290795 7720685c0eba1b49380b66419c48ecbf7d1a60d5
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjryans
bugs1250120
milestone48.0a1
Bug 1250120 - Change name to Responsive Design Mode in Tools -> Web Developer menu r=jryans
browser/base/content/browser-menubar.inc
browser/base/content/browser-sets.inc
browser/locales/en-US/chrome/browser/browser.dtd
devtools/client/locales/en-US/responsiveUI.properties
devtools/client/responsivedesign/responsivedesign.jsm
docshell/base/nsIDocShell.idl
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -536,17 +536,17 @@
                   <menuitem id="menu_browserContentToolbox"
                             observes="devtoolsMenuBroadcaster_BrowserContentToolbox"
                             accesskey="&browserContentToolboxMenu.accesskey;" />
                   <menuitem id="menu_browserConsole"
                             observes="devtoolsMenuBroadcaster_BrowserConsole"
                             accesskey="&browserConsoleCmd.accesskey;"/>
                   <menuitem id="menu_responsiveUI"
                             observes="devtoolsMenuBroadcaster_ResponsiveUI"
-                            accesskey="&responsiveDesignTool.accesskey;"/>
+                            accesskey="&responsiveDesignMode.accesskey;"/>
                   <menuitem id="menu_eyedropper"
                             observes="devtoolsMenuBroadcaster_Eyedropper"
                             accesskey="&eyedropper.accesskey;"/>
                   <menuitem id="menu_scratchpad"
                             observes="devtoolsMenuBroadcaster_Scratchpad"
                             accesskey="&scratchpad.accesskey;"/>
                   <menuitem id="menu_pageSource"
                             observes="devtoolsMenuBroadcaster_PageSource"
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -222,17 +222,17 @@
                  label="&browserConsoleCmd.label;"
                  key="key_browserConsole"
                  command="Tools:BrowserConsole"/>
     <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
                  label="&scratchpad.label;"
                  command="Tools:Scratchpad"
                  key="key_scratchpad"/>
     <broadcaster id="devtoolsMenuBroadcaster_ResponsiveUI"
-                 label="&responsiveDesignTool.label;"
+                 label="&responsiveDesignMode.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:ResponsiveUI"
                  key="key_responsiveUI"/>
     <broadcaster id="devtoolsMenuBroadcaster_Eyedropper"
                  label="&eyedropper.label;"
                  type="checkbox" autocheck="false"
                  command="Tools:Eyedropper"/>
     <broadcaster id="devtoolsMenuBroadcaster_PageSource"
@@ -299,17 +299,17 @@
     <key id="key_openDownloads" key="&downloads.commandkey;" command="Tools:Downloads" modifiers="accel"/>
 #endif
     <key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/>
     <key id="key_devToolboxMenuItemF12" keycode="&devToolsCmd.keycode;" keytext="&devToolsCmd.keytext;" command="Tools:DevToolbox"/>
     <key id="key_browserConsole" key="&browserConsoleCmd.commandkey;" command="Tools:BrowserConsole" modifiers="accel,shift"/>
     <key id="key_browserToolbox" key="&browserToolboxCmd.commandkey;" command="Tools:BrowserToolbox" modifiers="accel,alt,shift"/>
     <key id="key_devToolbar" keycode="&devToolbar.keycode;" modifiers="shift"
          keytext="&devToolbar.keytext;" command="Tools:DevToolbarFocus"/>
-    <key id="key_responsiveUI" key="&responsiveDesignTool.commandkey;" command="Tools:ResponsiveUI"
+    <key id="key_responsiveUI" key="&responsiveDesignMode.commandkey;" command="Tools:ResponsiveUI"
 #ifdef XP_MACOSX
         modifiers="accel,alt"
 #else
         modifiers="accel,shift"
 #endif
     />
     <key id="key_webide" keycode="&webide.keycode;" command="Tools:WebIDE"
          modifiers="shift" keytext="&webide.keytext;"/>
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -270,19 +270,19 @@ These should match what Safari and other
 
 <!ENTITY browserConsoleCmd.label      "Browser Console">
 <!ENTITY browserConsoleCmd.commandkey "j">
 <!ENTITY browserConsoleCmd.accesskey  "B">
 
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 
-<!ENTITY responsiveDesignTool.label   "Responsive Design View">
-<!ENTITY responsiveDesignTool.accesskey "R">
-<!ENTITY responsiveDesignTool.commandkey "M">
+<!ENTITY responsiveDesignMode.label   "Responsive Design Mode">
+<!ENTITY responsiveDesignMode.accesskey "R">
+<!ENTITY responsiveDesignMode.commandkey "M">
 
 <!ENTITY eyedropper.label   "Eyedropper">
 <!ENTITY eyedropper.accesskey "Y">
 
 <!-- LOCALIZATION NOTE (scratchpad.label): This menu item label appears
   -  in the Tools menu. See bug 653093.
   -  The Scratchpad is intended to provide a simple text editor for creating
   -  and evaluating bits of JavaScript code for the purposes of function
--- a/devtools/client/locales/en-US/responsiveUI.properties
+++ b/devtools/client/locales/en-US/responsiveUI.properties
@@ -40,22 +40,22 @@ responsiveUI.removePreset=Remove Preset
 # current size of the page. For example: "400x600".
 responsiveUI.customResolution=%S (custom)
 
 # LOCALIZATION NOTE  (responsiveUI.namedResolution): label of custom items with a name
 # in the menulist of the toolbar.
 # For example: "320x480 (phone)".
 responsiveUI.namedResolution=%S (%S)
 
-# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle): prompt title when asking
+# LOCALIZATION NOTE  (responsiveUI.customNamePromptTitle1): prompt title when asking
 # the user to specify a name for a new custom preset.
-responsiveUI.customNamePromptTitle=Responsive Design View
+responsiveUI.customNamePromptTitle1=Responsive Design Mode
 
-# LOCALIZATION NOTE (responsiveUI.close): tooltip text of the close button.
-responsiveUI.close=Leave Responsive Design View
+# LOCALIZATION NOTE (responsiveUI.close1): tooltip text of the close button.
+responsiveUI.close1=Leave Responsive Design Mode
 
 # LOCALIZATION NOTE  (responsiveUI.customNamePromptMsg): prompt message when asking
 # the user to specify a name for a new custom preset.
 responsiveUI.customNamePromptMsg=Give a name to the %Sx%S preset
 
 # LOCALIZATION NOTE (responsiveUI.resizer): tooltip showed when
 # overring the resizers.
 responsiveUI.resizerTooltip=Use the Control key for more precision. Use Shift key for rounded sizes.
--- a/devtools/client/responsivedesign/responsivedesign.jsm
+++ b/devtools/client/responsivedesign/responsivedesign.jsm
@@ -455,17 +455,17 @@ ResponsiveUI.prototype = {
   /**
    * Build the toolbar and the resizers.
    *
    * <vbox class="browserContainer"> From tabbrowser.xml
    *  <toolbar class="devtools-responsiveui-toolbar">
    *    <menulist class="devtools-responsiveui-menulist"/> // presets
    *    <toolbarbutton tabindex="0" class="devtools-responsiveui-toolbarbutton" tooltiptext="rotate"/> // rotate
    *    <toolbarbutton tabindex="0" class="devtools-responsiveui-toolbarbutton" tooltiptext="screenshot"/> // screenshot
-   *    <toolbarbutton tabindex="0" class="devtools-responsiveui-toolbarbutton" tooltiptext="Leave Responsive Design View"/> // close
+   *    <toolbarbutton tabindex="0" class="devtools-responsiveui-toolbarbutton" tooltiptext="Leave Responsive Design Mode"/> // close
    *  </toolbar>
    *  <stack class="browserStack"> From tabbrowser.xml
    *    <browser/>
    *    <box class="devtools-responsiveui-resizehandle" bottom="0" right="0"/>
    *    <box class="devtools-responsiveui-resizebarV" top="0" right="0"/>
    *    <box class="devtools-responsiveui-resizebarH" bottom="0" left="0"/>
    *    // Additional button in FxOS mode:
    *    <button class="devtools-responsiveui-sleep-button" />
@@ -520,17 +520,17 @@ ResponsiveUI.prototype = {
     this.screenshotbutton.setAttribute("tabindex", "0");
     this.screenshotbutton.setAttribute("tooltiptext", this.strings.GetStringFromName("responsiveUI.screenshot"));
     this.screenshotbutton.className = "devtools-responsiveui-toolbarbutton devtools-responsiveui-screenshot";
     this.screenshotbutton.addEventListener("command", this.bound_screenshot, true);
 
     this.closebutton = this.chromeDoc.createElement("toolbarbutton");
     this.closebutton.setAttribute("tabindex", "0");
     this.closebutton.className = "devtools-responsiveui-toolbarbutton devtools-responsiveui-close";
-    this.closebutton.setAttribute("tooltiptext", this.strings.GetStringFromName("responsiveUI.close"));
+    this.closebutton.setAttribute("tooltiptext", this.strings.GetStringFromName("responsiveUI.close1"));
     this.closebutton.addEventListener("command", this.bound_close, true);
 
     this.toolbar.appendChild(this.closebutton);
     this.toolbar.appendChild(this.menulist);
     this.toolbar.appendChild(this.rotatebutton);
 
     this.touchbutton = this.chromeDoc.createElement("toolbarbutton");
     this.touchbutton.setAttribute("tabindex", "0");
@@ -757,17 +757,17 @@ ResponsiveUI.prototype = {
   /**
    * Add a preset to the list and the memory
    */
   addPreset: function RUI_addPreset() {
     let w = this.customPreset.width;
     let h = this.customPreset.height;
     let newName = {};
 
-    let title = this.strings.GetStringFromName("responsiveUI.customNamePromptTitle");
+    let title = this.strings.GetStringFromName("responsiveUI.customNamePromptTitle1");
     let message = this.strings.formatStringFromName("responsiveUI.customNamePromptMsg", [w, h], 2);
     let promptOk = Services.prompt.prompt(null, title, message, newName, null, {});
 
     if (!promptOk) {
       // Prompt has been cancelled
       this.menulist.selectedItem = this.selectedItem;
       return;
     }
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -1027,17 +1027,17 @@ interface nsIDocShell : nsIDocShellTreeI
  * Get the script global for the document in this docshell.
 */
   [noscript,notxpcom,nostdcall] nsIScriptGlobalObject GetScriptGlobalObject();
 
   /**
    * If deviceSizeIsPageSize is set to true, device-width/height media queries
    * will be calculated from the page size, not the device size.
    *
-   * Used by the Responsive Design View and B2G Simulator.
+   * Used by the Responsive Design Mode and B2G Simulator.
    *
    * Default is False.
    * Default value can be overriden with
    * docshell.device_size_is_page_size pref.
    */
   [infallible] attribute boolean deviceSizeIsPageSize;
 
   /**