Bug 650885 - Make better use of menuitem and command elements relating to editing already in utilityOverlay (non-editor/ui code) r=neil
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 14 May 2011 01:26:42 +0100
changeset 7771 b445631958275f0a4dcc2d6c8cc550cddb06cf3a
parent 7770 9e9715602ab60728f4afd822025c1cd1c1be2c2c
child 7772 d850703965b6a51f0588fa590e36f2c4b406bf98
push idunknown
push userunknown
push dateunknown
reviewersneil
bugs650885
Bug 650885 - Make better use of menuitem and command elements relating to editing already in utilityOverlay (non-editor/ui code) r=neil
suite/common/bookmarks/bookmarksManager.xul
suite/common/contentAreaContextOverlay.xul
suite/common/mac/platformCommunicatorOverlay.xul
suite/common/unix/platformCommunicatorOverlay.xul
suite/common/utilityOverlay.xul
suite/common/win/platformCommunicatorOverlay.xul
suite/locales/en-US/chrome/common/contentAreaCommands.dtd
suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
suite/locales/en-US/chrome/common/unix/platformCommunicatorOverlay.dtd
suite/locales/en-US/chrome/common/utilityOverlay.dtd
suite/locales/en-US/chrome/common/win/platformCommunicatorOverlay.dtd
suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
suite/mailnews/compose/messengercompose.xul
suite/mailnews/mailWindowOverlay.xul
--- a/suite/common/bookmarks/bookmarksManager.xul
+++ b/suite/common/bookmarks/bookmarksManager.xul
@@ -183,60 +183,31 @@
                       label="&file.close.label;"
                       accesskey="&file.close.accesskey;" 
                       oncommand="close();"/>
           </menupopup>
         </menu>
 
         <menu id="menu_Edit">
           <menupopup id="menu_EditPopup">
-            <menuitem id="orgUndo"
-                      command="cmd_undo"
-                      label="&undoCmd.label;"
-                      key="key_undo"
-                      accesskey="&undoCmd.accesskey;"/>
-            <menuitem id="orgRedo"
-                      command="cmd_redo"
-                      label="&redoCmd.label;"
-                      key="key_redo"
-                      accesskey="&redoCmd.accesskey;"/>
-
+            <menuitem id="menu_undo"/>
+            <menuitem id="menu_redo"/>
             <menuseparator id="orgCutSeparator"/>
 
-            <menuitem id="orgCut"
-                      command="cmd_cut"
-                      label="&cutCmd.label;"
-                      key="key_cut"
-                      accesskey="&cutCmd.accesskey;"
+            <menuitem id="menu_cut"
                       selection="separator|link|folder|mixed"/>
-            <menuitem id="orgCopy"
-                      command="cmd_copy"
-                      label="&copyCmd.label;"
-                      key="key_copy"
-                      accesskey="&copyCmd.accesskey;"
+            <menuitem id="menu_copy"
                       selection="separator|link|folder|mixed"/>
-            <menuitem id="orgPaste"
-                      command="cmd_paste"
-                      label="&pasteCmd.label;"
-                      key="key_paste"
-                      accesskey="&pasteCmd.accesskey;"
+            <menuitem id="menu_paste"
                       selection="mutable"/>
-            <menuitem id="orgDelete"
-                      command="cmd_delete"
-                      label="&deleteCmd.label;"
-                      key="key_delete"
-                      accesskey="&deleteCmd.accesskey;"/>
+            <menuitem id="menu_delete"/>
 
             <menuseparator id="selectAllSeparator"/>
 
-            <menuitem id="orgSelectAll"
-                      command="cmd_selectAll"
-                      label="&selectAllCmd.label;"
-                      key="key_selectAll"
-                      accesskey="&selectAllCmd.accesskey;"/>
+            <menuitem id="menu_selectAll"/>
 
             <menuseparator id="orgMoveSeparator"/>
 
             <menuitem id="orgMoveBookmarks"
                       command="placesCmd_moveBookmarks"
                       label="&cmd.moveBookmarks.label;"
                       accesskey="&cmd.moveBookmarks.accesskey;"/>
           </menupopup>
