author | Wolfgang Rosenauer <wr@rosenauer.org> |
Wed, 11 Dec 2013 09:37:29 +0100 | |
branch | firefox26 |
changeset 689 | afcaf2131b0e |
parent 680 | be770d3cbc02 |
child 691 | 18c2dc922e51 |
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> |
680 | 3 |
# Parent 4ecbbda17c2a7a8f62beb568ab838b45beaaf36a |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
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
|
5 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
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
|
7 |
--- a/browser/app/profile/firefox.js |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
+++ b/browser/app/profile/firefox.js |
680 | 9 |
@@ -215,17 +215,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 |
10 |
||
653 | 11 |
pref("xpinstall.whitelist.add", "addons.mozilla.org"); |
12 |
pref("xpinstall.whitelist.add.180", "marketplace.firefox.com"); |
|
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
pref("lightweightThemes.update.enabled", true); |
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); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
-pref("general.useragent.locale", "@AB_CD@"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+pref("general.useragent.locale", "chrome://global/locale/intl.properties"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
pref("general.skins.selectedSkin", "classic/1.0"); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
22 |
pref("general.smoothScroll", true); |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
#ifdef UNIX_BUT_NOT_MAC |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
pref("general.autoScroll", false); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
#else |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
pref("general.autoScroll", true); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
#endif |