fixing bug 64249 - remove the '(D)' from "Edit | Unsubscribe(D)" and "Edit | Cancel Message(D)"

and bug 75658 - 'Edit|Unsubscribe' and 'Edit|Cancel Message' not showing up..instead label 'Delete' is displayed

r=bhuvan
sr=sspitzer

mailnews/base/resources/content/mail3PaneWindowCommands.js

@@ -64,10 +64,13 @@ var FolderPaneController =
                     	specialFolder = selectedFolder.getAttribute('SpecialFolder');
                     	isServer = selectedFolder.getAttribute('IsServer');
 						serverType = selectedFolder.getAttribute('ServerType');
-            
+
                         if (serverType == "nntp") {
 				            if ( command == "cmd_delete" )
+                    {
 					            goSetMenuValue(command, 'valueNewsgroup');
+					            goSetAccessKey(command, 'valueNewsgroupAccessKey');
+                    }
                         }
 					}
 					catch (ex) {
@@ -264,16 +267,28 @@ var DefaultController =
         if ( GetNumSelectedMessages() < 2 ) 
         {
           if (IsNewsMessage(uri))
+          {
             goSetMenuValue(command, 'valueNewsMessage');
+            goSetAccessKey(command, 'valueNewsMessageAccessKey');
+          }
           else
+          {
             goSetMenuValue(command, 'valueMessage');
+            goSetAccessKey(command, 'valueMessageAccessKey');
+          }
         }
         else 
         {
           if (IsNewsMessage(uri)) 
+          {
             goSetMenuValue(command, 'valueNewsMessage');
+            goSetAccessKey(command, 'valueNewsMessageAccessKey');
+          }
           else 
+          {
             goSetMenuValue(command, 'valueMessages');
+            goSetAccessKey(command, 'valueMessagesAccessKey');
+          }
         }
         if (gDBView)
           gDBView.getCommandStatus(nsMsgViewCommandType.deleteMsg, enabled, checkStatus);

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -123,10 +123,15 @@ Rights Reserved.
   <command id="cmd_paste"/>
   <command id="cmd_delete"
          valueFolder="&deleteFolderCmd.label;"
+         valueFolderAccessKey="&deleteFolderCmd.accesskey;"
          valueNewsgroup="&unsubscribeNewsgroupCmd.label;"
+         valueNewsgroupAccessKey="&unsubscribeNewsgroupCmd.accesskey;"
          valueMessage="&deleteMsgCmd.label;"
+         valueMessageAccessKey="&deleteMsgCmd.accesskey;"
          valueNewsMessage="&cancelNewsMsgCmd.label;"
-         valueMessages="&deleteMsgsCmd.label;"/>
+         valueNewsMessageAccessKey="&cancelNewsMsgCmd.accesskey;"
+         valueMessages="&deleteMsgsCmd.label;"
+         valueMessagesAccessKey="&deleteMsgsCmd.accesskey;"/>
   <command id="cmd_editDraft" oncommand="goDoCommand('cmd_editDraft')" disabled="true"/>
   <command id="cmd_selectAll"/>
   <command id="cmd_selectThread" oncommand="goDoCommand('cmd_selectThread')"/>
@@ -805,7 +810,7 @@ Rights Reserved.
       <menuitem id="menu_cut"/>
       <menuitem id="menu_copy"/>
       <menuitem id="menu_paste"/>
-      <menuitem id="menu_delete"/>
+      <menuitem id="menu_delete" observes="cmd_delete"/>
       <menuitem label="&editDraftCmd.label;" 
             accesskey="&editDraftCmd.accesskey;" 
             observes="cmd_editDraft"/>

mailnews/base/resources/content/messageWindow.js

@@ -462,11 +462,25 @@ var MessageWindowController =
 		switch ( command )
 		{
 			case "cmd_delete":
-      if (gDBView)
-      {
-         gDBView.getCommandStatus(nsMsgViewCommandType.deleteMsg, enabled, checkStatus);
-         return enabled.value;
-      }
+        if ( command == "cmd_delete")
+        {
+          if (isNewsURI(gCurrentMessageUri))
+          {
+             goSetMenuValue(command, 'valueNewsMessage');
+             goSetAccessKey(command, 'valueNewsMessageAccessKey');
+          }
+          else
+          {
+             goSetMenuValue(command, 'valueMessage');
+             goSetAccessKey(command, 'valueMessageAccessKey');
+          }
+        }
+
+        if (gDBView)
+        {
+           gDBView.getCommandStatus(nsMsgViewCommandType.deleteMsg, enabled, checkStatus);
+           return enabled.value;
+        }
 			case "cmd_reply":
 			case "button_reply":
 			case "cmd_replySender":
@@ -496,13 +510,6 @@ var MessageWindowController =
 			case "cmd_markAsFlagged":
       case "button_file":
 			case "cmd_file":
-				if ( command == "cmd_delete")
-				{
-          if (isNewsURI(gCurrentMessageUri))
-					   goSetMenuValue(command, 'valueNewsMessage');
-          else
-					   goSetMenuValue(command, 'valueMessage');
-				}
 				return ( gCurrentMessageUri != null);
 			case "cmd_getNewMessages":
       case "button_getNewMessages":

mailnews/base/resources/locale/en-US/messenger.dtd

@@ -82,10 +82,15 @@ Rights Reserved.
 
 <!-- Edit Menu -->
 <!ENTITY deleteMsgCmd.label "Delete Message">  
+<!ENTITY deleteMsgCmd.accesskey "d">  
 <!ENTITY cancelNewsMsgCmd.label "Cancel Message">  
+<!ENTITY cancelNewsMsgCmd.accesskey "n">  
 <!ENTITY deleteMsgsCmd.label "Delete Selected Messages">  
+<!ENTITY deleteMsgsCmd.accesskey "d">  
 <!ENTITY deleteFolderCmd.label "Delete Folder">  
+<!ENTITY deleteFolderCmd.accesskey "d">  
 <!ENTITY unsubscribeNewsgroupCmd.label "Unsubscribe">
+<!ENTITY unsubscribeNewsgroupCmd.accesskey "n">
 <!ENTITY selectMenu.label "Select">  
 <!ENTITY selectMenu.accesskey "l">  
 <!ENTITY selectThreadCmd.label "Thread">