--- a/suite/common/contentAreaContextOverlay.xul
+++ b/suite/common/contentAreaContextOverlay.xul
@@ -222,46 +222,25 @@
                 accesskey="&savePageCmd.accesskey;"
                 oncommand="saveDocument(window.content.document, true);"/>
       <menuseparator id="context-sep-viewbgimage"/>
       <menuitem id="context-viewbgimage"
                 label="&viewBGImageCmd.label;"
                 accesskey="&viewBGImageCmd.accesskey;"
                 oncommand="gContextMenu.viewBGImage(event);"
                 onclick="checkForMiddleClick(this, event);"/>
-      <menuitem id="context-undo"
-                label="&undoCmd.label;"
-                accesskey="&undoCmd.accesskey;"
-                command="cmd_undo"/>
-      <menuitem id="context-redo"
-                label="&redoCmd.label;"
-                accesskey="&redoCmd.accesskey;"
-                command="cmd_redo"/>
+      <menuitem id="context-undo"/>
+      <menuitem id="context-redo"/>
       <menuseparator id="context-sep-undo"/>
-      <menuitem id="context-cut"
-                label="&cutCmd.label;"
-                accesskey="&cutCmd.accesskey;"
-                command="cmd_cut"/>
-      <menuitem id="context-copy"
-                label="&copyCmd.label;"
-                accesskey="&copyCmd.accesskey;"
-                command="cmd_copy"/>
-      <menuitem id="context-paste"
-                label="&pasteCmd.label;"
-                accesskey="&pasteCmd.accesskey;"
-                command="cmd_paste"/>
-      <menuitem id="context-delete"
-                label="&deleteCmd.label;"
-                accesskey="&deleteCmd.accesskey;"
-                command="cmd_delete"/>
+      <menuitem id="context-cut"/>
+      <menuitem id="context-copy"/>
+      <menuitem id="context-paste"/>
+      <menuitem id="context-delete"/>
       <menuseparator id="context-sep-paste"/>
-      <menuitem id="context-selectall"
-                label="&selectAllCmd.label;"
-                accesskey="&selectAllCmd.accesskey;"
-                command="cmd_selectAll"/>
+      <menuitem id="context-selectall"/>
       <menuseparator id="context-sep-selectall"/>
       <menuitem id="context-keywordfield"
                 label="&keywordfield.label;"
                 accesskey="&keywordfield.accesskey;"
                 oncommand="AddKeywordForSearchField();"/>
       <menuitem id="context-searchselect"
                 oncommand="BrowserSearch.loadSearch(gContextMenu.searchSelected(), true, event);"/>
       <menuseparator id="context-sep-properties"/>
--- a/suite/common/mac/platformCommunicatorOverlay.xul
+++ b/suite/common/mac/platformCommunicatorOverlay.xul
@@ -37,17 +37,16 @@
     <menuitem id="menu_FileQuitItem" label="&quitApplicationCmd.label;"
               key="key_quit" command="cmd_quit"/>
   </menupopup>
   <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" 
        modifiers="&quitApplicationCmd.modifiers;"/>
   <command id="cmd_quit" oncommand="goQuitApplication()"/>
 
   <!-- Edit Menu -->
-  <menuitem id="menu_redo" label="&redoCmd.label;" key="key_redo" command="cmd_redo"/>
   <key id="key_redo"   key="&redoCmd.key;" command="cmd_redo" modifiers="shift, accel"/>
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
 
   <!-- Delete Key -->
   <!-- not all Mac keyboards have a VK_DELETE key, so we use VK_BACK as
        the primary and provide VK_DELETE as a secondary key definition -->
   <key id="key_delete"  keycode="VK_BACK"   command="cmd_delete"/>
