Bug 939834 - Remove obsolete keys from region.properties, basic Metro setup
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Tue, 19 Nov 2013 10:57:19 +0100
changeset 131 35dee5f211ca0926f2a4e4544187306fb88f1243
parent 99 5e43aed49f6a211dd6a4d4070f7b41e2f58dc491
child 149 2509c092e0af09bb9d123973b423d8f76ac13f62
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:39:32 +0000
bugs939834
Bug 939834 - Remove obsolete keys from region.properties, basic Metro setup
browser/chrome/browser-region/region.properties
browser/metro/chrome/region.properties
browser/searchplugins/metrolist.txt
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -7,26 +7,18 @@ browser.search.defaultenginename=Google
 
 # Search engine order (order displayed in the search bar dropdown)s
 browser.search.order.1=Google
 browser.search.order.2=Yahoo
 browser.search.order.3=Bing
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
-browser.contentHandlers.types.0.title=Google
-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.1.title=My Yahoo!
-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
+browser.contentHandlers.types.0.title=My Yahoo!
+browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the 
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
 gecko.handlerService.defaultHandlersVersion=3
 
new file mode 100644
--- /dev/null
+++ b/browser/metro/chrome/region.properties
@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# LOCALIZATION NOTE: REVIEW_REQUIRED
+# For all locales: please do not commit any changes to this file without a
+# review from the l10n-drivers team. In order to get one, please file a bug,
+# add the "productization" keyword and CC l10n@mozilla.com.
+# en-US: if you're changing this file, please CC l10n@mozilla.com in the
+# associated bug to help us determine if these changes are relevant for other
+# locales and how to localize them.
+
+# Default search engine
+browser.search.defaultenginename = Google
+
+# Search engine order (order displayed in the search bar dropdown)
+browser.search.order.1 = Google
+browser.search.order.2 = Yahoo
+browser.search.order.3 = Bing
new file mode 100755
--- /dev/null
+++ b/browser/searchplugins/metrolist.txt
@@ -0,0 +1,7 @@
+amazondotcom
+bingmetrofx
+eBay
+googlemetrofx
+twitter
+wikipedia
+yahoo