# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1493209642 -7200
# Node ID 70c9d891389f019bab1fde72295773e09004cf14
# Parent  fbb2f292caaaad2b6b2c5711c0de95671b56bbc1
moved preferences over from patch to easier to maintain property file

diff -r fbb2f292caaa -r 70c9d891389f MozillaFirefox/firefox.js
--- a/MozillaFirefox/firefox.js	Sun Apr 23 14:52:15 2017 +0200
+++ b/MozillaFirefox/firefox.js	Wed Apr 26 14:27:22 2017 +0200
@@ -1,1 +1,3 @@
+pref("intl.locale.matchOS", true);
 pref("browser.preferences.instantApply", true);
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
diff -r fbb2f292caaa -r 70c9d891389f MozillaFirefox/mozilla-preferences.patch
--- a/MozillaFirefox/mozilla-preferences.patch	Sun Apr 23 14:52:15 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-preferences.patch
\ No newline at end of file
diff -r fbb2f292caaa -r 70c9d891389f mozilla-preferences.patch
--- a/mozilla-preferences.patch	Sun Apr 23 14:52:15 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-From: Wolfgang Rosenauer <wr@rosenauer.org>
-Subject: use system locale if available
-This setting used to live in the branding-openSUSE package but this is causing too much
-confusion and therefore is currently the only setting we switch in the unbranded
-package unconditionally.
-
-# HG changeset patch
-# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
-# Parent  35b625807600ea4a5a3c49bd1cab22fac5188406
-
-diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
---- a/modules/libpref/init/all.js
-+++ b/modules/libpref/init/all.js
-@@ -1790,17 +1790,17 @@ pref("converter.html2txt.always_include_
- 
- pref("intl.accept_languages",               "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
- 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);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
- pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
- pref("font.language.group",                 "chrome://global/locale/intl.properties");
- 
- // Android-specific pref to use key-events-only mode for IME-unaware webapps.
- #ifdef MOZ_WIDGET_ANDROID
diff -r fbb2f292caaa -r 70c9d891389f series
--- a/series	Sun Apr 23 14:52:15 2017 +0200
+++ b/series	Wed Apr 26 14:27:22 2017 +0200
@@ -2,7 +2,6 @@
 mozilla-nongnome-proxies.patch
 mozilla-shared-nss-db.patch
 mozilla-kde.patch
-mozilla-preferences.patch
 mozilla-language.patch
 mozilla-ntlm-full-path.patch
 mozilla-idldir.patch