--- a/suite/common/unix/platformCommunicatorOverlay.xul
+++ b/suite/common/unix/platformCommunicatorOverlay.xul
@@ -23,17 +23,16 @@
       <menuseparator id="menu_FileQuitSeparator"/>
       <menuitem label="&quitApplicationCmd.label;" id="menu_FileQuitItem"
                 key="key_quit" accesskey="&quitApplicationCmd.accesskey;" command="cmd_quit"/>
     </menupopup>
     <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" modifiers="accel"/>
     <command id="cmd_quit" oncommand="goQuitApplication()"/>
   
     <!-- Edit Menu -->
-    <menuitem id="menu_redo" label="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" command="cmd_redo"/>
     <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
 
     <!-- Select All Key -->
     <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="alt"/>
 	
 	<!-- Delete Key -->
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -185,42 +185,36 @@
        command="cmd_newNavigator"
        modifiers="accel"/>
 
   <!-- Edit Menu -->
   <menu id="menu_Edit"
         label="&editMenu.label;"
         accesskey="&editMenu.accesskey;"/>
   <menuitem id="menu_undo"
-            label="&undoCmd.label;"
             key="key_undo"
             accesskey="&undoCmd.accesskey;"
             command="cmd_undo"/>
   <menuitem id="menu_redo"
-            label="&redoCmd.label;"
             key="key_redo"
             accesskey="&redoCmd.accesskey;"
             command="cmd_redo"/>
   <menuitem id="menu_cut"
-            label="&cutCmd.label;"
             key="key_cut"
             accesskey="&cutCmd.accesskey;"
             command="cmd_cut"/>
   <menuitem id="menu_copy"
-            label="&copyCmd.label;"
             key="key_copy"
             accesskey="&copyCmd.accesskey;"
             command="cmd_copy"/>
   <menuitem id="menu_paste"
-            label="&pasteCmd.label;"
             key="key_paste"
             accesskey="&pasteCmd.accesskey;"
             command="cmd_paste"/>
   <menuitem id="menu_delete"
-            label="&deleteCmd.label;"
             key="key_delete"
             accesskey="&deleteCmd.accesskey;"
             command="cmd_delete"/>
   <menuitem id="menu_selectAll"
             label="&selectAllCmd.label;"
             key="key_selectAll"
             accesskey="&selectAllCmd.accesskey;"
             command="cmd_selectAll"/>
@@ -235,16 +229,40 @@
             accesskey="&findTypeLinksCmd.accesskey;"
             command="cmd_findTypeLinks"/>
   <menuitem id="textfieldDirection-swap" 
             label="&bidiSwitchTextDirectionItem.label;"
             key="key_switchTextDirection"
             accesskey="&bidiSwitchTextDirectionItem.accesskey;"
             command="cmd_switchTextDirection"/>
 
+  <!-- Context Menu Overlay -->
+  <menuitem id="context-undo"
+            accesskey="&undoCmd.accesskey;"
+            command="cmd_undo"/>
+  <menuitem id="context-redo"
+            accesskey="&redoCmd.accesskey;"
+            command="cmd_redo"/>
+  <menuitem id="context-cut"
+            accesskey="&cutCmd.accesskey;"
+            command="cmd_cut"/>
+  <menuitem id="context-copy"
+            accesskey="&copyCmd.accesskey;"
+            command="cmd_copy"/>
+  <menuitem id="context-paste"
+            accesskey="&pasteCmd.accesskey;"
+            command="cmd_paste"/>
+  <menuitem id="context-delete"
+            accesskey="&deleteCmd.accesskey;"
+            command="cmd_delete"/>
+  <menuitem id="context-selectall"
+            label="&selectAllCmd.label;"
+            accesskey="&selectAllCmd.accesskey;"
+            command="cmd_selectAll"/>
+
   <!-- These key nodes are here only for show. The real bindings come from
        XBL, in platformHTMLBindings.xml. See bugs 57078 and 71779. -->
 
   <key id="key_undo"
        key="&undoCmd.key;"
        modifiers="accel"/>
   <key id="key_cut"
        key="&cutCmd.key;"
