Bug 1426640 - Show the full name "Thunderbird Daily" in the menus. r=jorgk

mail/base/content/baseMenuOverlay.xul

@@ -32,7 +32,7 @@
     <menupopup id="menu_HelpPopup">
 #ifdef XP_MACOSX
       <menuitem id="menu_openHelp"
-                label="&openHelpMac.label;" key="key_openHelp"
+                label="&openHelpMac2.label;" key="key_openHelp"
                 oncommand="openSupportURL();"/>
 #else
       <menuitem id="menu_openHelp"
@@ -55,8 +55,8 @@
       <menuseparator id="aboutSeparator"/>
 #endif
       <menuitem id="aboutName"
-                label="&aboutMenuCmd.label;"
-                accesskey="&aboutMenuCmd.accesskey;"
+                label="&aboutMenuCmd2.label;"
+                accesskey="&aboutMenuCmd2.accesskey;"
                 oncommand="openAboutDialog();"/>
     </menupopup>
   </menu>

mail/base/content/mailWindowOverlay.xul

@@ -2214,7 +2214,7 @@
                   oncommand="safeModeRestart();"/>
               <menuseparator/>
               <menuitem id="appmenu_about"
-                  label="&aboutMenuCmd.label;"
+                  label="&aboutMenuCmd2.label;"
                   oncommand="openAboutDialog();"/>
             </menupopup>
         </splitmenu>

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

@@ -20,9 +20,9 @@
 <!ENTITY openHelp.label "Help Contents">
 <!ENTITY openHelp.accesskey "H">
 <!ENTITY openHelp.commandkey "VK_F1">
-<!ENTITY openHelpMac.label "&brandShortName; Help">
+<!ENTITY openHelpMac2.label "&brandFullName; Help">
 <!ENTITY openHelpMac2.commandkey   "?">
 <!ENTITY openHelpMac2.modifiers    "accel">
 
-<!ENTITY aboutMenuCmd.label "About &brandShortName;">
-<!ENTITY aboutMenuCmd.accesskey "A">
+<!ENTITY aboutMenuCmd2.label "About &brandFullName;">
+<!ENTITY aboutMenuCmd2.accesskey "A">