Bug 1458207 - Don't show the "Open in Conversation" in stand-alone window. r=jorgk

mail/base/content/mainKeySet.inc

@@ -84,7 +84,7 @@
   <key id="key_killThread" key="&killThreadMenu.key;"                oncommand="goDoCommand('cmd_killThread')" />
   <key id="key_killSubthread" key="&killSubthreadMenu.key;"          oncommand="goDoCommand('cmd_killSubthread')" modifiers="shift" />
   <key id="key_openMessage" key="&openMessageWindowCmd.key;"         oncommand="goDoCommand('cmd_openMessage')" modifiers="accel"/>
-  <key id="key_openConversation" key="&openConversationCmd.key;"     oncommand="goDoCommand('cmd_openConversation')" modifiers="accel, shift"/>
+  <key id="key_openConversation" key="&openInConversationCmd.key;"   oncommand="goDoCommand('cmd_openConversation')" modifiers="accel, shift"/>
 #ifdef XP_MACOSX
   <key id="key_moveToFolderAgain" key="&moveToFolderAgainCmd.key;"   oncommand="goDoCommand('cmd_moveToFolderAgain')" modifiers="alt, accel"/>
 #else

mail/base/content/mainNavigationToolbox.inc

@@ -655,10 +655,12 @@
                       command="cmd_openMessage"
                       accesskey="&openMessageWindowCmd.accesskey;"
                       key="key_openMessage"/>
-            <menuitem id="openConversationMenuitem" label="&openConversationCmd.label;"
+#ifdef MAIN_WINDOW
+            <menuitem id="openConversationMenuitem" label="&openInConversationCmd.label;"
                       command="cmd_openConversation"
-                      accesskey="&openConversationCmd.accesskey;"
+                      accesskey="&openInConversationCmd.accesskey;"
                       key="key_openConversation"/>
+#endif
             <menu id="openFeedMessage"
                   label="&openFeedMessage1.label;"
                   accesskey="&openFeedMessage1.accesskey;">
@@ -683,7 +685,9 @@
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
             </menu>
+#ifdef MAIN_WINDOW
             <menuseparator id="messageAfterOpenMsgSeparator"/>
+#endif
             <menu id="msgAttachmentMenu"
                   label="&openAttachmentListCmd.label;"
                   accesskey="&openAttachmentListCmd.accesskey;"

mail/base/content/mainPopupSet.inc

@@ -896,10 +896,12 @@
                       label="&openMessageWindowCmd.label;"
                       key="key_openMessage"
                       command="cmd_openMessage"/>
+#ifdef MAIN_WINDOW
             <menuitem id="appmenu_openConversationMenuitem"
-                      label="&openConversationCmd.label;"
+                      label="&openInConversationCmd.label;"
                       key="key_openConversation"
                       command="cmd_openConversation"/>
+#endif
             <menu id="appmenu_openFeedMessage"
                   label="&openFeedMessage1.label;">
               <menupopup id="appmenu_openFeedMessagePopup">
@@ -920,7 +922,9 @@
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
             </menu>
+#ifdef MAIN_WINDOW
             <menuseparator id="appmenu_messageAfterOpenMsgSeparator"/>
+#endif
             <menu id="appmenu_tagMenu"
                   label="&tagMenu.label;"
                   command="cmd_tag">

mail/base/content/msgHdrView.inc

@@ -209,10 +209,12 @@
                                                    class="toolbarbutton-1 msgHeaderView-button">
                                       <menupopup id="otherActionsPopup"
                                                  onpopupshowing="onShowOtherActionsPopup();">
+#ifdef MAIN_WINDOW
                                         <menuitem id="otherActionsOpenConversation"
                                                   label="&otherActionsOpenConversation1.label;"
                                                   accesskey="&otherActionsOpenConversation1.accesskey;"
                                                   oncommand="gConversationOpener.openConversationForMessages(gFolderDisplay.selectedMessages);"/>
+#endif
                                         <menuitem id="otherActionsOpenInNewWindow"
                                                   label="&otherActionsOpenInNewWindow1.label;"
                                                   accesskey="&otherActionsOpenInNewWindow1.accesskey;"

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

@@ -440,9 +440,9 @@
 <!ENTITY openMessageWindowCmd.label "Open Message">
 <!ENTITY openMessageWindowCmd.accesskey "O">
 <!ENTITY openMessageWindowCmd.key "o">
-<!ENTITY openConversationCmd.label "Open in Conversation">
-<!ENTITY openConversationCmd.accesskey "s">
-<!ENTITY openConversationCmd.key "o">
+<!ENTITY openInConversationCmd.label "Open in Conversation">
+<!ENTITY openInConversationCmd.accesskey "s">
+<!ENTITY openInConversationCmd.key "o">
 <!ENTITY openAttachmentListCmd.label "Attachments">
 <!ENTITY openAttachmentListCmd.accesskey "h">
 <!ENTITY openFeedMessage1.label "When Opening Feed Messages">