Bug 939834 - Removed Google Reader, updated icon for Wikipedia, basic Metro set-up.
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Tue, 19 Nov 2013 16:42:20 +0100
changeset 1419 38d791d1dab8bc6b416e71e26a60ee896a925732
parent 1418 3cf0582e622e8624a22df8c6a316de82abf3710e
child 1420 6dfaf93633b80af0c6048cd3f8efa250a9578f4a
child 1540 2a6beaacd8d38a65a8717a87a86c454182eb5cb7
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
bugs939834
Bug 939834 - Removed Google Reader, updated icon for Wikipedia, basic Metro set-up.
browser/chrome/browser-region/region.properties
browser/metro/chrome/region.properties
browser/searchplugins/metrolist.txt
browser/searchplugins/wikipedia-ca.xml
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -8,20 +8,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=Bing
 
 # This is the default set of web based feed handlers shown in the reader
 # selection UI
 browser.contentHandlers.types.0.title=Netvibes
 browser.contentHandlers.types.0.uri=http://www.netvibes.com/subscribe.php?url=%s
-browser.contentHandlers.types.1.title=Google
-browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-browser.contentHandlers.types.2.title=My Yahoo
-browser.contentHandlers.types.2.uri=http://add.my.yahoo.com/rss?url=%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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
 
 # increment this number when anything gets changed in the list below.  This will
--- a/browser/metro/chrome/region.properties
+++ b/browser/metro/chrome/region.properties
@@ -6,14 +6,13 @@
 # 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=Bing
new file mode 100644
--- /dev/null
+++ b/browser/searchplugins/metrolist.txt
@@ -0,0 +1,6 @@
+googlemetrofx
+bingmetrofx
+twitter
+wikipedia-ca
+diec2
+
--- a/browser/searchplugins/wikipedia-ca.xml
+++ b/browser/searchplugins/wikipedia-ca.xml
@@ -1,17 +1,17 @@
 <!-- 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>Viquipèdia (ca)</ShortName>
 <Description>L'enciclopèdia lliure</Description>
 <InputEncoding>UTF-8</InputEncoding>
-<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAB3RJTUUH1QcEDg4lbHy4uAAAAAlwSFlzAAALEgAACxIB0t1%2B%2FAAAAARnQU1BAACxjwv8YQUAAAAwUExURfz9%2FLm6ucjHyNjZ2EhHSGlqaSgoKKmoqYSDhDw6PHp7epiYmFdYV%2Bno6QQCBBkYGd16BFcAAAB6SURBVHjalY9JEsMwCAQHs0pI1v9%2Fa%2BQ4qRxyCcehuhmA%2F4eGEFw6ow9mHUAYAWI8IzE1AV46kcsPRQUbGusAi4UX77dlBZBn0TPo9oowuEnR%2FXUoTq%2Bg3JnPaRvTtSliPkG07twt413OzRxkdnzqbi3UvvrvHdPP3y6XfQLtEF%2Fk3gAAAABJRU5ErkJggg%3D%3D</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="text/html" method="GET" template="http://ca.wikipedia.org/wiki/Especial:Cerca">
   <Param name="search" value="{searchTerms}"/>
   <Param name="sourceid" value="mozilla-search" />
 </Url>
 <Url type="application/x-suggestions+json" method="GET" template="http://ca.wikipedia.org/w/api.php">
     <Param name="action" value="opensearch" />
     <Param name="search" value="{searchTerms}" />
 </Url>