From 202e62afd12595d1f2b74241fa4bd85ed796dcb3 Mon Sep 17 00:00:00 2001
From: "varada%netscape.com"
 <varada%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 17 Apr 2001 23:09:06 +0000
Subject: [PATCH] fix for bug#74601;getting rid of last option in reply-on-top
 for compose prefs;r=ducarroz;sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@92583 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../prefs/resources/content/pref-composing_messages.xul     | 3 +--
 .../resources/locale/en-US/pref-composing_messages.dtd      | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index 41e70e60da8..41e914344ac 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -82,8 +82,7 @@
         <menupopup>
           <menuitem value="1" label="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
           <menuitem value="0" label="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
-          <menuitem value="2" label="&selectAndAboveQuote.label;" accesskey="&selectAndAboveQuote.accesskey;"/>
-          <menuitem value="3" label="&selectAndBelowQuote.label;" accesskey="&selectAndBelowQuote.accesskey;"/>
+          <menuitem value="2" label="&selectAndQuote.label;" accesskey="&selectAndQuote.accesskey;"/>
         </menupopup>
       </menulist>        
     </box>
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
index 468eeab1094..421d8fbb7e9 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
@@ -38,10 +38,8 @@ Rights Reserved.
 <!ENTITY aboveQuote.accesskey                 "v">
 <!ENTITY belowQuote.label                     "start my reply below the quoted text">
 <!ENTITY belowQuote.accesskey                 "b">
-<!ENTITY selectAndAboveQuote.label            "start my reply above, and select the quoted text">
-<!ENTITY selectAndAboveQuote.accesskey        "e">
-<!ENTITY selectAndBelowQuote.label            "start my reply below, and select the quoted text">
-<!ENTITY selectAndBelowQuote.accesskey        "r">
+<!ENTITY selectAndQuote.label                 "select the quoted text">
+<!ENTITY selectAndQuote.accesskey             "e">
 
 <!ENTITY readingMessagesHeader.label          "For incoming messages">
 <!ENTITY messageWrapping.label                "Message Wrapping">