--- mozilla.orig/browser/app/profile/firefox.js 2008-06-21 12:55:30.000000000 +0200
+++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000 +0200
@@ -89,12 +89,12 @@
- // App-specific update preferences
+ pref("app.update.certs.2.commonName", "aus3.mozilla.org");
// Whether or not app updates are enabled
-pref("app.update.enabled", true);
// Defines how the Application Update Service notifies the user about updates:
//
-@@ -186,7 +186,7 @@
+@@ -249,7 +249,7 @@
+ #endif
- // Whether or not the application should check at startup each time if it
- // is the default browser.
+ // At startup, check if we're the default browser and prompt user if not.
-pref("browser.shell.checkDefaultBrowser", true);
+pref("browser.shell.checkDefaultBrowser", false);
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
// The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
-@@ -592,10 +592,10 @@
-
- #ifdef MOZ_SAFE_BROWSING
- // Safe browsing does nothing unless this pref is set
--pref("browser.safebrowsing.enabled", true);
-+pref("browser.safebrowsing.enabled", false);
-
- // Prevent loading of pages identified as malware
--pref("browser.safebrowsing.malware.enabled", true);
-+pref("browser.safebrowsing.malware.enabled", false);
-
- // Non-enhanced mode (local url lists) URL list to check for updates
- pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1");
-@@ -739,7 +739,7 @@
- // 0 - don't pre-populate anything
- // 1 - pre-populate site URL, but don't fetch certificate
- // 2 - pre-populate site URL and pre-fetch certificate
--pref("browser.ssl_override_behavior", 1);
-+pref("browser.ssl_override_behavior", 2);
-
- // Controls the display of domain in the identity box for SSL connections.
- // 0 - do not show domain
-diff -ur mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
---- mozilla.orig/browser/base/content/baseMenuOverlay.xul 2008-06-21 12:55:29.000000000 +0200
-+++ mozilla/browser/base/content/baseMenuOverlay.xul 2008-06-21 15:08:33.000000000 +0200
-@@ -97,12 +97,6 @@
- label="&helpReleaseNotes.label;"
- oncommand="openReleaseNotes(event)"
- onclick="checkForMiddleClick(this, event);"/>
-- <menuseparator id="updateSeparator"/>
-- <menuitem id="checkForUpdates"
-- accesskey="&updateCmd.accesskey;"
-- label="&updateCmd.label;"
-- class="menuitem-iconic"
-- oncommand="checkForUpdates();"/>
- <menuseparator id="aboutSeparator"/>
- <menuitem id="aboutName"
- accesskey="&aboutCmd.accesskey;"
-diff -ur mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul
---- mozilla.orig/browser/components/preferences/advanced.xul 2008-06-21 12:55:30.000000000 +0200
-+++ mozilla/browser/components/preferences/advanced.xul 2008-06-21 16:01:22.000000000 +0200
-@@ -267,10 +267,6 @@
- <tabpanel id="updatePanel" orient="vertical" align="start">
- <label control="autoUpdateGroup">&autoCheck.label;</label>
- <vbox class="indent" id="autoUpdateGroup" role="group">
-- <checkbox id="enableAppUpdate"
-- label="&enableAppUpdate.label;"
-- accesskey="&enableAppUpdate.accesskey;"
-- preference="app.update.enabled"/>
- <checkbox id="enableAddonUpdate"
- label="&enableAddonsUpdate.label;"
- accesskey="&enableAddonsUpdate.accesskey;"
-diff -ur mozilla.orig/docshell/resources/content/netError.xhtml mozilla/docshell/resources/content/netError.xhtml
---- mozilla.orig/docshell/resources/content/netError.xhtml 2008-06-21 12:55:24.000000000 +0200
-+++ mozilla/docshell/resources/content/netError.xhtml 2008-06-22 13:08:20.000000000 +0200
-@@ -334,8 +334,8 @@
- <!-- Override section - For ssl errors only. Removed on init for other
- error types. -->
- <div id="securityOverrideDiv">
-- <a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
-- <div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div>
-+ <a id="securityOverrideLink" href="javascript:showSecuritySection();" style="display: none;">&securityOverride.linkText;</a>
-+ <div id="securityOverrideContent">&securityOverride.warningText;</div>
- </div>
- </div>
-
+@@ -391,6 +394,8 @@
+ // 0: no backups created (and deletes all existing backups)
+ pref("browser.bookmarks.max_backups", 10);
+
++pref("intl.locale.matchOS", true);
++
+ // Scripts & Windows prefs
+ pref("dom.disable_open_during_load", true);
+ pref("javascript.options.showInConsole", true);
+@@ -445,7 +445,7 @@
+ pref("alerts.totalOpenTime", 4000);
+
+ pref("browser.xul.error_pages.enabled", true);
+-pref("browser.xul.error_pages.expert_bad_cert", false);
++pref("browser.xul.error_pages.expert_bad_cert", true);
+
+ // Work Offline is best manually managed by the user.
+ pref("network.manage-offline-status", false);
diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
--- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-21 12:55:30.000000000 +0200
+++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-22 13:52:26.000000000 +0200
@@ -175,6 +175,6 @@
- <!ENTITY securityOverride.warningText "
+ <!ENTITY securityOverride.warningContent "
<p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
--<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
- <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/>
-+<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
+-<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
+ <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
++<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
">
projects / packages / firefox.git / blobdiff