diff -r cef565f1c325 -r 6cb1ac7cd223 mozilla-preferences.patch --- a/mozilla-preferences.patch Mon Apr 14 09:09:11 2014 +0200 +++ b/mozilla-preferences.patch Thu Apr 17 23:33:07 2014 +0200 @@ -5,19 +5,19 @@ package unconditionally. # HG changeset patch -# Parent bf7f0353aa8e00b1deaa05b7cb84bb7ea4c9ce8f +# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js -@@ -1554,17 +1554,17 @@ pref("intl.charsetmenu.browser.more5", - pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties"); +@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit", pref("intl.charsetmenu.browser.cache", ""); pref("intl.charsetmenu.mailview.cache", ""); pref("intl.charsetmenu.composer.cache", ""); pref("intl.charsetmenu.browser.cache.size", 5); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.fallback.override", ""); + pref("intl.charset.fallback.tld", true); pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); -pref("intl.locale.matchOS", false); +pref("intl.locale.matchOS", true);