1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent be9f4eae7dc69ed989cc9f9259b3bb73d1f5dbf9 |
3 # Parent fd73fd56ea00523bcdca2ad4be06d3640888fd58 |
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 @@ -231,17 +231,17 @@ pref("xpinstall.whitelist.add.36", "getp |
9 @@ -207,17 +207,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 |
|
10 pref("xpinstall.whitelist.add", "addons.mozilla.org"); |
|
11 pref("xpinstall.whitelist.add.36", "getpersonas.com"); |
|
12 pref("xpinstall.whitelist.add.180", "marketplace.firefox.com"); |
10 |
13 |
11 pref("lightweightThemes.update.enabled", true); |
14 pref("lightweightThemes.update.enabled", true); |
12 |
15 |
13 pref("keyword.enabled", true); |
16 pref("keyword.enabled", true); |
14 // Override the default keyword.URL. Empty value means |
|
15 // "use the search service's default engine" |
|
16 pref("keyword.URL", ""); |
|
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 |