@@ -287,32 +305,38 @@
   </commandset>
 
   <command id="cmd_copyLink"
            oncommand="goDoCommand('cmd_copyLink')"
            disabled="false"/>
   <command id="cmd_copyImage"
            oncommand="goDoCommand('cmd_copyImage')"
            disabled="false"/>
-  <command id="cmd_undo" 
+  <command id="cmd_undo"
+           label="&undoCmd.label;"
            oncommand="goDoCommand('cmd_undo')"
            disabled="true"/>
-  <command id="cmd_redo" 
+  <command id="cmd_redo"
+           label="&redoCmd.label;"
            oncommand="goDoCommand('cmd_redo')"
            disabled="true"/>
-  <command id="cmd_cut" 
+  <command id="cmd_cut"
+           label="&cutCmd.label;"
            oncommand="goDoCommand('cmd_cut')"
            disabled="true"/>
-  <command id="cmd_copy" 
+  <command id="cmd_copy"
+           label="&copyCmd.label;"
            oncommand="goDoCommand('cmd_copy')"
            disabled="true"/>
-  <command id="cmd_paste" 
+  <command id="cmd_paste"
+           label="&pasteCmd.label;"
            oncommand="goDoCommand('cmd_paste')"
            disabled="true"/>
   <command id="cmd_delete"
+           label="&deleteCmd.label;"
            oncommand="goDoCommand('cmd_delete')"
            valueDefault="&deleteCmd.label;"
            valueDefaultAccessKey="&deleteCmd.accesskey;"
            disabled="true"/>
   <command id="cmd_selectAll"
            oncommand="goDoCommand('cmd_selectAll')"
            disabled="true"/>
   <command id="cmd_switchTextDirection"
--- a/suite/common/win/platformCommunicatorOverlay.xul
+++ b/suite/common/win/platformCommunicatorOverlay.xul
@@ -23,17 +23,16 @@
     <menuseparator id="menu_FileQuitSeparator"/>
     <menuitem label="&quitApplicationCmd.label;" id="menu_FileQuitItem"
               key="key_quit" accesskey="&quitApplicationCmd.accesskey;" command="cmd_quit"/>
   </menupopup>
   <key id="key_quit"  key="&quitApplicationCmd.key;" command="cmd_quit" modifiers="accel"/>
   <command id="cmd_quit" oncommand="goQuitApplication()"/>
   
   <!-- Edit Menu -->
-  <menuitem id="menu_redo" label="&redoCmd.label;" key="key_redo" accesskey="&redoCmd.accesskey;" command="cmd_redo"/>
   <key id="key_redo"  key="&redoCmd.key;" command="cmd_redo" modifiers="accel"/>
   <!-- Select All Key -->
   <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
   
   <!-- Delete Key -->
   <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
 
   <!-- Find As You Type Keys -->
--- a/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
+++ b/suite/locales/en-US/chrome/common/contentAreaCommands.dtd
@@ -71,42 +71,28 @@
 <!ENTITY saveLinkCmd.accesskey        "S">
 <!ENTITY saveImageAsCmd.label         "Save Image As…">
 <!ENTITY saveImageCmd.label           "Save Image">
 <!ENTITY saveImageCmd.accesskey       "v">
 <!ENTITY saveVideoCmd.label           "Save Video As…">
 <!ENTITY saveVideoCmd.accesskey       "v">
 <!ENTITY saveAudioCmd.label           "Save Audio As…">
 <!ENTITY saveAudioCmd.accesskey       "v">
