From caa8e6fd9caef9a3949cd3baa7e3271ec201b473 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 17 Jun 2005 18:49:48 +0000
Subject: [PATCH] Remove/change some double entities in SeaMonkey mailnews
 (same has been done for tbird already), part of bug 286110,
 p=p.franc@gmail.com r=Mnyromyr sr=bz a=asa

git-svn-id: svn://10.0.0.236/trunk@174782 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/resources/content/mailWindowOverlay.xul | 2 +-
 mozilla/mailnews/base/resources/locale/en-US/messenger.dtd    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 9c30e31f060..a7a7bfde422 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1832,7 +1832,7 @@
   <label id="junkBarMessage" value="&junkBarMessage.label;"/>
   <spacer flex="1"/>
   <button label="&junkInfoButton.label;" oncommand="MsgJunkMailInfo(false)"/>
-  <button label="&notJunkButton.label;" oncommand="JunkSelectedMessages(false)"/>
+  <button label="&junkBarButton.label;" oncommand="JunkSelectedMessages(false)"/>
 </hbox>
 
 <statusbar class="chromeclass-status" id="status-bar"> 
diff --git a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
index b2445ec92d6..9cabee8115d 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -51,8 +51,6 @@
 <!ENTITY newAccountCmd.label "Account...">
 <!ENTITY newAccountCmd.accesskey "A">
 <!ENTITY openMessageMenu.label "Open">
-<!ENTITY openMessageWindowCmd.label "Open Message">
-<!ENTITY openMessageWindowCmd.accesskey "s">
 <!ENTITY openMessageFileCmd.label "Open File...">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY openAttachmentCmd.label "Attachments">
@@ -589,6 +587,6 @@
 
 <!-- junk bar -->
 <!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk mail">
-<!ENTITY notJunkButton.label "This is Not Junk">
+<!ENTITY junkBarButton.label "This is Not Junk">
 <!ENTITY junkInfoButton.label "?">