Bug 812630 - When hovering over the Menu Button, hover text is: "Displays the Application Menu". r=Fallen

calendar/lightning/content/lightning-toolbar.xul

@@ -10,6 +10,7 @@
   <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd"> %lightningDTD;
   <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
   <!ENTITY % toolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd" > %toolbarDTD;
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
 ]>
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
@@ -112,7 +113,7 @@
       <toolbarbutton id="calendar-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
                      label="&lightning.toolbar.appmenuButton.label;"
-                     tooltiptext="&lightning.toolbar.appmenuButton.tooltip;"/>
+                     tooltiptext="&lightning.toolbar.appmenuButton1.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="calendar-toolbar2" class="inline-toolbar chromeclass-toolbar"
@@ -166,7 +167,7 @@
       <toolbarbutton id="task-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
                      label="&lightning.toolbar.appmenuButton.label;"
-                     tooltiptext="&lightning.toolbar.appmenuButton.tooltip;"/>
+                     tooltiptext="&lightning.toolbar.appmenuButton1.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="task-toolbar2" class="inline-toolbar chromeclass-toolbar"

calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd

@@ -34,7 +34,7 @@
 <!ENTITY lightning.toolbar.multiweek.accesskey       "u">
 <!ENTITY lightning.toolbar.month.label               "Month">
 <!ENTITY lightning.toolbar.month.accesskey           "M">
-<!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton.tooltip
+<!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton1.tooltip
      from messenger.dtd -->
 <!ENTITY lightning.toolbar.appmenuButton.label       "AppMenu">
-<!ENTITY lightning.toolbar.appmenuButton.tooltip     "Displays the Application Menu">
+<!ENTITY lightning.toolbar.appmenuButton1.tooltip     "Display the &brandShortName; Menu">

mail/base/content/mailWindowOverlay.xul

@@ -3216,7 +3216,7 @@
     <toolbarbutton id="button-appmenu"
                    class="toolbarbutton-1 button-appmenu"
                    label="&appmenuButton.label;"
-                   tooltiptext="&appmenuButton.tooltip;"/>
+                   tooltiptext="&appmenuButton1.tooltip;"/>
   </toolbarpalette>
 
   <!-- If changes are made to the default set of toolbar buttons, you may need to rev the id

mail/components/im/content/chat-messenger-overlay.xul

@@ -182,7 +182,7 @@
           <toolbarbutton id="button-chat-appmenu"
                          class="toolbarbutton-1 button-appmenu"
                          label="&appmenuButton.label;"
-                         tooltiptext="&appmenuButton.tooltip;"/>
+                         tooltiptext="&appmenuButton1.tooltip;"/>
         </toolbarpalette>
         <toolbarset id="customChatToolbars" context="chat-toolbar-context-menu"/>
       </toolbox>

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

@@ -554,7 +554,7 @@
 <!ENTITY chatButton.tooltip "Show the Chat tab">
 <!ENTITY tagButton.tooltip "Tag messages">
 <!ENTITY compactButton.tooltip "Remove deleted messages from selected folder">
-<!ENTITY appmenuButton.tooltip "Displays the Application Menu">
+<!ENTITY appmenuButton1.tooltip "Display the &brandShortName; Menu">
 
 <!-- AppMenu Popup -->
 <!ENTITY appmenuNewMsgCmd.label "New Message">