2010-11-30 15:35:52 +01:00
|
|
|
# HG changeset patch
|
|
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
2015-01-14 19:32:16 +01:00
|
|
|
# Parent 099312626f5f7c9cb5573a61d0230574ee12a660
|
2017-11-15 00:17:59 +01:00
|
|
|
# Parent 3d1dbfbdfa41b433352fadf3efe4a21cb45a468f
|
2010-11-30 15:35:52 +01:00
|
|
|
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
|
|
|
|
|
|
|
|
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
|
|
|
|
--- a/browser/app/profile/firefox.js
|
|
|
|
+++ b/browser/app/profile/firefox.js
|
2017-11-15 00:17:59 +01:00
|
|
|
@@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru
|
|
|
|
pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
|
|
|
|
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
|
|
|
|
// How long to show a Hearbeat survey (two hours, in seconds)
|
2016-04-27 09:09:13 +02:00
|
|
|
pref("browser.uitour.surveyDuration", 7200);
|
2010-11-30 15:35:52 +01:00
|
|
|
|
|
|
|
pref("keyword.enabled", true);
|
2014-10-13 20:00:43 +02:00
|
|
|
pref("browser.fixup.domainwhitelist.localhost", true);
|
2010-11-30 15:35:52 +01:00
|
|
|
|
|
|
|
-pref("general.useragent.locale", "@AB_CD@");
|
|
|
|
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
|
|
|
pref("general.skins.selectedSkin", "classic/1.0");
|
|
|
|
|
2012-06-05 20:01:53 +02:00
|
|
|
pref("general.smoothScroll", true);
|
2010-11-30 15:35:52 +01:00
|
|
|
#ifdef UNIX_BUT_NOT_MAC
|
|
|
|
pref("general.autoScroll", false);
|
|
|
|
#else
|
|
|
|
pref("general.autoScroll", true);
|
|
|
|
#endif
|