From 88e60e61cdb2a7ad9a8ab313ce5def231f76b9ee Mon Sep 17 00:00:00 2001
From: "flamingice@sourmilk.net" <none@none>
Date: Tue, 7 Aug 2007 10:24:55 -0700
Subject: [PATCH] =?UTF-8?q?Bug=20386670,=20Restart=20button=20tooltip=20in?=
 =?UTF-8?q?=20add-ons=20manager=20should=20be=20changed,=20Patch=20by=20D?=
 =?UTF-8?q?=C3=A3o=20Gottwald,=20r=3Dmconnor,=20ui-r=3Dbeltzner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index 7b4e04b25e3..6ca3a82ed2f 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -28,9 +28,9 @@
 <!ENTITY cmd.installUpdatesAll.label      "Install Updates">
 <!ENTITY cmd.installUpdatesAll.accesskey  "I">
 <!ENTITY cmd.installUpdatesAll.tooltip    "Installs the selected updates">
-<!ENTITY cmd.restartApp.label             "Restart &brandShortName;">
-<!ENTITY cmd.restartApp.accesskey         "R">
-<!ENTITY cmd.restartApp.tooltip           "Restarts &brandShortName; to finish the installation">
+<!ENTITY cmd.restartApp2.label            "Restart &brandShortName;">
+<!ENTITY cmd.restartApp2.accesskey        "R">
+<!ENTITY cmd.restartApp2.tooltip          "Restart &brandShortName; to apply changes">
 <!ENTITY cmd.skip.label                   "Skip">
 <!ENTITY cmd.skip.accesskey               "S">
 <!ENTITY cmd.skip.tooltip                 "Skip these updates">
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index c4831b296d1..e0d1ae7d41e 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -218,9 +218,9 @@
               accesskey="&cmd.installUpdatesAll.accesskey;"
               tooltiptext="&cmd.installUpdatesAll.tooltip;"
               command="cmd_installUpdatesAll"/>
-      <button id="restartAppButton" label="&cmd.restartApp.label;"
-              accesskey="&cmd.restartApp.accesskey;"
-              tooltiptext="&cmd.restartApp.tooltip;"
+      <button id="restartAppButton" label="&cmd.restartApp2.label;"
+              accesskey="&cmd.restartApp2.accesskey;"
+              tooltiptext="&cmd.restartApp2.tooltip;"
               command="cmd_restartApp"/>
       <button id="continueDialogButton" label="&cmd.continue.label;"
               accesskey="&cmd.continue.accesskey;"