equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f |
3 # Parent 4de3b724d8c78c38713aee20a01c702e132c2c4c |
4 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value |
4 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value |
5 |
5 |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
9 @@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp |
9 @@ -230,17 +230,17 @@ pref("xpinstall.whitelist.add.36", "getp |
10 |
10 |
11 pref("lightweightThemes.update.enabled", true); |
11 pref("lightweightThemes.update.enabled", true); |
12 |
12 |
13 pref("keyword.enabled", true); |
13 pref("keyword.enabled", true); |
14 // Override the default keyword.URL. Empty value means |
14 // Override the default keyword.URL. Empty value means |
17 |
17 |
18 -pref("general.useragent.locale", "@AB_CD@"); |
18 -pref("general.useragent.locale", "@AB_CD@"); |
19 +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); |
19 +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); |
20 pref("general.skins.selectedSkin", "classic/1.0"); |
20 pref("general.skins.selectedSkin", "classic/1.0"); |
21 |
21 |
22 pref("general.smoothScroll", false); |
22 pref("general.smoothScroll", true); |
23 #ifdef UNIX_BUT_NOT_MAC |
23 #ifdef UNIX_BUT_NOT_MAC |
24 pref("general.autoScroll", false); |
24 pref("general.autoScroll", false); |
25 #else |
25 #else |
26 pref("general.autoScroll", true); |
26 pref("general.autoScroll", true); |
27 #endif |
27 #endif |