Back out my patch from bug 424489 now that tagging date has been established.
authorreed@reedloden.com
Tue, 25 Mar 2008 22:44:59 -0700
changeset 13567 0e1351bb8d11e5f2cb83bda9b5a58a3d5aaa6e61
parent 13566 73bff33fbf58e20988f0229ec821c256a9f191da
child 13568 b4470c7ea852a272e377a7fd88a1d5218f06fdbc
push idunknown
push userunknown
push dateunknown
bugs424489
milestone1.9b5pre
Back out my patch from bug 424489 now that tagging date has been established.
browser/base/content/browser.xul
other-licenses/branding/firefox/branding.nsi
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -59,18 +59,18 @@
 # hiddenWindow.xul.
 #include browser-doctype.inc
 
 <window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
         contenttitlesetting="true"
-        title="&mainWindow.title; 3 Beta 5"
-        titlemodifier="&mainWindow.title; 3 Beta 5"
+        title="&mainWindow.title;"
+        titlemodifier="&mainWindow.title;"
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         windowtype="navigator:browser"
         screenX="4" screenY="4"
         persist="screenX screenY width height sizemode"> 
 
 # All JS files which are not content (only) dependent that browser.xul
 # wishes to include *must* go into the global-scripts.inc file
 # so that they can be shared by macBrowserOverlay.xul.
--- a/other-licenses/branding/firefox/branding.nsi
+++ b/other-licenses/branding/firefox/branding.nsi
@@ -42,15 +42,14 @@
 # instead of BrandFullName and typically should not be modified.
 !define BrandFullNameInternal "Mozilla Firefox"
 !define CompanyName           "Mozilla Corporation"
 !define URLInfoAbout          "http://${AB_CD}.www.mozilla.com/${AB_CD}/"
 !define URLUpdateInfo         "http://${AB_CD}.www.mozilla.com/${AB_CD}/firefox/"
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
 
 # Everything below this line may be modified for Alpha / Beta releases.
-!define BrandFullName         "Mozilla Firefox 3 Beta 5"
+!define BrandFullName         "Mozilla Firefox"
 
 # 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