Branch merge
authorEduardo Trápani <eduardo@esperanto.org.uy>
Thu, 21 Nov 2013 10:00:47 -0200
changeset 568 bd6088119cb8fbd7ca59293bba63c68252e3b449
parent 567 fc289c254dabe2922697eb7548f310dfc552a991 (current diff)
parent 566 a988e225d0089b16054b1b1642e6756a60997ee6 (diff)
child 569 fe147d19238c71f477da9f014c23da85e8436fe3
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:46:40 +0000
Branch merge
--- a/browser/metro/chrome/region.properties
+++ b/browser/metro/chrome/region.properties
@@ -6,14 +6,14 @@
 # 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=Bing
+browser.search.defaultenginename=Google
 
-# Search engine order (order displayed in the search bar dropdown)
-browser.search.order.1=Bing
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
+# 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
--- a/browser/searchplugins/metrolist.txt
+++ b/browser/searchplugins/metrolist.txt
@@ -1,4 +1,8 @@
-bingmetrofx
 googlemetrofx
-wikipedia
+wikipedia-eo
+reta-vortaro
+creativecommons
+amazondotcom
 yahoo
+eBay
+bingmetrofx
\ No newline at end of file
--- a/browser/searchplugins/wikipedia-eo.xml
+++ b/browser/searchplugins/wikipedia-eo.xml
@@ -1,15 +1,15 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Vikipedio (eo)</ShortName>
 <Description>Vikipedio, la libera enciklopedio</Description>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
+<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="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="http://eo.wikipedia.org/wiki/Speciala:Search">
+<Url type="text/html" method="GET" template="http://eo.wikipedia.org/wiki/Specialaĵo:Serĉi">
   <Param name="search" value="{searchTerms}"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
-<SearchForm>http://eo.wikipedia.org/wiki/Speciala:Search</SearchForm>
+<SearchForm>http://eo.wikipedia.org/wiki/Specialaĵo:Serĉi</SearchForm>
 </SearchPlugin>