--- a/browser/locales/en-US/chrome/browser-region/region.properties
+++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -2,18 +2,17 @@
# 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/.
# 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
-browser.search.order.3=Bing
+browser.search.order.2=Bing
# 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=https://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
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -68,17 +68,16 @@
locale/browser/searchplugins/list.json (search/list.json)
#else
locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml)
locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json)
#endif
locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico)
locale/browser/searchplugins/images/ebay.ico (searchplugins/images/ebay.ico)
locale/browser/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico)
- locale/browser/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico)
locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico)
locale/browser/searchplugins/images/yandex-ru.ico (searchplugins/images/yandex-ru.ico)
% locale browser-region @AB_CD@ %locale/browser-region/
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
# the following files are browser-specific overrides
locale/browser/netError.dtd (%chrome/overrides/netError.dtd)
locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties)
locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd)
deleted file mode 100644
index 9bd1d9f7c008c3f288c759f70b42a6f32bf55211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-NO.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Søk</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://no.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://no.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://no.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-answer-zh-TW.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo!奇摩知識+</ShortName>
-<Description>Yahoo!奇摩知識+</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/gif;base64,R0lGODlhEAAQAOYAAAAAAP///3dub4eFh15ZYGZXcWxlgltdakxQXF1ulFJWW1VZXlpeY1xgZWZ2iGtucU5WXVFZYFJYXQB1xwB1xgByw1p5jACd9ACH0wCEzACDywB/ycDo/sfr/8rq/FhhZlhfY7O6vgCb6ACQ1wCJzgCHzaTd+qfe+rXk+7nl+8fs/9Lw/9XZ2+bo6Y3W+I/Y+Z3b+Z3c+Z7c+aDc+aXi/qTe+qfh+6rg+rjj+Lzn+8Pq/Mjs/QCi4wCZ2AWc2R2l3Uy56Fa+6Yjc/ojU9YvX+JDa+JLZ+JXb+Z7c9qrk/Mrt/FzB6L7u/8bd5fP9/+j8/+D8/+b+/+X//+f//+r//+////f//4R/df2bAO6lLf/+/Yh0boNuanBnZq6urv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAF8ALAAAAAAQABAAAAeggF+Cgl4IEREHXoOLghAtAZABLR+MghFaAU5KHiuQDIxejzs3MjAmKFItioMQAVEpNUYuRycdAQuLrVUqQzQvRTM5AQq5AVMVJEBESTY6ARKLoQEZPyUbQRxQqowQVj44SxpIVAEPlRBPPQEUMQEsDZVfXU0YE0wBAwXxX1w8I0IBQOz74mCLiAshCAwkiMWABQELGWa54iDilwQOKg4MBAA7</Image>
-<Url type="text/html" method="GET" template="https://tw.knowledge.search.yahoo.com/search" resultDomain="tw.knowledge.search.yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="fr" value="uh3_answers_web_gs"/>
-</Url>
-<SearchForm>https://tw.answers.yahoo.com/</SearchForm>
-</SearchPlugin>
-
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-ar.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo Argentina</ShortName>
-<Description>Buscar en Yahoo Argentina</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://ar.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://ar.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://ar.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-bid-zh-TW.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo!奇摩拍賣</ShortName>
-<Description>Yahoo!奇摩拍賣</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/gif;base64,R0lGODlhEAAQAMQfAP+7Q4aWvf2QBaKtx//MS+6OLI1MMf/XYv+sKkpalEZNepyUa4KOo2ttjpx4Tdh1ALdrI9lSAHhaVWNSa+Z7Ge9zAPdrALVaIR4/ie9rAOZrELXB0Gtzc/9zCJg+Hf///yH5BAEAAB8ALAAAAAAQABAAAAWM4CeO3xAEA6mKw3IQDrOSAUEAiBPMpXsciIdk1XAUfkCBwKBiAG4IAED5UKg4iGxFWfFgNk0lF+KJWBqribgCwUgKlsRok0hMHvj2YNKJfzYMBxcXE4UTEQkbChlxDT9SBZEUGogBiwkSBFE4khoGcgEJAw0GEBSRBRQUF580CQawsbAJO64Kt7i0KiEAOw==</Image>
-<Url type="text/html" method="GET" template="http://tw.search.bid.yahoo.com/search/ac" resultdomain="bid.yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
-</Url>
-<SearchForm>http://tw.search.bid.yahoo.com/search/ac</SearchForm>
-</SearchPlugin>
\ No newline at end of file
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-br.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Pesquisa Yahoo</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://br.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://br.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://br.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-ch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Tschertga Yahoo Svizra</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://ch.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://ch.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://ch.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-cl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Buscar en Yahoo Chile</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://cl.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://cl.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://cl.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-de.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://de.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://de.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://de.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-en-CA.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo Canada</ShortName>
-<Description>Yahoo Canada Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://ca.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://ca.search.yahoo.com/yhs/search"
- resultdomain="yahoo.com" rel="searchform">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="hspart" value="mozilla"/>
- <MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/>
- <MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/>
- <MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/>
- <MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/>
- <MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/>
- <MozParam name="hsimp" condition="purpose" purpose="system" value="yhs-007"/>
-</Url>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-en-GB.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo.co.uk</ShortName>
-<Description>Yahoo UK & Ireland Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://uk.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://uk.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://uk.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-es.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://es.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://es.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://es.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-espanol.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://espanol.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://espanol.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://espanol.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-fi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo-haku</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://fi.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://fi.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://fi.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-france.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Recherche Yahoo</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://fr.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://fr.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://fr.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-fy-NL.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Sykje mei Yahoo</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://nl.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://nl.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://nl.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-id.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Pencarian Yahoo</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://id.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://id.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://id.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-in.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://in.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://in.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://in.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-it.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://it.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://it.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://it.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-mx.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://mx.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://mx.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://mx.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-sv-SE.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Sök</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://se.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://se.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://se.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-tl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://sg.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://sg.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://sg.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-zh-TW-HK.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo 雅虎香港</ShortName>
-<Description>Yahoo 雅虎香港</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://hk.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://hk.search.yahoo.com/yhs/search"
- resultdomain="yahoo.com" rel="searchform">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="hspart" value="mozilla"/>
- <MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/>
- <MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/>
- <MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/>
- <MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/>
- <MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/>
-</Url>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo-zh-TW.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo 搜尋</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://tw.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://tw.search.yahoo.com/yhs/search"
- resultdomain="yahoo.com" rel="searchform">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="hspart" value="mozilla"/>
- <MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/>
- <MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/>
- <MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/>
- <MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/>
- <MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/>
-</Url>
-</SearchPlugin>
deleted file mode 100644
--- a/browser/locales/searchplugins/yahoo.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<Description>Yahoo Search</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search"
- resultdomain="yahoo.com" rel="searchform">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="hspart" value="mozilla"/>
- <MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/>
- <MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/>
- <MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/>
- <MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/>
- <MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/>
- <MozParam name="hsimp" condition="purpose" purpose="system" value="yhs-007"/>
-</Url>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-br.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://br.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://br.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://br.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-ch.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://ch.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffd" />
- <Param name="command" value="{searchTerms}" />
-</Url>
-<Url type="text/html" method="GET" template="https://ch.search.yahoo.com/search" resultdomain="yahoo.com">
- <Param name="p" value="{searchTerms}"/>
- <Param name="ei" value="UTF-8"/>
- <Param name="fr" value="moz35" />
-</Url>
-<SearchForm>https://ch.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-cl.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://cl.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://cl.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://cl.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-de.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://de.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://de.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://de.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-en-GB.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo.co.uk</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://uk.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://uk.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://uk.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-es.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://es.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://es.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://es.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-espanol.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://espanol.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://espanol.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://espanol.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-fi.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://fi.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://fi.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://fi.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-france.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://fr.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://fr.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://fr.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-id.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://id.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://id.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://id.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-in.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://in.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://in.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://in.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-it.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://it.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://it.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozmob1" />
-</Url>
-<SearchForm>https://it.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo-mx.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://mx.search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<Url type="text/html" method="GET" template="https://mx.search.yahoo.com/search">
- <Param name="p" value="{searchTerms}" />
- <Param name="ei" value="UTF-8" />
- <Param name="fr" value="mozilla_mobile_search" />
-</Url>
-<SearchForm>https://mx.search.yahoo.com/</SearchForm>
-</SearchPlugin>
deleted file mode 100644
--- a/mobile/locales/searchplugins/yahoo.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- 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/. -->
-
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-<ShortName>Yahoo</ShortName>
-<InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAAAt1BMVEUAAABTALVUALVUALZUALVVAL9TALX///9hFrv+/v77+v19QMdXBrfezvGba9SVYtH49vzw6vnIree+n+P08Pro3vXaye/Ot+rKsejFqua1kt+yjd6of9qfcdaOV855OcV1M8NuKMBpIb7l2PPi1PKrg9uidteKUs2GTcuESspaC7jz7frUwO3Bo+SviNyhdNaZaNOYZ9KSXdBnHb1eEbldD7n18frs4/a6muG6meG5mOGnftmletijsdsyAAAABnRSTlMA8si8ZBgxEvPEAAACZElEQVRo3u2aaW/CMAyGC2NuoeUobMC473FtY4Pd+/+/a2SOlIy1SDR5pSHVH6pUcfI0sRM7VZy95LIZAkgmm3OEXF4QTC4u9wBU/0zYzw9BJedkCSpZJ0NQyTgElhSQAlJACjABLDo933/q1PrH288/Zr3bXnnqnwzwVu6PFOmYBNesdb08fYrKLsvmGKArleZJbLDmtuEuXsW7Yp1mIiMPC9y6Fa9SY43KNpkXfXLzwjBOYZBnjVlCNw3G3L4Rp1Dn+kmQEEC+MuExN/CTL7Q76YSRn7gLubZGSQHKS76iKj+4buUZAKgk3WQUb+GN2V5UlI4eW1MnM0BffuciZmyFgSGA3pSdo6zTIlOA98I9dSLXcPhsDKAHZee/M/dIpgC1npsRFi5aiWhzl+VWtzCLbwVADe7tdXlo4RsyB+j7dvtgB6lsLQGorXxe3wM7ZAvwHOqrNpioKbMDUBtzWbzM5EvPZl5UV+tqW+HymmwC+i7LO1GVS/mBTYDq1l9I1BvZBYykq45lpnXlWQbQvftLumQbsAz1/seBbYByVRl/bAPUDsqZEgLArsq5HgRAN66r4iQCMJRhbLUjggCoqrkoBFDSQhsE8IgGbLR9GjlFT6J8noCuFtcggE8tnYMApgwoiTIGAF1oKug8iDIE0NaOxRgAegQt7cwJAdS0nBQCkBFnym+4eHDPb7AR8DkBOAIOyRBAU2bAogwBNLTfKxDAmgF3ogwB1LXDJQRQZEBVlCGAiXbmBwEKL5U8p74QwMgTT28knv//73sKSAEp4JwA6EsD8GsP8Isb6Ksn+Msz8Os/38MM7gJG7lmzAAAAAElFTkSuQmCC</Image>
-<Url type="application/x-suggestions+json" method="GET"
- template="https://search.yahoo.com/sugg/ff">
- <Param name="output" value="fxjson" />
- <Param name="appid" value="ffm" />
- <Param name="command" value="{searchTerms}" />
- <Param name="nresults" value="4" />
-</Url>
-<!-- phone search -->
-<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search" rel="searchform">
- <Param name="ei" value="UTF-8" />
- <Param name="hspart" value="mozilla" />
- <Param name="hsimp" value="yhsm-002" />
- <Param name="p" value="{searchTerms}" />
-</Url>
-<!-- tablet search -->
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://search.yahoo.com/yhs/search">
- <Param name="ei" value="UTF-8" />
- <Param name="hspart" value="mozilla" />
- <Param name="hsimp" value="yhst-002" />
- <Param name="p" value="{searchTerms}" />
-</Url>
-<!-- phone Search activity -->
-<Url type="text/html" method="GET" rel="mobile" template="https://search.yahoo.com/yhs/search">
- <Param name="ei" value="UTF-8" />
- <Param name="hspart" value="mozilla" />
- <Param name="hsimp" value="yhsm-001" />
- <Param name="p" value="{searchTerms}" />
-</Url>
-<!-- Tablet Search activity -->
-<Url type="application/x-moz-tabletsearch" method="GET"
- rel="mobile" template="https://search.yahoo.com/yhs/search">
- <Param name="ei" value="UTF-8" />
- <Param name="hspart" value="mozilla" />
- <Param name="hsimp" value="yhst-002" />
- <Param name="p" value="{searchTerms}" />
-</Url>
-</SearchPlugin>