From c6b579e1e139bdc9a07a8ea1195cdd57d46a55d9 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Fri, 17 Sep 2010 10:48:13 +1200
Subject: [PATCH] Bug 591876 - Change the tooltip of utilities button.
 r=dtownsend, a=dtownsend

---
 .../locales/en-US/chrome/mozapps/extensions/extensions.dtd | 3 +--
 toolkit/mozapps/extensions/content/extensions.xul          | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index c2d26edc2bc0..7612984d965e 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -9,6 +9,7 @@
 <!ENTITY listEmpty.button.label               "Learn more about add-ons">
 <!ENTITY installAddonFromFile.label           "Install Add-on From File…">
 <!ENTITY installAddonFromFile.accesskey       "I">
+<!ENTITY toolsMenu.tooltip                    "Tools for all add-ons">
 
 <!ENTITY cmd.back.tooltip                     "Go back one page">
 <!ENTITY cmd.forward.tooltip                  "Go forward one page">
@@ -32,8 +33,6 @@
 <!ENTITY view.plugins.label                   "Plugins">
 <!ENTITY view.recentUpdates.label             "Recent Updates">
 <!ENTITY view.availableUpdates.label          "Available Updates">
-<!ENTITY view.utilites.preferences.tooltip    "Options for all add-ons">
-<!ENTITY view.utilites.preferencesUnix.tooltip "Preferences for all add-ons">
 
 <!-- addon updates -->
 <!ENTITY updates.checkForUpdates.label        "Check for Updates">
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 83cf8b575a4d..13cd712270ad 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -163,12 +163,7 @@
               label="&updates.restart.label;"
               command="cmd_restartApp"/>
     </hbox>
-    <button id="header-utils-btn" type="menu"
-#ifdef XP_WIN
-            tooltiptext="&view.utilites.preferences.tooltip;">
-#else
-            tooltiptext="&view.utilites.preferencesUnix.tooltip;">
-#endif
+    <button id="header-utils-btn" type="menu" tooltiptext="&toolsMenu.tooltip;">
       <menupopup id="utils-menu">
         <menuitem id="utils-updateNow"
                   label="&updates.checkForUpdates.label;"