| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Sat, 01 Nov 2014 13:57:51 +0100 | |
| branch | firefox31 |
| changeset 793 | a08cc1ab27af |
| parent 716 | cef565f1c325 |
| child 753 | f3bf114c6639 |
| 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> |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
3 |
# Parent 5ffbb37bbfc52f549620ff67ce45f218a825cf4e |
|
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 |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
9 |
@@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt
|
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
10 |
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
|
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
11 |
pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org");
|
|
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
13 |
pref("browser.customizemode.tip0.shown", false);
|
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
14 |
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
|
|
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
15 |
|
|
192
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 |