Bug #240741 --> make shortBrandName really be the short name (Thunderbird) and fullBrandName be the full name (Mozilla Thunderbird). Clean up various elements in the UI to use the appropriate name.

mail/base/content/aboutDialog.xul

@@ -59,8 +59,8 @@
         function onLoad() {
           var versionField = document.getElementById("versionField");
           var hidversionField = document.getElementById("hidversionField");
-          var brandShortNameEl = document.getElementById("brandShortName");          
-          hidversionField.value = brandShortNameEl.firstChild.nodeValue + ' ' + navigator.vendorSub + ' (' + navigator.productSub + ')';
+          var brandFullNameEl = document.getElementById("brandFullName");          
+          hidversionField.value = brandFullNameEl.firstChild.nodeValue + ' ' + navigator.vendorSub + ' (' + navigator.productSub + ')';
           versionField.value = hidversionField.value;
           versionField.width = hidversionField.width;
 
@@ -139,6 +139,6 @@
     
     <!-- Localizable strings (from .dtd) -->
     <strings style="display:none;">
-      <string id="brandShortName">&brandShortName;</string>
+      <string id="brandFullName">&brandFullName;</string>
     </strings>
 </dialog>

mail/base/locale/brand.dtd

@@ -1,4 +0,0 @@
-#expand <!ENTITY  lang.version          "__MOZILLA_LOCALE_VERSION__">
-<!ENTITY  brandShortName        "Mozilla Thunderbird">
-<!ENTITY  vendorShortName       "Mozilla Thunderbird">
-<!ENTITY  sidebarName           "Sidebar">

mail/base/locale/brand.properties

@@ -1,3 +1,4 @@
 brandShortName=Mozilla Thunderbird
+brandFullName=Mozilla Thunderbird
 vendorShortName=Mozilla Thunderbird
 sidebarName=Sidebar

mail/base/locale/messenger.dtd

@@ -1,5 +1,5 @@
 <!ENTITY messengerWindow.title "Mail &amp; Newsgroups">
-<!ENTITY titledefault.label    "&brandShortName;">
+<!ENTITY titledefault.label    "&brandFullName;">
 <!ENTITY titleSeparator.label " - ">
 
 <!-- File Menu -->
@@ -396,9 +396,9 @@
 <!ENTITY helpMenu.accesskey "H"> 
 <!ENTITY releaseCmd.label "Release Notes">
 <!ENTITY releaseCmd.accesskey "R"> 
-<!ENTITY hintsAndTips.label "&brandShortName; Help">
+<!ENTITY hintsAndTips.label "&brandFullName; Help">
 <!ENTITY hintsAndTips.accesskey "h"> 
-<!ENTITY aboutCmd.label "About &brandShortName;">
+<!ENTITY aboutCmd.label "About &brandFullName;">
 <!ENTITY aboutCmd.accesskey "A">
 
 <!-- Mail Toolbar -->

mail/base/locale/start.html

@@ -93,8 +93,9 @@ a:active, a:hover {
 	<li>Address Book</li>
 </ul>
 <h2>More Information</h2>
-<p>For frequently asked questions, tips and general help, visit <a href="http://texturizer.net/thunderbird/">Mozilla Thunderbird Help</a>.</p>
-<p>For product information, visit the <a href="http://www.mozilla.org/products/thunderbird/">Mozilla Thunderbird Product Page</a>.
+<p>For frequently asked questions, tips and general help, visit <a href="http://texturizer.net/thunderbird/">Thunderbird Help</a>.
+</p>
+<p>For product information, visit the <a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Product Page</a>.
 <div id="gecko"><a href="http://www.mozilla.org/">Powered by Gecko.</a></div>
 </div>
 

mail/components/prefwindow/content/pref-mailnews.xul

@@ -25,6 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay [
+  <!ENTITY % brandingDTD SYSTEM "chrome://global/locale/brand.dtd" > %brandingDTD;
   <!ENTITY % dtd1 SYSTEM "chrome://messenger/locale/pref-mailnews.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://messenger/locale/pref-notifications.dtd" > %dtd2;
 ]>

mail/components/prefwindow/locale/pref-mailnews.dtd

@@ -7,7 +7,7 @@
 <!ENTITY autounzip.label                  "Automatically expand zip files when saving attachments">
 <!ENTITY autounzip.accesskey              "A">
 <!ENTITY messengerStartPage.label         "Mail Start Page">
-<!ENTITY enableStartPage.label            "When Mail launches, show the Start Page in the message area">
+<!ENTITY enableStartPage.label            "When &brandShortName; launches, show the Start Page in the message area">
 <!ENTITY enableStartPage.accesskey        "W">
 <!ENTITY location.label                   "Location:">
 <!ENTITY location.accesskey               "L">

mail/components/prefwindow/locale/pref-mailnewsOverlay.dtd

@@ -1,5 +0,0 @@
-<!ENTITY enableMapiTitle.label        "When sending mail from other applications">
-<!ENTITY enableMapi.label             "Use &vendorShortName; as the default mail application">
-<!ENTITY enableMapi.accesskey         "u">
-<!ENTITY enableNews.label             "Use &vendorShortName; as the default news application">
-<!ENTITY enableNews.accesskey         "n">