Back out patch from bug 407275 on the trunk now that Firefox 3 Beta 2 has branched.
authorreed@reedloden.com
Mon, 10 Dec 2007 14:03:41 -0800
changeset 8850 9753889b771526dd4360306c6232bf4a7cead291
parent 8849 7e7992d714fec49d292e3499b50feb799e155451
child 8851 b9d4a5e8e34e5302225a4f52e5a3c1be3ebebe9a
push idunknown
push userunknown
push dateunknown
bugs407275
milestone1.9b2pre
Back out patch from bug 407275 on the trunk now that Firefox 3 Beta 2 has branched.
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 2"
-        titlemodifier="&mainWindow.title; 3 Beta 2"
+        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 2"
+!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