Bug 962889 - [JA] add Bing to the default list of search providers in Firefox desktop and Android, r=pike
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Thu, 03 Jul 2014 17:24:26 +0200
changeset 1476 09204465c3a527a44e1b11f5128a959cb341348e
parent 1475 8ce73491497afbeae4cbed3b387581e970cc5e67
child 1477 3901325c063fb27149d450561304eef7bcb40d60
push id737
push useraxel@mozilla.com
push dateMon, 21 Jul 2014 19:14:48 +0000
reviewerspike
bugs962889
Bug 962889 - [JA] add Bing to the default list of search providers in Firefox desktop and Android, r=pike
browser/chrome/browser-region/region.properties
browser/firefox-l10n.js
browser/searchplugins/list.txt
mobile/searchplugins/list.txt
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -3,22 +3,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Default search engine
 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! JAPAN
-browser.search.order.3			= Amazon.co.jp
-browser.search.order.4			= 楽天市場
-browser.search.order.5			= ヤフオク!
-browser.search.order.6			= 教えて!goo
-browser.search.order.7			= Twitter
-browser.search.order.8			= Wikipedia (ja)
+browser.search.order.3			= Bing
+browser.search.order.4			= Amazon.co.jp
+browser.search.order.5			= 楽天市場
+browser.search.order.6			= ヤフオク!
+browser.search.order.7			= 教えて!goo
+browser.search.order.8			= Twitter
+browser.search.order.9			= Wikipedia (ja)
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
 browser.contentHandlers.types.0.title	= My Yahoo!
 browser.contentHandlers.types.0.uri	= http://add.my.yahoo.co.jp/rss?url=%s
 browser.contentHandlers.types.1.title	= livedoor Reader
 browser.contentHandlers.types.1.uri	= http://reader.livedoor.com/subscribe/?url=%s
 
--- a/browser/firefox-l10n.js
+++ b/browser/firefox-l10n.js
@@ -7,8 +7,9 @@
 pref("general.useragent.locale", "@AB_CD@");
 
 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.4", "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.5", "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.6", "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.7", "chrome://browser-region/locale/region.properties");
 pref("browser.search.order.8", "chrome://browser-region/locale/region.properties");
+pref("browser.search.order.9", "chrome://browser-region/locale/region.properties");
--- a/browser/searchplugins/list.txt
+++ b/browser/searchplugins/list.txt
@@ -1,8 +1,9 @@
+amazon-jp
+bing
 google-jp
-yahoo-jp
-amazon-jp
+oshiete-goo
 rakuten
-yahoo-jp-auctions
-oshiete-goo
 twitter-ja
 wikipedia-ja
+yahoo-jp
+yahoo-jp-auctions
--- a/mobile/searchplugins/list.txt
+++ b/mobile/searchplugins/list.txt
@@ -1,5 +1,6 @@
+amazon-jp
+bing
 google
-amazon-jp
 twitter-ja
 wikipedia-ja
 yahoo-jp