-<!ENTITY copyCmd.label                "Copy">
-<!ENTITY copyCmd.accesskey            "C">
-<!ENTITY selectAllCmd.label           "Select All">
-<!ENTITY selectAllCmd.accesskey       "A">
 <!ENTITY copyLinkCmd.label            "Copy Link Location">
 <!ENTITY copyLinkCmd.accesskey        "L">
 <!ENTITY copyImageCmd.label           "Copy Image">
 <!ENTITY copyImageCmd.accesskey       "y">
 <!ENTITY copyVideoURLCmd.label        "Copy Video Location">
 <!ENTITY copyVideoURLCmd.accesskey    "L">
 <!ENTITY copyAudioURLCmd.label        "Copy Audio Location">
 <!ENTITY copyAudioURLCmd.accesskey    "L">
 <!ENTITY metadataCmd.label            "Properties">
 <!ENTITY metadataCmd.accesskey        "P">
 <!ENTITY copyEmailCmd.label           "Copy Email Address">
 <!ENTITY copyEmailCmd.accesskey       "s">
-<!ENTITY pasteCmd.label               "Paste">
-<!ENTITY pasteCmd.accesskey           "P">
-<!ENTITY cutCmd.label                 "Cut">
-<!ENTITY cutCmd.accesskey             "t">
-<!ENTITY deleteCmd.label              "Delete">
-<!ENTITY deleteCmd.accesskey          "D">
-<!ENTITY undoCmd.label                "Undo">
-<!ENTITY undoCmd.accesskey            "U">
-<!ENTITY redoCmd.label                "Redo">
-<!ENTITY redoCmd.accesskey            "R">
 <!ENTITY thisFrameMenu.label          "This Frame">
 <!ENTITY thisFrameMenu.accesskey      "h">
 <!ENTITY mediaPlay.label              "Play">
 <!ENTITY mediaPlay.accesskey          "P">
 <!ENTITY mediaPause.label             "Pause">
 <!ENTITY mediaPause.accesskey         "P">
 <!ENTITY mediaMute.label              "Mute">
 <!ENTITY mediaMute.accesskey          "M">
--- a/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -22,17 +22,16 @@
 <!-- End of Application menu -->
 
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 
 <!ENTITY printSetupCmd.label            "Page Setup…">
 <!ENTITY printSetupCmd.accesskey        "u">
 
-<!ENTITY redoCmd.label                  "Redo">  
 <!ENTITY redoCmd.key                    "Z">  
 
 <!ENTITY historyCmd.key                 "H">  
 
 <!ENTITY findTypeTextCmd.key            "">
 <!ENTITY findTypeLinksCmd.key           "">
 
 <!ENTITY accel.emacs_conflict           "accel">
--- a/suite/locales/en-US/chrome/common/unix/platformCommunicatorOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/unix/platformCommunicatorOverlay.dtd
@@ -4,19 +4,17 @@
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 <!ENTITY closeCmd.accesskey             "c">
 
 <!ENTITY quitApplicationCmd.label       "Quit"> 
 <!ENTITY quitApplicationCmd.key         "Q"> 
 <!ENTITY quitApplicationCmd.accesskey   "q">
 
-<!ENTITY redoCmd.label                  "Redo">  
 <!ENTITY redoCmd.key                    "Y">  
-<!ENTITY redoCmd.accesskey              "r">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel,shift">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Help Contents">
--- a/suite/locales/en-US/chrome/common/utilityOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/utilityOverlay.dtd
@@ -1,58 +1,58 @@
 <!-- these things need to move into utilityOverlay.xul -->
 <!ENTITY  offlineGoOfflineCmd.label                 "Work Offline">
 <!ENTITY  offlineGoOfflineCmd.accesskey             "k">
 
 <!-- LOCALIZATION NOTE : FILE This file contains the global menu items --> 
 
