From 02f348820c0ca2cd677aa74240850ffca9384ce6 Mon Sep 17 00:00:00 2001
From: "sspitzer%netscape.com"
 <sspitzer%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 31 Mar 2007 22:22:00 +0000
Subject: [PATCH] supplimental fix for bug #195287 (adding "?" button in junk
 bar envelope.) changes suggested and approved by jglick,robinf,
 r/sr=bienvenu.

git-svn-id: svn://10.0.0.236/trunk@223538 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../suite/locales/en-US/chrome/mailnews/junkMailInfo.dtd | 9 +++++----
 .../suite/locales/en-US/chrome/mailnews/messenger.dtd    | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/junkMailInfo.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/junkMailInfo.dtd
index 36f4f4a53cb..39d019d9215 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/junkMailInfo.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/junkMailInfo.dtd
@@ -1,7 +1,8 @@
 <!ENTITY window.title  "Junk Mail">
 <!ENTITY window.width  "450">
 <!ENTITY window.height "200">
-<!ENTITY info1.label   "&brandShortName; can analyze your incoming messages and identify those which are likely to be junk mail.">
-<!ENTITY info2.label   "You can train &brandShortName; to more accurately analyze incoming messages by using the junk toolbar button to mark messages as junk or not junk.">
-<!ENTITY info3.label   "Once &brandShortName; is correctly identifying your messages, incoming junk mail can automatically be moved to the Junk folder by going to the Tools menu and choosing Junk Mail Controls.">
-<!ENTITY info4.label   "For more information about Junk Mail Controls, click the Help button.">
+<!ENTITY info1a.label  "Mail automatically detects incoming messages that appear to be junk mail (also known as spam). Messages that Mail thinks are junk will display a junk icon">
+<!ENTITY info1b.label  ".">
+<!ENTITY info2.label   "At first, you must train Mail to identify junk mail by using the Junk toolbar button to mark messages as junk or not junk.">
+<!ENTITY info3.label   "Once Mail is correctly identifying junk mail, you can use the Junk Mail Controls to automatically move incoming junk mail to the Junk folder">
+<!ENTITY info4.label   "For more information, click Help.">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
index cd3b6ebaf4c..fca30c0515c 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.dtd
@@ -529,5 +529,5 @@ Rights Reserved.
 <!-- junk bar -->
 <!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk mail">
 <!ENTITY notJunkButton.label "This is Not Junk">
-<!ENTITY junkInfoButton.label "Help">
+<!ENTITY junkInfoButton.label "?">