| author | Andreas Schwab <schwab@suse.de> |
| Fri, 19 Jun 2015 08:18:57 +0200 | |
| changeset 862 | 390088186660 |
| parent 850 | a2bdff616a0e |
| child 868 | 284da266ec46 |
| 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> |
|
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
766
diff
changeset
|
3 |
# Parent 099312626f5f7c9cb5573a61d0230574ee12a660 |
| 850 | 4 |
# Parent 9e46107bf33966236739600abba9dc8d97fd9d7f |
|
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
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
|
6 |
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
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
|
8 |
--- a/browser/app/profile/firefox.js |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/browser/app/profile/firefox.js |
| 850 | 10 |
@@ -251,17 +251,17 @@ pref("browser.uitour.url", "https://www.
|
11 |
pref("browser.uitour.readerViewTrigger", "^https:\/\/www\.mozilla\.org\/[^\/]+\/firefox\/reading\/start");
|
|
|
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);
|
| 766 | 17 |
pref("browser.fixup.domainwhitelist.localhost", true);
|
|
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
-pref("general.useragent.locale", "@AB_CD@");
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+pref("general.useragent.locale", "chrome://global/locale/intl.properties");
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
pref("general.skins.selectedSkin", "classic/1.0");
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
|
|
419
f6b055dd94bc
commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
410
diff
changeset
|
23 |
pref("general.smoothScroll", true);
|
|
192
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
#ifdef UNIX_BUT_NOT_MAC |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
pref("general.autoScroll", false);
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
#else |
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
pref("general.autoScroll", true);
|
|
bb4213ee70c8
clean up general.useragent.locale settings
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
#endif |