-<!ENTITY fileMenu.label					"File"> 
-<!ENTITY fileMenu.accesskey				"f">
-<!ENTITY newMenu.label						"New">
-<!ENTITY newMenu.accesskey					"N">
-<!ENTITY newBlankPageCmd.label "Composer Page">
-<!ENTITY newBlankPageCmd.accesskey "P" >
-<!ENTITY newBlankPageCmd.key "n" >
+<!ENTITY fileMenu.label                   "File">
+<!ENTITY fileMenu.accesskey               "F">
+<!ENTITY newMenu.label                    "New">
+<!ENTITY newMenu.accesskey                "N">
+<!ENTITY newBlankPageCmd.label            "Composer Page">
+<!ENTITY newBlankPageCmd.accesskey        "P">
+<!ENTITY newBlankPageCmd.key              "n">
 <!ENTITY newPageFromTemplateCmd.label "Page Using Template">
 <!ENTITY newPageFromTemplateCmd.accesskey "t">
 <!ENTITY newPageFromDraftCmd.label "Page Using Draft">
 <!ENTITY newPageFromDraftCmd.accesskey "d">
 <!ENTITY newNavigatorCmd.label "Browser Window">
 <!ENTITY newNavigatorCmd.key "N">
 <!ENTITY newNavigatorCmd.accesskey "B">
 
-<!ENTITY editMenu.label					"Edit"> 
-<!ENTITY editMenu.accesskey				"e"> 
-<!ENTITY undoCmd.label						"Undo">  
-<!ENTITY undoCmd.key						"Z">  
-<!ENTITY undoCmd.accesskey					"U"> 
-<!ENTITY redoCmd.label						"Redo">  
-<!ENTITY redoCmd.key						"Y">  
-<!ENTITY redoCmd.accesskey					"R"> 
-<!ENTITY cutCmd.label						"Cut">  
-<!ENTITY cutCmd.key							"X">  
-<!ENTITY cutCmd.accesskey					"t"> 
-<!ENTITY copyCmd.label						"Copy">  
-<!ENTITY copyCmd.key						"C">  
-<!ENTITY copyCmd.accesskey					"c"> 
-<!ENTITY pasteCmd.label						"Paste">  
-<!ENTITY pasteCmd.key						"V">  
-<!ENTITY pasteCmd.accesskey					"p"> 
-<!ENTITY pasteGoCmd.label					"Paste &amp; Go">
-<!ENTITY pasteGoCmd.accesskey				"G">
+<!ENTITY editMenu.label                   "Edit">
+<!ENTITY editMenu.accesskey               "E">
+<!ENTITY undoCmd.label                    "Undo">
+<!ENTITY undoCmd.key                      "Z">
+<!ENTITY undoCmd.accesskey                "U">
+<!ENTITY redoCmd.label                    "Redo">
+<!ENTITY redoCmd.key                      "Y">
+<!ENTITY redoCmd.accesskey                "R">
+<!ENTITY cutCmd.label                     "Cut">
+<!ENTITY cutCmd.key                       "X">
+<!ENTITY cutCmd.accesskey                 "t">
+<!ENTITY copyCmd.label                    "Copy">
+<!ENTITY copyCmd.key                      "C">
+<!ENTITY copyCmd.accesskey                "C">
+<!ENTITY pasteCmd.label                   "Paste">
+<!ENTITY pasteCmd.key                     "V">
+<!ENTITY pasteCmd.accesskey               "P">
+<!ENTITY pasteGoCmd.label                 "Paste &amp; Go">
+<!ENTITY pasteGoCmd.accesskey             "G">
 
 <!-- LOCALIZATION NOTE (pasteSearchCmd): "Search" is a verb, this is the
