From 28f7773460b3486e0e2de1a45b35a08cc478d68c Mon Sep 17 00:00:00 2001
From: "timeless%mac.com"
 <timeless%mac.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 13 Feb 2001 04:58:46 +0000
Subject: [PATCH] fix bug 67827 don't linkify single words in account central
 UI fix by stephend@netscape.com, r=timeless, sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@86898 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/msgAccountCentral.xul   | 14 -------------
 .../locale/en-US/msgAccountCentral.dtd        | 21 ++++++-------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/msgAccountCentral.xul b/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
index 475c2711457..3db41ff0525 100644
--- a/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mozilla/mailnews/base/resources/content/msgAccountCentral.xul
@@ -67,16 +67,12 @@ Rights Reserved.
       <row id="ReadMessages" class="acctCentralRow">
         <box> 
           <text class="acctCentralText acctCentralLinkText" value="&readMsgsLink.label;" onclick="ReadMessages();"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
-          <text class="acctCentralText" value="&readMsgsSuffix.label;"/> 
         </box>
       </row>
       <separator class="thin"/>
       <row id="ComposeMessage" class="acctCentralRow">
         <box> 
           <text class="acctCentralText acctCentralLinkText" value="&composeMsgLink.label;" onclick="ComposeAMessage();"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
-          <text class="acctCentralText" value="&composeMsgSuffix.label;"/> 
         </box> 
       </row>
 
@@ -92,18 +88,12 @@ Rights Reserved.
       <separator class="thin"/>
       <row id="AccountSettings" class="acctCentralRow">
         <box> 
-          <text class="acctCentralText" value="&settingsPrefix.label;"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
           <text class="acctCentralText acctCentralLinkText" value="&settingsLink.label;" onclick="ViewSettings();"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
-          <text class="acctCentralText" value="&settingsSuffix.label;"/> 
         </box> 
       </row>
       <separator class="thin"/>
       <row id="CreateAccount" class="acctCentralRow">
         <box> 
-          <text class="acctCentralText" value="&newAcctPrefix.label;"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
           <text class="acctCentralText acctCentralLinkText" value="&newAcctLink.label;" onclick="CreateNewAccount();"/> 
         </box> 
       </row>
@@ -121,15 +111,11 @@ Rights Reserved.
       <row id="SearchMessages" class="acctCentralRow">
         <box> 
           <text class="acctCentralText acctCentralLinkText" value="&searchMsgsLink.label;" onclick="SearchMessages();"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
-          <text class="acctCentralText" value="&searchMsgsSuffix.label;"/> 
         </box> 
       </row>
       <separator class="thin"/>
       <row id="CreateFilters" class="acctCentralRow">
         <box> 
-          <text class="acctCentralText" value="&filtersPrefix.label;"/> 
-          <text class="acctCentralText" value="&spacer.label;"/> 
           <text class="acctCentralText acctCentralLinkText" value="&filtersLink.label;" onclick="CreateMsgFilters();"/> 
         </box> 
       </row>
diff --git a/mozilla/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd b/mozilla/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
index 091ad3fec5f..91f1db57d81 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/msgAccountCentral.dtd
@@ -19,22 +19,13 @@ Rights Reserved.
 --> 
 
 <!ENTITY emailSectionHdr.label        "Email"> 
-<!ENTITY readMsgsLink.label           "Read"> 
-<!ENTITY readMsgsSuffix.label         "my Email messages"> 
-<!ENTITY composeMsgLink.label         "Compose"> 
-<!ENTITY composeMsgSuffix.label       "a new message"> 
+<!ENTITY readMsgsLink.label           "Read messages"> 
+<!ENTITY composeMsgLink.label         "Compose a new message"> 
 
 <!ENTITY accountsSectionHdr.label     "Accounts"> 
-<!ENTITY settingsPrefix.label         "View"> 
-<!ENTITY settingsLink.label           "settings"> 
-<!ENTITY settingsSuffix.label         "for this account"> 
-<!ENTITY newAcctPrefix.label          "Create a"> 
-<!ENTITY newAcctLink.label            "new account"> 
+<!ENTITY settingsLink.label           "View settings for this account"> 
+<!ENTITY newAcctLink.label            "Create a new account"> 
 
 <!ENTITY advFeaturesSectionHdr.label  "Advanced Features"> 
-<!ENTITY searchMsgsLink.label         "Search"> 
-<!ENTITY searchMsgsSuffix.label       "my messages"> 
-<!ENTITY filtersPrefix.label          "Create message"> 
-<!ENTITY filtersLink.label            "filters"> 
-
-<!ENTITY spacer.label                 " "> 
+<!ENTITY searchMsgsLink.label         "Search messages"> 
+<!ENTITY filtersLink.label            "Create message filters">