Bug 1006490: revert changes made to the print button tooltip in bug 979479. r=dao.
authorMike de Boer <mdeboer@mozilla.com>
Thu, 08 May 2014 14:35:43 +0200
changeset 182213 ccdebc4f92c9a2f8c18639f8f43bf9ee7537cb46
parent 182212 a4351383899c297e3dc8d55520fa1d85b41c7dd0
child 182214 e0e28f569c29485494034088d909c6f412d9da19
push id43233
push userryanvm@gmail.com
push dateThu, 08 May 2014 20:05:34 +0000
treeherdermozilla-inbound@c761bfc0fd2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1006490, 979479
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1006490: revert changes made to the print button tooltip in bug 979479. r=dao.
browser/base/content/browser.xul
browser/locales/en-US/chrome/browser/browser.dtd
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1002,20 +1002,22 @@
     <toolbarpalette id="BrowserToolbarPalette">
 
 # Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding
 # or removing default items with the toolbarbutton-1 class.
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 #ifdef XP_MACOSX
                      command="cmd_print"
+                     tooltip="dynamic-shortcut-tooltip"
 #else
                      command="cmd_printPreview"
+                     tooltiptext="&printButton.tooltip;"
 #endif
-                     tooltip="dynamic-shortcut-tooltip" label="&printButton.label;"/>
+                     label="&printButton.label;"/>
 
 
       <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&newNavigatorCmd.label;"
                      command="key_newNavigator"
                      tooltip="dynamic-shortcut-tooltip"
                      ondrop="newWindowButtonObserver.onDrop(event)"
                      ondragover="newWindowButtonObserver.onDragOver(event)"
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -160,16 +160,17 @@ These should match what Safari and other
 <!ENTITY reloadCmd.accesskey          "R">
 <!ENTITY reloadButton.tooltip         "Reload current page">
 <!ENTITY stopCmd.label                "Stop">
 <!ENTITY stopCmd.accesskey            "S">
 <!ENTITY stopCmd.macCommandKey        ".">
 <!ENTITY stopButton.tooltip           "Stop loading this page">
 <!ENTITY goEndCap.tooltip             "Go to the address in the Location Bar">
 <!ENTITY printButton.label            "Print">
+<!ENTITY printButton.tooltip          "Print this page">
 
 <!ENTITY locationItem.title           "Location">
 <!ENTITY searchItem.title             "Search">
 
 <!-- Toolbar items --> 
 <!ENTITY homeButton.label             "Home">
 
 <!ENTITY tabGroupsButton.label        "Tab Groups">