1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 |
3 # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 |
4 # Parent b692fb539e9d0641ff557cb4b984b5e211aec572 |
4 # Parent 74161085d62009c0ddc2eb02d320ef7f10d4c1f1 |
5 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value |
5 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value |
6 |
6 |
7 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
7 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
8 --- a/browser/app/profile/firefox.js |
8 --- a/browser/app/profile/firefox.js |
9 +++ b/browser/app/profile/firefox.js |
9 +++ b/browser/app/profile/firefox.js |
10 @@ -240,17 +240,17 @@ pref("browser.uitour.readerViewTrigger", |
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) |
11 pref("browser.uitour.surveyDuration", 7200); |
14 pref("browser.uitour.surveyDuration", 7200); |
12 |
|
13 pref("browser.customizemode.tip0.shown", false); |
|
14 pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); |
|
15 |
15 |
16 pref("keyword.enabled", true); |
16 pref("keyword.enabled", true); |
17 pref("browser.fixup.domainwhitelist.localhost", true); |
17 pref("browser.fixup.domainwhitelist.localhost", true); |
18 |
18 |
19 -pref("general.useragent.locale", "@AB_CD@"); |
19 -pref("general.useragent.locale", "@AB_CD@"); |