From f4f7c2ec7e6c8c56ca2f4e9d07fddd819b29d954f54317e765463cb5c909a614 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 25 Nov 2008 15:21:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=47 --- MozillaFirefox.changes | 12 + MozillaFirefox.spec | 14 +- firefox-aboutRights.patch | 594 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 619 insertions(+), 1 deletion(-) create mode 100644 firefox-aboutRights.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 5fdfbe7c..32d8f75a 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Nov 25 10:14:45 EST 2008 - hfiguiere@suse.de + +- Review and approve changes. + +------------------------------------------------------------------- +Sat Nov 22 13:26:03 CET 2008 - wr@rosenauer.org + +- replace license agreement with about:rights toolbar + (backported from upcoming FF 3.0.5) (bnc#436054, bmo#456439) + (it's always displayed in en-US) + ------------------------------------------------------------------- Fri Nov 21 03:11:41 EST 2008 - hfiguiere@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index aaf4810f..7a550514 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -27,7 +27,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL Provides: web_browser Provides: firefox Version: 3.0.4 -Release: 3 +Release: 4 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -44,6 +44,8 @@ Source16: firefox.1 Source17: firefox-suse-default-prefs.js Patch1: firefox-libxul-sdk.patch Patch2: firefox-no-update.patch +# PATCH-FIX-UPSTREAM firefox-aboutRights.patch bnc#436054 bmo#456439 +Patch3: firefox-aboutRights.patch Patch14: credits.patch Patch17: firefox-appname.patch # PATCH-FEATURE-SLED firefox-ui-lockdown.patch FATE#302023, FATE#302024 - hfiguiere@novell.com @@ -138,6 +140,7 @@ Authors: cd $RPM_BUILD_DIR/mozilla %patch1 %patch2 +%patch3 -p1 %patch14 %patch17 %patch20 -p0 @@ -191,6 +194,9 @@ for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do ja-JP-mac|en-US) ;; *) + # copy aboutRights.* to every packaged locale (remove for FF 3.0.5 again!) + cp browser/locales/en-US/chrome/browser/aboutRights.* \ + ../l10n/$locale/browser/chrome/browser/ make -C browser/locales libs-$locale cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ $RPM_BUILD_ROOT/%{progdir}/chrome @@ -339,6 +345,12 @@ fi %{progdir}/defaults/profile/bookmarks.html %changelog +* Tue Nov 25 2008 hfiguiere@suse.de +- Review and approve changes. +* Sat Nov 22 2008 wr@rosenauer.org +- replace license agreement with about:rights toolbar + (backported from upcoming FF 3.0.5) (bnc#436054, bmo#456439) + (it's always displayed in en-US) * Fri Nov 21 2008 hfiguiere@suse.de - Update firefox-lockdown-ui.patch * Print Setup is now properly locked down. bnc#431028 diff --git a/firefox-aboutRights.patch b/firefox-aboutRights.patch new file mode 100644 index 00000000..a440e78e --- /dev/null +++ b/firefox-aboutRights.patch @@ -0,0 +1,594 @@ +From: upstream (Firefox 3.0.5) +Subject: Remove EULA and show about:rights +References: +https://bugzilla.mozilla.org/show_bug.cgi?id=456439 +https://bugzilla.novell.com/show_bug.cgi?id=436054 + + +diff -uprN '--exclude=CVS' mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js +--- mozilla.orig/browser/app/profile/firefox.js 2008-09-15 09:53:44.000000000 +0200 ++++ mozilla/browser/app/profile/firefox.js 2008-11-22 09:01:50.000000000 +0100 +@@ -654,20 +654,21 @@ pref("browser.safebrowsing.malware.repor + + #endif + +-// defaults to true on Windows and Mac, because the installer shows this ++pref("browser.EULA.version", 3); ++pref("browser.rights.version", 3); ++ ++// defaults to true on Windows and Mac, because the installer shows a EULA + #ifdef XP_MACOSX +-pref("browser.EULA.3.accepted", true); ++pref("browser.rights.3.shown", true); + #elifdef XP_WIN +-pref("browser.EULA.3.accepted", true); ++pref("browser.rights.3.shown", true); + #else +-pref("browser.EULA.3.accepted", false); ++pref("browser.rights.3.shown", false); + #endif + +-// if we rev the EULA again, we should bump this so users agree to the new EULA +-pref("browser.EULA.version", 3); +- + #ifdef DEBUG +-pref("browser.EULA.override", true); ++// Don't show the about:rights notification in debug builds. ++pref("browser.rights.override", true); + #endif + + pref("browser.sessionstore.enabled", true); +diff -uprN '--exclude=CVS' mozilla.orig/browser/base/content/aboutRights.xhtml mozilla/browser/base/content/aboutRights.xhtml +--- mozilla.orig/browser/base/content/aboutRights.xhtml 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/browser/base/content/aboutRights.xhtml 2008-11-22 09:01:57.000000000 +0100 +@@ -0,0 +1,115 @@ ++ ++ ++ %htmlDTD; ++ ++ %brandDTD; ++ ++ %securityPrefsDTD; ++ ++ %aboutRightsDTD; ++]> ++# ***** BEGIN LICENSE BLOCK ***** ++# Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++# ++# The contents of this file are subject to the Mozilla Public License Version ++# 1.1 (the "License"); you may not use this file except in compliance with ++# the License. You may obtain a copy of the License at ++# http://www.mozilla.org/MPL/ ++# ++# Software distributed under the License is distributed on an "AS IS" basis, ++# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++# for the specific language governing rights and limitations under the ++# License. ++# ++# The Original Code is mozilla.org code. ++# ++# The Initial Developer of the Original Code is ++# Gervase Markham. ++# Portions created by the Initial Developer are Copyright (C) 2008 ++# the Initial Developer. All Rights Reserved. ++# ++# Contributor(s): ++# Justin Dolske ++# ++# Alternatively, the contents of this file may be used under the terms of ++# either the GNU General Public License Version 2 or later (the "GPL"), or ++# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++# in which case the provisions of the GPL or the LGPL are applicable instead ++# of those above. If you wish to allow use of your version of this file only ++# under the terms of either the GPL or the LGPL, and not to allow others to ++# use your version of this file under the terms of the MPL, indicate your ++# decision by deleting the provisions above and replace them with the notice ++# and other provisions required by the GPL or the LGPL. If you do not delete ++# the provisions above, a recipient may use your version of this file under ++# the terms of any one of the MPL, the GPL or the LGPL. ++# ++# ***** END LICENSE BLOCK ***** ++ ++ ++ ++ ++ &rights.pagetitle; ++ ++ ++ ++ ++
++ ++

&rights.intro-header;

++ ++

&rights.intro;

++ ++
    ++
  • &rights.intro-point1a;&rights.intro-point1b;&rights.intro-point1c;
    • ++#ifdef OFFICIAL_BUILD ++# Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded. ++# Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace) ++# Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace) ++
  • &rights.intro-point2a;&rights.intro-point2b;&rights.intro-point2c;
    • ++
  • &rights.intro-point3a;&rights.intro-point3b;&rights.intro-point3c;
    • ++
  • &rights.intro-point4a;&rights.intro-point4b;&rights.intro-point4c;
    • ++#else ++
  • &rights.intro-point3-unbranded;
    • ++
  • &rights.intro-point4a-unbranded;&rights.intro-point4b-unbranded;&rights.intro-point4c-unbranded;
    • ++#endif ++
++ ++ ++ ++ ++ ++
++ ++ +diff -uprN '--exclude=CVS' mozilla.orig/browser/base/jar.mn mozilla/browser/base/jar.mn +--- mozilla.orig/browser/base/jar.mn 2008-05-12 14:06:37.000000000 +0200 ++++ mozilla/browser/base/jar.mn 2008-11-22 09:01:50.000000000 +0100 +@@ -13,6 +13,7 @@ browser.jar: + * content/browser/aboutDialog.xul (content/aboutDialog.xul) + * content/browser/aboutDialog.js (content/aboutDialog.js) + content/browser/aboutDialog.css (content/aboutDialog.css) ++* content/browser/aboutRights.xhtml (content/aboutRights.xhtml) + * content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) + content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) + content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) +diff -uprN '--exclude=CVS' mozilla.orig/browser/base/Makefile.in mozilla/browser/base/Makefile.in +--- mozilla.orig/browser/base/Makefile.in 2008-05-12 14:06:37.000000000 +0200 ++++ mozilla/browser/base/Makefile.in 2008-11-22 09:01:50.000000000 +0100 +@@ -84,3 +84,7 @@ endif + ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT))) + DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1 + endif ++ ++ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL)) ++DEFINES += -DOFFICIAL_BUILD=1 ++endif +diff -uprN '--exclude=CVS' mozilla.orig/browser/components/aboutRights.js mozilla/browser/components/aboutRights.js +--- mozilla.orig/browser/components/aboutRights.js 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/browser/components/aboutRights.js 2008-11-22 09:01:50.000000000 +0100 +@@ -0,0 +1,73 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 ++ * ++ * The contents of this file are subject to the Mozilla Public License Version ++ * 1.1 (the "License"); you may not use this file except in compliance with ++ * the License. You may obtain a copy of the License at ++ * http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS IS" basis, ++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License ++ * for the specific language governing rights and limitations under the ++ * License. ++ * ++ * The Original Code is about:robots. ++ * ++ * The Initial Developer of the Original Code is Mozilla Foundation. ++ * Portions created by the Initial Developer are Copyright (C) 2008 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Ryan Flint ++ * Justin Dolske ++ * ++ * Alternatively, the contents of this file may be used under the terms of ++ * either the GNU General Public License Version 2 or later (the "GPL"), or ++ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), ++ * in which case the provisions of the GPL or the LGPL are applicable instead ++ * of those above. If you wish to allow use of your version of this file only ++ * under the terms of either the GPL or the LGPL, and not to allow others to ++ * use your version of this file under the terms of the MPL, indicate your ++ * decision by deleting the provisions above and replace them with the notice ++ * and other provisions required by the GPL or the LGPL. If you do not delete ++ * the provisions above, a recipient may use your version of this file under ++ * the terms of any one of the MPL, the GPL or the LGPL. ++ * ++ * ***** END LICENSE BLOCK ***** */ ++const Cc = Components.classes; ++const Ci = Components.interfaces; ++ ++Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); ++ ++function AboutRights() {} ++AboutRights.prototype = { ++ classDescription: "about:rights", ++ contractID: "@mozilla.org/network/protocol/about;1?what=rights", ++ classID: Components.ID("{89e9da80-4c03-46a0-a357-cf77bbef98b9}"), ++ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]), ++ ++ getURIFlags: function(aURI) { ++ return (Ci.nsIAboutModule.ALLOW_SCRIPT | ++ Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT); ++ }, ++ ++ newChannel: function(aURI) { ++ var ios = Cc["@mozilla.org/network/io-service;1"]. ++ getService(Ci.nsIIOService); ++ ++ var secMan = Cc["@mozilla.org/scriptsecuritymanager;1"]. ++ getService(Ci.nsIScriptSecurityManager); ++ ++ var channel = ios.newChannel("chrome://browser/content/aboutRights.xhtml", ++ null, null); ++ var principal = secMan.getCodebasePrincipal(aURI); ++ ++ channel.originalURI = aURI; ++ channel.owner = principal; ++ ++ return channel; ++ } ++}; ++ ++function NSGetModule(compMgr, fileSpec) ++ XPCOMUtils.generateModule([AboutRights]); +diff -uprN '--exclude=CVS' mozilla.orig/browser/components/Makefile.in mozilla/browser/components/Makefile.in +--- mozilla.orig/browser/components/Makefile.in 2008-03-26 15:29:06.000000000 +0100 ++++ mozilla/browser/components/Makefile.in 2008-11-22 09:01:50.000000000 +0100 +@@ -53,6 +53,7 @@ XPIDLSRCS = \ + EXTRA_PP_COMPONENTS = \ + nsBrowserContentHandler.js \ + nsBrowserGlue.js \ ++ aboutRights.js \ + aboutRobots.js \ + $(NULL) + +@@ -77,4 +78,8 @@ endif + + DIRS += build + ++ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL)) ++DEFINES += -DOFFICIAL_BUILD=1 ++endif ++ + include $(topsrcdir)/config/rules.mk +diff -uprN '--exclude=CVS' mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js +--- mozilla.orig/browser/components/nsBrowserGlue.js 2008-11-01 00:05:05.000000000 +0100 ++++ mozilla/browser/components/nsBrowserGlue.js 2008-11-22 09:01:50.000000000 +0100 +@@ -73,6 +73,14 @@ function BrowserGlue() { + } + + BrowserGlue.prototype = { ++ __prefs: null, ++ get _prefs() { ++ if (!this.__prefs) ++ this.__prefs = Cc["@mozilla.org/preferences-service;1"]. ++ getService(Ci.nsIPrefBranch); ++ return this.__prefs; ++ }, ++ + _saveSession: false, + + _setPrefToSaveSession: function() +@@ -175,33 +183,6 @@ BrowserGlue.prototype = { + // profile startup handler (contains profile initialization routines) + _onProfileStartup: function() + { +- // Check to see if the EULA must be shown on startup +- +- var prefBranch = Cc["@mozilla.org/preferences-service;1"]. +- getService(Ci.nsIPrefBranch); +- var mustDisplayEULA = false; +- try { +- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override"); +- } catch (e) { +- // Pref might not exist +- } +- +- // Make sure it hasn't already been accepted +- if (mustDisplayEULA) { +- try { +- var EULAVersion = prefBranch.getIntPref("browser.EULA.version"); +- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted"); +- } catch(ex) { +- } +- } +- +- if (mustDisplayEULA) { +- var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"]. +- getService(Ci.nsIWindowWatcher); +- ww2.openWindow(null, "chrome://browser/content/EULA.xul", +- "_blank", "chrome,centerscreen,modal,resizable=yes", null); +- } +- + this.Sanitizer.onStartup(); + // check if we're in safe mode + var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo). +@@ -240,6 +221,10 @@ BrowserGlue.prototype = { + // Browser startup complete. All initial windows have opened. + _onBrowserStartup: function() + { ++ // Show about:rights notification, if needed. ++ if (this._shouldShowRights()) ++ this._showRightsNotification(); ++ + var prefBranch = Cc["@mozilla.org/preferences-service;1"]. + getService(Ci.nsIPrefBranch); + // If new add-ons were installed during startup open the add-ons manager. +@@ -380,6 +365,80 @@ BrowserGlue.prototype = { + } + }, + ++ /* ++ * _shouldShowRights - Determines if the user should be shown the ++ * about:rights notification. The notification should *not* be shown if ++ * we've already shown the current version, or if the override pref says to ++ * never show it. The notification *should* be shown if it's never been seen ++ * before, if a newer version is available, or if the override pref says to ++ * always show it. ++ */ ++ _shouldShowRights : function () { ++ // Look for an unconditional override pref. If set, do what it says. ++ // (true --> never show, false --> always show) ++ try { ++ return !this._prefs.getBoolPref("browser.rights.override"); ++ } catch (e) { } ++ // Ditto, for the legacy EULA pref. ++ try { ++ return !this._prefs.getBoolPref("browser.EULA.override"); ++ } catch (e) { } ++ ++#ifndef OFFICIAL_BUILD ++ // Non-official builds shouldn't shouldn't show the notification. ++ return false; ++#endif ++ ++ // Look to see if the user has seen the current version or not. ++ var currentVersion = this._prefs.getIntPref("browser.rights.version"); ++ try { ++ return !this._prefs.getBoolPref("browser.rights." + currentVersion + ".shown"); ++ } catch (e) { } ++ ++ // Legacy: If the user accepted a EULA, we won't annoy them with the ++ // equivalent about:rights page until the version changes. ++ try { ++ return !this._prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted"); ++ } catch (e) { } ++ ++ // We haven't shown the notification before, so do so now. ++ return true; ++ }, ++ ++ _showRightsNotification : function () { ++ // Stick the notification onto the selected tab of the active browser window. ++ var win = this._getMostRecentBrowserWindow(); ++ var browser = win.gBrowser; // for closure in notification bar callback ++ var notifyBox = browser.getNotificationBox(); ++ ++ var bundleService = Cc["@mozilla.org/intl/stringbundle;1"]. ++ getService(Ci.nsIStringBundleService); ++ var brandBundle = bundleService.createBundle("chrome://branding/locale/brand.properties"); ++ var rightsBundle = bundleService.createBundle("chrome://browser/locale/aboutRights.properties"); ++ ++ var buttonLabel = rightsBundle.GetStringFromName("buttonLabel"); ++ var buttonAccessKey = rightsBundle.GetStringFromName("buttonAccessKey"); ++ var productName = brandBundle.GetStringFromName("brandFullName"); ++ var notifyText = rightsBundle.formatStringFromName("notifyText", [productName], 1); ++ ++ var buttons = [ ++ { ++ label: buttonLabel, ++ accessKey: buttonAccessKey, ++ popup: null, ++ callback: function(aNotificationBar, aButton) { ++ browser.selectedTab = browser.addTab("about:rights"); ++ } ++ } ++ ]; ++ ++ // Set pref to indicate we've shown the notification. ++ var currentVersion = this._prefs.getIntPref("browser.rights.version"); ++ this._prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); ++ ++ notifyBox.appendNotification(notifyText, "about-rights", null, notifyBox.PRIORITY_INFO_LOW, buttons); ++ }, ++ + // returns the (cached) Sanitizer constructor + get Sanitizer() + { +@@ -777,6 +836,52 @@ BrowserGlue.prototype = { + } + }, + ++#ifdef XP_UNIX ++#ifndef XP_MACOSX ++#define BROKEN_WM_Z_ORDER ++#endif ++#endif ++#ifdef XP_OS2 ++#define BROKEN_WM_Z_ORDER ++#endif ++ ++ // this returns the most recent non-popup browser window ++ _getMostRecentBrowserWindow : function () ++ { ++ var wm = Cc["@mozilla.org/appshell/window-mediator;1"]. ++ getService(Components.interfaces.nsIWindowMediator); ++ ++#ifdef BROKEN_WM_Z_ORDER ++ var win = wm.getMostRecentWindow("navigator:browser", true); ++ ++ // if we're lucky, this isn't a popup, and we can just return this ++ if (win && win.document.documentElement.getAttribute("chromehidden")) { ++ win = null; ++ var windowList = wm.getEnumerator("navigator:browser", true); ++ // this is oldest to newest, so this gets a bit ugly ++ while (windowList.hasMoreElements()) { ++ var nextWin = windowList.getNext(); ++ if (!nextWin.document.documentElement.getAttribute("chromehidden")) ++ win = nextWin; ++ } ++ } ++#else ++ var windowList = wm.getZOrderDOMWindowEnumerator("navigator:browser", true); ++ if (!windowList.hasMoreElements()) ++ return null; ++ ++ var win = windowList.getNext(); ++ while (win.document.documentElement.getAttribute("chromehidden")) { ++ if (!windowList.hasMoreElements()) ++ return null; ++ ++ win = windowList.getNext(); ++ } ++#endif ++ ++ return win; ++ }, ++ + // for XPCOM + classDescription: "Firefox Browser Glue Service", + classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"), +diff -uprN '--exclude=CVS' mozilla.orig/browser/installer/unix/packages-static mozilla/browser/installer/unix/packages-static +--- mozilla.orig/browser/installer/unix/packages-static 2008-09-15 09:53:51.000000000 +0200 ++++ mozilla/browser/installer/unix/packages-static 2008-11-22 09:01:50.000000000 +0100 +@@ -243,6 +243,7 @@ bin/components/nsContentDispatchChooser. + bin/components/nsHandlerService.js + bin/components/nsWebHandlerApp.js + bin/components/libdbusservice.so ++bin/components/aboutRights.js + bin/components/aboutRobots.js + bin/components/nsBadCertHandler.js + +diff -uprN '--exclude=CVS' mozilla.orig/browser/installer/windows/packages-static mozilla/browser/installer/windows/packages-static +--- mozilla.orig/browser/installer/windows/packages-static 2008-09-15 09:53:51.000000000 +0200 ++++ mozilla/browser/installer/windows/packages-static 2008-11-22 09:01:50.000000000 +0100 +@@ -242,6 +242,7 @@ bin\components\nsContentPrefService.js + bin\components\nsContentDispatchChooser.js + bin\components\nsHandlerService.js + bin\components\nsWebHandlerApp.js ++bin\components\aboutRights.js + bin\components\aboutRobots.js + bin\components\nsBadCertHandler.js + +diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.dtd mozilla/browser/locales/en-US/chrome/browser/aboutRights.dtd +--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.dtd 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/browser/locales/en-US/chrome/browser/aboutRights.dtd 2008-11-22 09:01:57.000000000 +0100 +@@ -0,0 +1,65 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.properties mozilla/browser/locales/en-US/chrome/browser/aboutRights.properties +--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.properties 1970-01-01 01:00:00.000000000 +0100 ++++ mozilla/browser/locales/en-US/chrome/browser/aboutRights.properties 2008-11-22 09:01:50.000000000 +0100 +@@ -0,0 +1,3 @@ ++buttonLabel = Know your rights… ++buttonAccessKey = K ++notifyText = %S is free and open software from the non-profit Mozilla Foundation. +diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/jar.mn mozilla/browser/locales/jar.mn +--- mozilla.orig/browser/locales/jar.mn 2008-09-15 09:53:51.000000000 +0200 ++++ mozilla/browser/locales/jar.mn 2008-11-22 09:01:50.000000000 +0100 +@@ -3,6 +3,8 @@ + @AB_CD@.jar: + % locale browser @AB_CD@ %locale/browser/ + locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd) ++ locale/browser/aboutRights.dtd (%chrome/browser/aboutRights.dtd) ++ locale/browser/aboutRights.properties (%chrome/browser/aboutRights.properties) + locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd) + locale/browser/credits.dtd (%chrome/browser/credits.dtd) + * locale/browser/browser.dtd (%chrome/browser/browser.dtd) +diff -uprN '--exclude=CVS' mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js mozilla/other-licenses/branding/firefox/pref/firefox-branding.js +--- mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js 2008-11-01 00:05:40.000000000 +0100 ++++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js 2008-11-22 09:01:50.000000000 +0100 +@@ -13,5 +13,3 @@ pref("app.releaseNotesURL", "http://%LOC + pref("browser.search.param.yahoo-fr", "moz2"); + pref("browser.search.param.yahoo-fr-cjkt", "moz2"); + pref("browser.search.param.yahoo-f-CN", "D3_g"); +- +-pref("browser.EULA.override", false); // Do show EULA on first start