From 5f0d011656a63efc1bf16ec629523658f22e666a Mon Sep 17 00:00:00 2001
From: "morse%netscape.com"
 <morse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 10 Apr 2002 06:33:48 +0000
Subject: [PATCH] bug 135199, remove send flyout on file menu, r=sgehani,
 sr=jag, adt=putterman

git-svn-id: svn://10.0.0.236/trunk@118600 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/resources/content/mailNavigatorOverlay.xul   |  8 ++------
 .../resources/locale/en-US/mailNavigatorOverlay.dtd   | 11 ++++-------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul b/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul
index 1ff5addc51d..0f3b590655b 100644
--- a/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul
@@ -129,12 +129,8 @@
   </menupopup>
 
   <menupopup id="menu_FilePopup">
-    <menu label="&sendMenu.label;" accesskey="&sendMenu.accesskey;" position="9">
-      <menupopup>      
-        <menuitem id="menu_sendPage" label="&sendPage.label;" accesskey="&sendPage.accesskey;" command="cmd_sendPage"/>
-        <menuitem id="menu_sendLink" label="&sendLinkCmd.label;" accesskey="&sendLinkCmd.accesskey;" command="Browser:SendLink"/>
-      </menupopup>
-    </menu>
+    <menuitem id="menu_sendPage" label="&sendPage.label;" accesskey="&sendPage.accesskey;" command="cmd_sendPage" position="9"/>
+    <menuitem id="menu_sendLink" label="&sendLinkCmd.label;" accesskey="&sendLinkCmd.accesskey;" command="Browser:SendLink" position="10"/>
   </menupopup>
 
   <popup id="contentAreaContextMenu">
diff --git a/mozilla/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd b/mozilla/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
index bf0bf7fc25d..2932b8a1655 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
@@ -3,11 +3,8 @@
 <!ENTITY  newMessageCmd.label             "Message">
 <!ENTITY  newMessageCmd.accesskey         "m">
 
-<!ENTITY sendMenu.label                   "Send">
-<!ENTITY sendMenu.accesskey               "d">
-
-<!ENTITY sendPage.label                   "Page...">
-<!ENTITY sendPage.accesskey               "P">
+<!ENTITY sendPage.label                   "Send Page...">
+<!ENTITY sendPage.accesskey               "S">
 
 <!ENTITY contextSendPage.label            "Send Page...">
 <!ENTITY contextSendPage.accesskey        "d">
@@ -16,6 +13,6 @@
 <!ENTITY contextSendFrame.label           "Send Frame...">
 <!ENTITY contextSendFrame.accesskey       "d">
 
-<!ENTITY sendLinkCmd.label                "Link to Page..."> 
-<!ENTITY sendLinkCmd.accesskey            "L">
+<!ENTITY sendLinkCmd.label                "Send Link..."> 
+<!ENTITY sendLinkCmd.accesskey            "d">