Bug 939834 - Remove Google reader, Yahoo from search.order in mobile region.properties, updated icon and search URL for Wikipedia.
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Mon, 25 Nov 2013 16:16:01 +0100
changeset 1119 2e8b4996b9857f080462143666bf07d49f722770
parent 1118 dd11dccf3d2daa9fa639f70060181d8e34f84c8d
child 1120 6bbb4137ac95e484cb85bce98a3baf01694f51af
push id1
push usersledru@mozilla.com
push dateFri, 05 Dec 2014 02:19:11 +0000
bugs939834
Bug 939834 - Remove Google reader, Yahoo from search.order in mobile region.properties, updated icon and search URL for Wikipedia.
browser/searchplugins/wikipedia-sk.xml
mobile/chrome/region.properties
--- a/browser/searchplugins/wikipedia-sk.xml
+++ b/browser/searchplugins/wikipedia-sk.xml
@@ -1,15 +1,15 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Wikipédia (sk)</ShortName>
 <Description>Wikipédia, slobodná a otvorená encyklopédia</Description>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAMFBMVEUDAwMYGBgoKCg7OztHR0dYWFhqamp7e3uDg4OYmJioqKi6urrHx8fZ2dno6Oj9/f34pRgPAAAAc0lEQVQI12P4DwUMmIyt3r/c75feTWX4of3f6V7nv0yGv2LvJ67J/5fP8D/w/BWN9b/XM/zf2P+T9f+L/Qz/v/j+Nfl/Haj9B9dfo/0zQeaovkrO7wMxmquua/aDGIu0fiudBzG++P5PAtv1+/z/20iWAgCSoWURjfnvaQAAAABJRU5ErkJggg==</Image>
-<Url type="text/html" method="GET" template="http://sk.wikipedia.org/wiki/%C5%A0peci%C3%A1lne:Search">
+<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAA4AQAAJgAAACAgAAAAAAAAJAMAAGQBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAEFSURBVDjLxZPRDYJAEESJoQjpgBoM/9IBtoAl4KcUQQlSAjYgJWAH0gPmyNtkzEEuxkQTPzawc3Ozc3MQTc/JfVPR/wW6a+eKQ+Hyfe54B2wvrfXVqXLDfTCMd3j0VHksrTcH9bl2aZq+BCgEwCCPj9E4TdPYGj0C9CYAKdkmBrIIxiIYbvpbb2sSl8AiA+ywAbJE5YLpCImLU/WRDyIAWRgu4k1s4v50ODru4haYSCk4ntkuM0wcMAINXiPKTJQ9CfgB40phBr8DyFjGKkKEhYhCY4iCDgpAYAM2EZBlhJnsZxQUYBNkSkfBvjDd0ttPeR0mxREQ+OhfYOJ6EmL+l/qzn2kGli9cAF3BOfkAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAIKSURBVFjD7ZdBSgNRDIYLguAB7FLwAkXwBl0JgiDYjQcY8ARduBJKu3I5C0EoWDxAT9AL9AK9QBeCIHQlCM/3DZOSmeZNZ2r1bQyEGV7yXv7kJZlJq6XIOXfs+crzwPPTnvnR863n05ZFufDD/T595Q4eauM37u/pWYwfeX53cegcABcuHg0AkEQE8AKAu4gAXv8BrAEMh0PXbrddt9t1vV4v406nk62laeqm02n2LjKYIuK5WCyyfeiLDF32yLn6TJ5mBFarlev3+9nBMMqsabkYhmezWcEd2ctTE/tYBwhgt14BhtmAV2VaLpdrAHioCW+VdwWy9IMAUBQjJcQFTwGqvcTD+Xy+oc8askZJyAYrnKEokCeWLpQkSSZvBIANYgSDVVEQQJaeyHQu1QIgiQNb6AmrTtaQ9+RFSLa1D4iXgfsrVITloeSFFZlaAEjAUMaXo2DJWQtVRe1OKF5aJUkf0NdglXO5VzQGoI2USwwD3LEl590CtdO3QBoT5WSFV+Q63Oha17ITgMlkslGSGBWPdeNiDR2SL1B6zQFINmOAkFOW5eTSURCdvX6OdUlapaWjsKX0dgOg26/VWHSUKhrPz35ISKwq76R9Wx+kKgC1f0o5mISsypUG3kPj2L/lDzKYvEUwzoh2JtPRdQQAo1jD6afne88H1oTMeH6ZK+x7PB/lQ/CJtvkNEgDh1dr/bVYAAAAASUVORK5CYII=</Image>
+<Url type="text/html" method="GET" template="http://sk.wikipedia.org/wiki/Špeciálne:Hľadanie">
   <Param name="search" value="{searchTerms}"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
 <Url type="application/x-suggestions+json" method="GET" template="http://sk.wikipedia.org/w/api.php">
     <Param name="action" value="opensearch" />
     <Param name="search" value="{searchTerms}" />
 </Url>
-<SearchForm>http://sk.wikipedia.org/wiki/%C5%A0peci%C3%A1lne:Search</SearchForm>
+<SearchForm>http://sk.wikipedia.org/wiki/Špeciálne:Hľadanie</SearchForm>
 </SearchPlugin>
--- a/mobile/chrome/region.properties
+++ b/mobile/chrome/region.properties
@@ -2,17 +2,16 @@
 # 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
 
 # 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=2
 
@@ -25,10 +24,8 @@ gecko.handlerService.schemes.mailto.0.na
 gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
 gecko.handlerService.schemes.mailto.1.name=Gmail
 gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
 
 # 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.com/rss?url=%s
-browser.contentHandlers.types.1.title=Google
-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s