Bug 1036875 - [ca] Multiple regressions in region.properties (mobile, desktop)
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Thu, 10 Jul 2014 15:38:47 +0200
changeset 1562 5024653124c9812256770931f02688295cde89f0
parent 1545 87ef8fb0aa413f44c20a2110b46388763689018e
child 1567 aced4759814328da7bb70bb69d9aaaf10797f655
push id700
push userfrancesco.lodolo@mozillaitalia.org
push dateThu, 10 Jul 2014 13:39:05 +0000
bugs1036875
Bug 1036875 - [ca] Multiple regressions in region.properties (mobile, desktop)
browser/chrome/browser-region/region.properties
mobile/chrome/region.properties
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -1,39 +1,45 @@
 # 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/.
 
+# LOCALIZATION NOTE: REVIEW_REQUIRED
+# Please do not commit any changes to this file without a review from
+# the l10n-drivers team (this includes en-US). In order to get one,
+# please file a bug, add the "productization" keyword and CC l10n@mozilla.com.
+
 # Default search engine
 browser.search.defaultenginename=Google
 
-# Search engine order (order displayed in the search bar dropdown)s
+# Search engine order (order displayed in the search bar dropdown)
 browser.search.order.1=Google
 browser.search.order.2=Bing
-browser.search.order.3=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=https://add.my.yahoo.com/rss?url=%s
+browser.contentHandlers.types.0.uri=http://www.netvibes.com/subscribe.php?url=%s
+browser.contentHandlers.types.1.title=My Yahoo
+browser.contentHandlers.types.1.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 
 # 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=3
+gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for webcal:
 gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
 
 # The default set of protocol handlers for mailto:
 gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+gecko.handlerService.schemes.mailto.0.uriTemplate=https://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
 
 # The default set of protocol handlers for irc:
 gecko.handlerService.schemes.irc.0.name=Mibbit
 gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
 
 # The default set of protocol handlers for ircs:
--- a/mobile/chrome/region.properties
+++ b/mobile/chrome/region.properties
@@ -1,33 +1,38 @@
 # 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/.
 
+# LOCALIZATION NOTE: REVIEW_REQUIRED
+# Please do not commit any changes to this file without a review from
+# the l10n-drivers team (this includes en-US). In order to get one,
+# please file a bug, add the "productization" keyword and CC l10n@mozilla.com.
+
 # Default search engine
 browser.search.defaultenginename=Google
 
-# Search engine order (order displayed in the search bar dropdown)s
+# Search engine order (order displayed in the search bar dropdown)
 browser.search.order.1=Google
-browser.search.order.2=Yahoo
-browser.search.order.3=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=Bloglines
+browser.contentHandlers.types.1.uri=http://www.bloglines.com/login?r=/sub/%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
 # 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=3
+gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for webcal:
 gecko.handlerService.schemes.webcal.0.name=30 Boxes
-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
 
 # The default set of protocol handlers for mailto:
 gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
+gecko.handlerService.schemes.mailto.0.uriTemplate=https://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=https://add.my.yahoo.com/rss?url=%s