-     search bar equivalent to the url bar's "Paste & Go"  --> 
-<!ENTITY pasteSearchCmd.label				"Paste &amp; Search">
-<!ENTITY pasteSearchCmd.accesskey			"e">
-<!ENTITY deleteCmd.label					"Delete">  
-<!ENTITY deleteCmd.accesskey				"d"> 
-<!ENTITY selectAllCmd.label					"Select All">  
-<!ENTITY selectAllCmd.key					"A">  
-<!ENTITY selectAllCmd.accesskey				"a"> 
+     search bar equivalent to the url bar's "Paste & Go"  -->
+<!ENTITY pasteSearchCmd.label             "Paste &amp; Search">
+<!ENTITY pasteSearchCmd.accesskey         "e">
+<!ENTITY deleteCmd.label                  "Delete">
+<!ENTITY deleteCmd.accesskey              "D">
+<!ENTITY selectAllCmd.label               "Select All">
+<!ENTITY selectAllCmd.key                 "A">
+<!ENTITY selectAllCmd.accesskey           "A">
 <!ENTITY clearHistoryCmd.label				"Clear Search History">  
 <!ENTITY clearHistoryCmd.accesskey			"H"> 
 <!ENTITY showSuggestionsCmd.label			"Show Suggestions">  
 <!ENTITY showSuggestionsCmd.accesskey		"S"> 
 <!ENTITY preferencesCmd.label				"Preferences…">
 <!ENTITY preferencesCmd.key					"E">  
 <!ENTITY preferencesCmd.accesskey			"e"> 
 <!ENTITY findTypeTextCmd.label "Find Text As You Type">
--- a/suite/locales/en-US/chrome/common/win/platformCommunicatorOverlay.dtd
+++ b/suite/locales/en-US/chrome/common/win/platformCommunicatorOverlay.dtd
@@ -5,19 +5,17 @@
 <!ENTITY closeCmd.label                 "Close">  
 <!ENTITY closeCmd.key                   "W">  
 <!ENTITY closeCmd.accesskey             "c">
 
 <!ENTITY quitApplicationCmd.label       "Exit"> 
 <!ENTITY quitApplicationCmd.key         "Q"> 
 <!ENTITY quitApplicationCmd.accesskey   "x">
 
-<!ENTITY redoCmd.label                  "Redo">  
 <!ENTITY redoCmd.key                    "Y">  
-<!ENTITY redoCmd.accesskey              "r">
 
 <!ENTITY findTypeTextCmd.key            "/">
 <!ENTITY findTypeLinksCmd.key           "'">
 
 <!ENTITY accel.emacs_conflict           "accel">
 
 <!-- Help viewer -->
 <!ENTITY openHelpCmd.label              "Help Contents">
--- a/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
+++ b/suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
@@ -140,31 +140,21 @@
 <!ENTITY stopButton.tooltip "Stop the current transfer"> 
 
 <!-- context menu items -->
 <!ENTITY spellCheckNoSuggestions.label "(No Suggestions Found)">
 <!ENTITY spellCheckIgnoreWord.label "Ignore Word">
 <!ENTITY spellCheckIgnoreWord.accesskey "I">
 <!ENTITY spellCheckAddToDictionary.label "Add to Dictionary">
 <!ENTITY spellCheckAddToDictionary.accesskey "n">
-<!ENTITY undo.label "Undo">
-<!ENTITY undo.accesskey "U">
-<!ENTITY cut.label "Cut">
-<!ENTITY cut.accesskey "t">
-<!ENTITY copy.label "Copy">
-<!ENTITY copy.accesskey "C">
-<!ENTITY paste.label "Paste">
-<!ENTITY paste.accesskey "P">
 <!ENTITY pasteQuote.label "Paste As Quotation">
 <!ENTITY pasteQuote.accesskey "Q">
 
 <!ENTITY openAttachment.label "Open">
 <!ENTITY openAttachment.accesskey "O">
-<!ENTITY delete.label "Delete">
-<!ENTITY delete.accesskey "D">
 <!ENTITY renameAttachment.label "Rename…">
 <!ENTITY renameAttachment.accesskey "R">
