Bug 476555 - change "mark as junk" to "junk" in header button, and Bug 466397 - tweak entity names so that all locales pick up the removal of the ellipses in reply and forward header buttons, r=mkmelin

mail/base/content/mailWidgets.xml

@@ -2091,16 +2091,16 @@
         <!-- XXXdmose need to audit our shortcut/a11y setup and make sure
              these buttons are doing the right thing -->
 
-       <xul:button anonid="hdrReplyButton" label="&replyButton.label;"
+       <xul:button anonid="hdrReplyButton" label="&hdrReplyButton.label;"
                    oncommand="MsgReplyMessage(event);" observes="button_reply"
                    class="msgHeaderView-button hdrReplyButton"/>
-       <xul:button anonid="hdrForwardButton" label="&forwardButton.label;"
+       <xul:button anonid="hdrForwardButton" label="&hdrForwardButton.label;"
                    oncommand="MsgForwardMessage(event);"
                    observes="button_forward" class="msgHeaderView-button hdrForwardButton"/>
        <xul:button anonid="archiveButton" label="&archiveButton.label;"
                    oncommand="MsgArchiveSelectedMessages(event);" observes="button_archive"
                    class="msgHeaderView-button hdrArchiveButton"/>
-       <xul:button anonid="hdrJunkButton" label="&junkButton.label;"
+       <xul:button anonid="hdrJunkButton" label="&hdrJunkButton.label;"
                    observes="button_junk" class="msgHeaderView-button hdrJunkButton"
                    oncommand="goDoCommand('button_junk')"/>
        <xul:button anonid="hdrTrashButton" tooltiptext="&trashButton.tooltiptext;"

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

@@ -58,9 +58,9 @@
 <!ENTITY editMessageDescription.label "This is a draft message">
 <!ENTITY editMessageButton.label "Edit…">
 <!ENTITY archiveButton.label "archive">
-<!ENTITY replyButton.label "reply">
-<!ENTITY forwardButton.label "forward">
-<!ENTITY junkButton.label "mark as junk">
+<!ENTITY hdrReplyButton.label "reply">
+<!ENTITY hdrForwardButton.label "forward">
+<!ENTITY hdrJunkButton.label "junk">
 <!ENTITY trashButton.tooltiptext "delete">
 
 <!ENTITY otherActionsButton.label "other actions">