Bug 185940: "Move" on "Message" menu should be "Move To" to match context menu. r=philor, ui-r=clarkbw, sr=neil

mail/base/content/mailWindowOverlay.xul

@@ -1304,8 +1304,9 @@
               accesskey="&openMessageWindowCmd.accesskey;"
               key="key_openMessage"/>
             <menuseparator id="messageAfterOpenMsgSeparator"/>
-            <menu id="moveMenu" accesskey="&moveMsgMenu.accesskey;"
-                  label="&moveMsgMenu.label;"
+            <menu id="moveMenu"
+                  label="&moveMsgToMenu.label;"
+                  accesskey="&moveMsgToMenu.accesskey;"
                   oncommand="MsgMoveMessage(event.target._folder)">
               <menupopup type="folder" mode="filing" showFileHereLabel="true"
                          showRecent="true" fileHereLabel="&fileHereMenu.label;"
@@ -1313,8 +1314,9 @@
                          recentLabel="&moveCopyMsgRecentMenu.label;"
                          recentAccessKey="&moveCopyMsgRecentMenu.accesskey;"/>
             </menu>
-            <menu id="copyMenu" accesskey="&copyMsgMenu.accesskey;"
-                  label="&copyMsgMenu.label;"
+            <menu id="copyMenu"
+                  label="&copyMsgToMenu.label;"
+                  accesskey="&copyMsgToMenu.accesskey;"
                   oncommand="MsgCopyMessage(event.target._folder)">
               <menupopup type="folder" mode="filing" showFileHereLabel="true"
                          showRecent="true" fileHereLabel="&copyHereMenu.label;"

mail/locales/en-US/chrome/messenger/messenger.dtd

@@ -342,14 +342,14 @@ you can use these alternative items. Otherwise, their values should be empty.  -
 <!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY createFilter.label "Create Filter From Message…">
 <!ENTITY createFilter.accesskey "a">
-<!ENTITY moveMsgMenu.label "Move">
-<!ENTITY moveMsgMenu.accesskey "M">
+<!ENTITY moveMsgToMenu.label "Move To">
+<!ENTITY moveMsgToMenu.accesskey "M">
 <!ENTITY moveCopyMsgRecentMenu.label "Recent">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "R">
 <!ENTITY copyMessageLocation.label "Copy Message Location">
 <!ENTITY copyMessageLocation.accesskey "M">
-<!ENTITY copyMsgMenu.label "Copy">
-<!ENTITY copyMsgMenu.accesskey "C">
+<!ENTITY copyMsgToMenu.label "Copy To">
+<!ENTITY copyMsgToMenu.accesskey "C">
 <!ENTITY moveToFolderAgain.label "Move Again">
 <!ENTITY moveToFolderAgain.accesskey "i">
 <!ENTITY moveToFolderAgainCmd.key "m">

mailnews/base/resources/content/mailWindowOverlay.xul

@@ -1666,9 +1666,9 @@
        <menupopup id="attachmentMenuList" onpopupshowing="FillAttachmentListPopup(this);"/>
      </menu>
      <menuseparator id="messageAfterAttachmentMenuSeparator"/>
-     <menu label="&moveMsgMenu.label;"
-           accesskey="&moveMsgMenu.accesskey;"
-           id="moveMenu"
+     <menu id="moveMenu"
+           label="&moveMsgToMenu.label;"
+           accesskey="&moveMsgToMenu.accesskey;"
            datasources="rdf:null"
            sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
            sortDirection="ascending">
@@ -1762,8 +1762,8 @@
       </template>
     </menu>
     <menu id="copyMenu"
-          label="&copyMsgMenu.label;"
-          accesskey="&copyMsgMenu.accesskey;"
+          label="&copyMsgToMenu.label;"
+          accesskey="&copyMsgToMenu.accesskey;"
           datasources="rdf:null"
           sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
           sortDirection="ascending">

suite/locales/en-US/chrome/mailnews/messenger.dtd

@@ -367,12 +367,12 @@
 <!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY createFilter.label "Create Filter From Message…">
 <!ENTITY createFilter.accesskey "a">
-<!ENTITY moveMsgMenu.label "Move">
-<!ENTITY moveMsgMenu.accesskey "M">
+<!ENTITY moveMsgToMenu.label "Move To">
+<!ENTITY moveMsgToMenu.accesskey "M">
 <!ENTITY copyMessageLocation.label "Copy Message Location">
 <!ENTITY copyMessageLocation.accesskey "M">
-<!ENTITY copyMsgMenu.label "Copy">
-<!ENTITY copyMsgMenu.accesskey "C">
+<!ENTITY copyMsgToMenu.label "Copy To">
+<!ENTITY copyMsgToMenu.accesskey "C">
 <!ENTITY moveCopyMsgRecentMenu.label "Recent">
 <!ENTITY moveCopyMsgRecentMenu.accesskey "R">
 <!ENTITY killThreadMenu.label "Ignore Thread">