From 3dc406fa8461e6a193aa5191d5a47c1f298dc6c3 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Fri, 9 Mar 2007 19:41:50 +0000
Subject: [PATCH] Port Seth's fix for Bug #364599 to thunderbird. sr=mscott

---
 mail/locales/Makefile.in                          | 2 +-
 mail/locales/en-US/chrome/messenger/messenger.dtd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in
index 739e8439677..366bd35dec0 100644
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -88,7 +88,7 @@ README_FILES = \
 endif
 
 libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES))
-	$(INSTALL) $^ $(FINAL_TARGET)
+	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 
 vpath %.rdf $(topsrcdir)/mailnews/base/ispdata
 
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index 435985b331a..e1b0d0c4da9 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -429,12 +429,12 @@
 <!ENTITY helpMenuWin.accesskey    "H">
 <!ENTITY releaseCmd.label "Release Notes">
 <!ENTITY releaseCmd.accesskey "R"> 
-<!ENTITY hintsAndTips.label "&brandFullName; Help">
+<!ENTITY hintsAndTips1.label "&brandShortName; Help">
 <!ENTITY hintsAndTipsMac.commandkey "?">
 <!ENTITY hintsAndTips.accesskey "h">
 <!ENTITY updateCmd.label      "Check for Updates...">
 <!ENTITY updateCmd.accesskey  "o">
-<!ENTITY aboutCmd.label "About &brandFullName;">
+<!ENTITY aboutCmd1.label "About &brandShortName;">
 <!ENTITY aboutCmd.accesskey "A">
 
 <!-- Mail Toolbar -->