Merged backout of changeset 2137e1924abb
authorPhilippe M. Chiasson <gozer@mozillamessaging.com>
Mon, 29 Sep 2008 17:32:55 -0400
changeset 473 497dbdc4506c63fbb87f2dcb7c402a9cd092e521
parent 471 390e3a8313683abaf839f7b8abf46584375d4f68 (current diff)
parent 472 c27be88a77e1e8e884749c658a39bc0ba4c30d04 (diff)
child 475 420be80fb8675f5de1955aec71fffecd50914bbb
push idunknown
push userunknown
push dateunknown
Merged backout of changeset 2137e1924abb
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -54,19 +54,19 @@
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
 %customizeToolbarDTD;
 #endif
 ]>
 
 <window id="messengerWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&titledefault.label; 3 Beta 1"
+        title="&titledefault.label;"
         titlemodifier="&titledefault.label;"
-        titlemenuseparator="&titleSeparator.label; 3 Beta 1"
+        titlemenuseparator="&titleSeparator.label;"
         onload="OnLoadMessenger()"
         onunload="OnUnloadMessenger()"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         windowtype="mail:3pane">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
--- a/other-licenses/branding/thunderbird/branding.nsi
+++ b/other-licenses/branding/thunderbird/branding.nsi
@@ -41,15 +41,14 @@
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Thunderbird"
 !define CompanyName           "Mozilla Messaging"
 !define URLInfoAbout          "http://www.mozillamessaging.com/${AB_CD}/"
 !define URLUpdateInfo         "http://www.mozillamessaging.com/${AB_CD}/thunderbird/"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Thunderbird/${AppVersion}/${AB_CD}/exit.html"
 
 # Everything below this line may be modified for Alpha / Beta releases.
-!define BrandFullName         "Mozilla Thunderbird 3 Beta 1"
+!define BrandFullName         "Mozilla Thunderbird"
 
 # Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
 # directory in the registry and using that as the default. This prevents
 # Beta releases built with official branding from finding an existing install
 # of an official release and defaulting to its installation directory.
-!define NO_INSTDIR_FROM_REG