Bug 599036 - Feeds that should open in a new window opens in a new tab. r+ui-review=bwinton
authoralta88 <alta88@gmail.com>
Mon, 25 Mar 2013 08:27:52 -0600
changeset 12177 4d0b1de9de5181715007a0c1f08c693645235f65
parent 12176 0baa9cf7f340b7a083c7c9a3694730659a526830
child 12178 b2693dc700cc3f2687eeae98cb18414d88e19470
push id9036
push userbugzilla@standard8.plus.com
push dateTue, 26 Mar 2013 11:26:30 +0000
treeherdercomm-central@4943b8dbd039 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs599036
Bug 599036 - Feeds that should open in a new window opens in a new tab. r+ui-review=bwinton
mail/base/content/mailWindowOverlay.xul
mail/locales/en-US/chrome/messenger/messenger.dtd
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1900,27 +1900,27 @@
                       label="&openMessageWindowCmd.label;"
                       key="key_openMessage"
                       command="cmd_openMessage"/>
             <menuitem id="appmenu_openConversationMenuitem"
                       label="&openConversationCmd.label;"
                       key="key_openConversation"
                       command="cmd_openConversation"/>
             <menu id="appmenu_openFeedMessage"
-                  label="&openFeedMessage.label;">
+                  label="&openFeedMessage1.label;">
               <menupopup id="appmenu_openFeedMessagePopup">
-                <menuitem id="appmenu_openFeedWebPageInWindow"
+                <menuitem id="appmenu_openFeedWebPage"
                           type="radio"
                           name="openFeedGroup"
-                          label="&openFeedWebPageInWindow.label;"
+                          label="&openFeedWebPage.label;"
                           oncommand="ChangeFeedOpenHandler(0);"/>
-                <menuitem id="appmenu_openFeedSummaryInWindow"
+                <menuitem id="appmenu_openFeedSummary"
                           type="radio"
                           name="openFeedGroup"
-                          label="&openFeedSummaryInWindow.label;"
+                          label="&openFeedSummary.label;"
                           oncommand="ChangeFeedOpenHandler(1);"/>
                 <menuitem id="appmenu_openFeedWebPageInMessagePane"
                           type="radio"
                           name="openFeedGroup"
                           label="&openFeedWebPageInMP.label;"
                           oncommand="ChangeFeedOpenHandler(2);"/>
               </menupopup>
             </menu>
@@ -2695,30 +2695,30 @@
                       command="cmd_openMessage"
                       accesskey="&openMessageWindowCmd.accesskey;"
                       key="key_openMessage"/>
             <menuitem id="openConversationMenuitem" label="&openConversationCmd.label;"
                       command="cmd_openConversation"
                       accesskey="&openConversationCmd.accesskey;"
                       key="key_openConversation"/>
             <menu id="openFeedMessage" 
-                  label="&openFeedMessage.label;" 
-                  accesskey="&openFeedMessage.accesskey;">
+                  label="&openFeedMessage1.label;"
+                  accesskey="&openFeedMessage1.accesskey;">
               <menupopup id="menu_openFeedMessage">
-                <menuitem id="menu_openFeedWebPageInWindow" 
+                <menuitem id="menu_openFeedWebPage"
                           type="radio"
                           name="openFeedGroup" 
-                          label="&openFeedWebPageInWindow.label;"
-                          accesskey="&openFeedWebPageInWindow.accesskey;"
+                          label="&openFeedWebPage.label;"
+                          accesskey="&openFeedWebPage.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 0"/>
-                <menuitem id="menu_openFeedSummaryInWindow" 
+                <menuitem id="menu_openFeedSummary"
                           type="radio"
                           name="openFeedGroup" 
-                          label="&openFeedSummaryInWindow.label;"
-                          accesskey="&openFeedSummaryInWindow.accesskey;"
+                          label="&openFeedSummary.label;"
+                          accesskey="&openFeedSummary.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 1"/>
                 <menuitem id="menu_openFeedWebPageInMessagePane" 
                           type="radio"
                           name="openFeedGroup" 
                           label="&openFeedWebPageInMP.label;"
                           accesskey="&openFeedWebPageInMP.accesskey;"
                           oncommand="FeedMessageHandler.onOpenPref = 2"/>
               </menupopup>
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -423,22 +423,22 @@
 <!ENTITY recalculateJunkScoreCmd.label "Run Junk Mail Controls">
 <!ENTITY recalculateJunkScoreCmd.accesskey "C">
 <!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 openFeedMessage.label "Open Feed Message">
-<!ENTITY openFeedMessage.accesskey "O">
-<!ENTITY openFeedWebPageInWindow.label "Web Page in New Window">
-<!ENTITY openFeedWebPageInWindow.accesskey "W">
-<!ENTITY openFeedSummaryInWindow.label "Summary in New Window">
-<!ENTITY openFeedSummaryInWindow.accesskey "S">
+<!ENTITY openFeedMessage1.label "When Opening Feed Messages">
+<!ENTITY openFeedMessage1.accesskey "O">
+<!ENTITY openFeedWebPage.label "Open as Web Page">
+<!ENTITY openFeedWebPage.accesskey "W">
+<!ENTITY openFeedSummary.label "Open as Summary">
+<!ENTITY openFeedSummary.accesskey "S">
 <!ENTITY openFeedWebPageInMP.label "Toggle Web Page and Summary in Message Pane">
 <!ENTITY openFeedWebPageInMP.accesskey "T">
 
 <!-- Windows Menu -->
 <!ENTITY windowMenu.label "Window">
 
 <!-- Tools Menu -->
 <!ENTITY tasksMenu.label "Tools">