author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 29 Nov 2012 21:17:11 +0100 | |
branch | esr17 |
changeset 593 | 0bf9876985d9 |
parent 419 | f6b055dd94bc |
child 653 | 38c67b6b2f37 |
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> |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
3 |
# Parent be9f4eae7dc69ed989cc9f9259b3bb73d1f5dbf9 |
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 |
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
9 |
@@ -231,17 +231,17 @@ pref("xpinstall.whitelist.add.36", "getp |
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
pref("lightweightThemes.update.enabled", true); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
pref("keyword.enabled", true); |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
// Override the default keyword.URL. Empty value means |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
// "use the search service's default engine" |
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
pref("keyword.URL", ""); |
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 |