Backed out using 'Clear' instead of 'Delete' for edit menu on Mac (b=47213). Fixed mispelled command name (42362) r=mjudge

editor/ui/composer/content/EditorContextMenu.js

@@ -63,7 +63,7 @@ function EditorFillContextMenu(event, contextMenuNode)
     IsMenuItemShowing("menu_cut_cm")   ||
 		IsMenuItemShowing("menu_copy_cm")  ||
 		IsMenuItemShowing("menu_paste_cm") ||
-		IsMenuItemShowing("menu_clear_cm");
+		IsMenuItemShowing("menu_delete_cm");
 
   var haveStyle = 
     IsMenuItemShowing("removeStylesMenuitem_cm") ||

editor/ui/composer/content/EditorContextMenuOverlay.xul

@@ -39,10 +39,10 @@
 		<menuitem id="menu_redo_cm"   value="&redoCmd.label;" accesskey="&redo.accesskey;"  observes="cmd_redo"/>
     <menuseparator id="undoredo-separator"/>
 		
-    <menuitem id="menu_cut_cm"    value="&cutCmd.label;"   accesskey="&cut.accesskey;"   observes="cmd_cut"/>
-		<menuitem id="menu_copy_cm"   value="&copyCmd.label;"  accesskey="&copy.accesskey;"  observes="cmd_copy"/>
-		<menuitem id="menu_paste_cm"  value="&pasteCmd.label;" accesskey="&paste.accesskey;" observes="cmd_paste"/>
-		<menuitem id="menu_clear_cm"  value="&clearCmd.label;" accesskey="&clear.accesskey;" observes="cmd_delete"/>
+    <menuitem id="menu_cut_cm"    value="&cutCmd.label;"    accesskey="&cut.accesskey;"    observes="cmd_cut"/>
+		<menuitem id="menu_copy_cm"   value="&copyCmd.label;"   accesskey="&copy.accesskey;"   observes="cmd_copy"/>
+		<menuitem id="menu_paste_cm"  value="&pasteCmd.label;"  accesskey="&paste.accesskey;"  observes="cmd_paste"/>
+		<menuitem id="menu_delete_cm" value="&deleteCmd.label;" accesskey="&delete.accesskey;" observes="cmd_delete"/>
 		<menuseparator id="edit-separator"/>
     
     <menuitem id="menu_selectAll_cm" value="&selectAllCmd.label;" accesskey="&selectall.accesskey;" 
@@ -55,8 +55,7 @@
     <menuitem id="createLink_cm" value="&createLinkCmd.label;" accesskey="&createlink.accesskey;"
           observes="cmd_link" />
     <!-- Value and accesskey set at runtime from strings -->
-    <menuitem id="removeLinksMenuitem_cm"
-              observes="cmd_RemoveLinks"/>
+    <menuitem id="removeLinksMenuitem_cm" observes="cmd_removeLinks"/>
 		<menuseparator id="styles-separator"/>
 
 		<!-- Value and accesskey are set in InitObjectProperties -->

editor/ui/composer/content/editorOverlay.xul

@@ -332,9 +332,6 @@
       <menuitem id="menu_cut"/>
       <menuitem id="menu_copy"/>
       <menuitem id="menu_paste"/>
-<!-- use this after using "clear" for Windows is approved
-      <menuitem id="menu_clear"/>
--->
       <menuitem id="menu_delete"/>
       <menuseparator id="edEditMenuSep2" />
       <menuitem id="menu_selectAll"/>

editor/ui/composer/locale/en-US/editorOverlay.dtd

@@ -259,6 +259,8 @@
 <!ENTITY copy.accesskey "c">
 <!ENTITY pasteCmd.label "Paste">
 <!ENTITY paste.accesskey "p">
+<!ENTITY deleteCmd.label "Delete">
+<!ENTITY delete.accesskey "d">
 <!ENTITY clearCmd.label "Clear">
 <!ENTITY clear.accesskey "l">
 <!ENTITY selectAllCmd.label "Select All">