author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 16 Nov 2017 21:22:39 +0100 | |
branch | firefox57 |
changeset 1011 | 85bd01789b6f |
parent 1006 | 5ba9b67de554 |
permissions | -rw-r--r-- |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
766
diff
changeset
|
3 |
# Parent 099312626f5f7c9cb5573a61d0230574ee12a660 |
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1005
diff
changeset
|
4 |
# Parent 3d1dbfbdfa41b433352fadf3efe4a21cb45a468f |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
--- a/browser/app/profile/firefox.js |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/browser/app/profile/firefox.js |
1005 | 10 |
@@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru |
11 |
pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/"); |
|
12 |
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/"); |
|
13 |
// How long to show a Hearbeat survey (two hours, in seconds) |
|
909 | 14 |
pref("browser.uitour.surveyDuration", 7200); |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
pref("keyword.enabled", true); |
766 | 17 |
pref("browser.fixup.domainwhitelist.localhost", true); |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
-pref("general.useragent.locale", "@AB_CD@"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+pref("general.useragent.locale", "chrome://global/locale/intl.properties"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
pref("general.skins.selectedSkin", "classic/1.0"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
23 |
pref("general.smoothScroll", true); |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
#ifdef UNIX_BUT_NOT_MAC |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
pref("general.autoScroll", false); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
#else |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
pref("general.autoScroll", true); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
#endif |