Bug #370694 --> Thunderbird's vendorShortName should be 'Mozilla' not 'Mozilla Thunderbird'. Remove a workaround in nsPostUpdateWin.js.

r=rob strong
sr=bienvenu

mail/app/profile/all-thunderbird.js

@@ -70,7 +70,6 @@ pref("app.update.silent", false);
 
 // Update service URL:
 pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/update.xml");
-pref("app.update.vendorName.override", "Mozilla");
 
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.  TODO: Change this URL

mail/locales/en-US/chrome/branding/brand.dtd

@@ -1,4 +0,0 @@
-<!ENTITY  brandShortName        "Mail/News">
-<!ENTITY  brandFullName         "Mail/News Client">
-<!ENTITY  vendorShortName       "Mail/News Client">
-<!ENTITY  sidebarName           "Sidebar">

mail/locales/en-US/chrome/branding/brand.properties

@@ -1,4 +0,0 @@
-brandShortName=Mail/News
-brandFullName=Mail/News Client
-vendorShortName=Mail/News Client
-sidebarName=Sidebar

other-licenses/branding/thunderbird/locales/en-US/brand.dtd

@@ -1,4 +1,3 @@
 <!ENTITY  brandShortName        "Thunderbird">
 <!ENTITY  brandFullName         "Mozilla Thunderbird">
-<!ENTITY  vendorShortName       "Mozilla Thunderbird">
-<!ENTITY  sidebarName           "Sidebar">
+<!ENTITY  vendorShortName       "Mozilla">

other-licenses/branding/thunderbird/locales/en-US/brand.properties

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

toolkit/mozapps/update/src/nsPostUpdateWin.js

@@ -622,20 +622,7 @@ nsPostUpdateWin.prototype = {
       getService(Components.interfaces.nsIStringBundleService);
     var brandBundle = sbs.createBundle(URI_BRAND_PROPERTIES);
 
-    var vendorShortName;
-    try {
-      // The Thunderbird vendorShortName is "Mozilla Thunderbird", but we
-      // just want "Thunderbird", so allow it to be overridden in prefs.
-
-      var prefs =
-        Components.classes["@mozilla.org/preferences-service;1"].
-        getService(Components.interfaces.nsIPrefBranch);
-
-      vendorShortName = prefs.getCharPref("app.update.vendorName.override");
-    }
-    catch (e) {
-      vendorShortName = brandBundle.GetStringFromName("vendorShortName");
-    }
+    var vendorShortName = brandBundle.GetStringFromName("vendorShortName");
     var brandFullName = brandBundle.GetStringFromName("brandFullName");
 
     if (!gCopiedLog &&