-<!ENTITY selectAll.label "Select All">
-<!ENTITY selectAll.accesskey "A">
+<!ENTITY deleteAttachment.accesskey "D">
+<!ENTITY selectAllAttachments.accesskey "A">
 <!ENTITY attachFile.label "Attach File(s)…">
 <!ENTITY attachFile.accesskey "F">
 <!ENTITY attachPage.label "Attach Web Page…">
 <!ENTITY attachPage.accesskey "W">
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -199,24 +199,22 @@
     <menupopup id="toolbar-context-menu"/>
     <panel id="customizeToolbarSheetPopup"/>
 
     <menupopup id="msgComposeAttachmentContext"
                onpopupshowing="updateEditItems();">
       <menuitem label="&openAttachment.label;"
                 accesskey="&openAttachment.accesskey;"
                 command="cmd_openAttachment"/>
-      <menuitem label="&delete.label;"
-                accesskey="&delete.accesskey;"
+      <menuitem accesskey="&deleteAttachment.accesskey;"
                 command="cmd_delete"/>
       <menuitem label="&renameAttachment.label;"
                 accesskey="&renameAttachment.accesskey;"
                 command="cmd_renameAttachment"/>
-      <menuitem label="&selectAll.label;"
-                accesskey="&selectAll.accesskey;"
+      <menuitem accesskey="&selectAllAttachments.accesskey;"
                 command="cmd_selectAll"/>
       <menuseparator/>
       <menuitem label="&attachFile.label;"
                 accesskey="&attachFile.accesskey;"
                 command="cmd_attachFile"/>
       <menuitem label="&attachPage.label;"
                 accesskey="&attachPage.accesskey;"
                 command="cmd_attachPage"/>
--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -550,24 +550,18 @@
               label="&openLinkCmdInTab.label;"
               accesskey="&openLinkCmdInTab.accesskey;"
               oncommand="gContextMenu.openLinkInTab(event);"/>
     <menuitem id="context-openlink"
               label="&openLinkCmd.label;"
               accesskey="&openLinkCmd.accesskey;"
               oncommand="gContextMenu.openLink();"/>
     <menuseparator id="mailContext-sep-link"/>
-    <menuitem id="context-selectall"
-              label="&selectAllCmd.label;"
-              accesskey="&selectAllCmd.accesskey;"
-              command="cmd_selectAll"/>
-    <menuitem id="context-copy"
-              label="&copyCmd.label;"
-              accesskey="&copyCmd.accesskey;"
-              command="cmd_copy"/>
+    <menuitem id="context-selectall"/>
+    <menuitem id="context-copy"/>
     <menuitem id="context-searchselect"
               oncommand="MsgOpenSearch(gContextMenu.searchSelected(), event);"/>
     <menuitem id="mailContext-openNewTab"
               label="&contextOpenNewTab.label;"
               accesskey="&contextOpenNewTab.accesskey;"
               oncommand="MsgOpenNewTabForMessage();"/>
     <menuitem id="mailContext-openNewWindow"
               label="&contextOpenNewWindow.label;"
@@ -1096,17 +1090,17 @@
       <menuitem id="menu_cut"/>
       <menuitem id="menu_copy"/>
       <menuitem id="menu_paste"/>
       <menuitem id="menu_delete" command="cmd_delete"/>
       <menuseparator id="editMenuAfterDeleteSeparator"/>
       <menu id="menu_select" label="&selectMenu.label;"
             accesskey="&selectMenu.accesskey;">
         <menupopup id="menu_SelectPopup">
-          <menuitem id="menu_SelectAll"
+          <menuitem id="menu_mailSelectAll"
                     label="&all.label;"
                     accesskey="&all.accesskey;" key="key_selectAll"
                     command="cmd_selectAll"/>
           <menuseparator id="selectMenuSeparator"/>
           <menuitem id="menu_selectThread"
                     label="&selectThreadCmd.label;"
                     accesskey="&selectThreadCmd.accesskey;" key="key_selectThread"
                     command="cmd_selectThread"/>