Issue 3127 - Merge conflicts, base 42.0.1

mobile/locales/en-US/chrome/region.properties

Index: mobile/locales/en-US/chrome/region.properties
diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
index 3a9144278086035ca3591a14e3a425a3ac7dc0b4..9d2741b38bbcdb118531da0edc88f79394707b48 100644
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -46,45 +46,19 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
 # browser.suggestedsites.NAME.title=Displayed name
 # browser.suggestedsites.NAME.url=Website URL
 # browser.suggestedsites.NAME.bgcolor= Color (hex format)
-browser.suggestedsites.list.0=mozilla
-browser.suggestedsites.list.1=fxmarketplace
-browser.suggestedsites.list.2=fxaddons
-browser.suggestedsites.list.3=fxsupport
+browser.suggestedsites.list.0=adblockplus
+browser.suggestedsites.list.1=acceptableads
+browser.suggestedsites.list.2=adblockbrowserbetacommunity
 
-browser.suggestedsites.mozilla.title=The Mozilla Project
-browser.suggestedsites.mozilla.url=https://www.mozilla.org/en-US/
-browser.suggestedsites.mozilla.bgcolor=#ce4e41
-browser.suggestedsites.mozilla.trackingid=632
+browser.suggestedsites.adblockplus.title=Adblock Plus
+browser.suggestedsites.adblockplus.url=https://adblockplus.org/en/
+browser.suggestedsites.adblockplus.bgcolor=#cf0016
 
-browser.suggestedsites.fxmarketplace.title=Firefox Marketplace
-browser.suggestedsites.fxmarketplace.url=https://marketplace.firefox.com/
-browser.suggestedsites.fxmarketplace.bgcolor=#0096dd
-browser.suggestedsites.fxmarketplace.trackingid=629
+browser.suggestedsites.acceptableads.title=Acceptable Ads
+browser.suggestedsites.acceptableads.url=https://acceptableads.org/en/
+browser.suggestedsites.acceptableads.bgcolor=#69a952
 
-browser.suggestedsites.fxaddons.title=Add-ons: Customize Firefox
-browser.suggestedsites.fxaddons.url=https://addons.mozilla.org/en-US/android/
-browser.suggestedsites.fxaddons.bgcolor=#62be06
-browser.suggestedsites.fxaddons.trackingid=630
+browser.suggestedsites.adblockbrowserbetacommunity.title=Beta community
+browser.suggestedsites.adblockbrowserbetacommunity.url=https://adblockplus.org/redirect?link=adblock_browser_android_beta_community
+browser.suggestedsites.adblockbrowserbetacommunity.bgcolor=#f7f7f7
 
-browser.suggestedsites.fxsupport.title=Firefox Help and Support
-browser.suggestedsites.fxsupport.url=https://support.mozilla.org/en-US/products/mobile
-browser.suggestedsites.fxsupport.bgcolor=#f37c00
-browser.suggestedsites.fxsupport.trackingid=631
-
-browser.suggestedsites.restricted.list.0=restricted_fxsupport
-browser.suggestedsites.restricted.list.1=webmaker
-browser.suggestedsites.restricted.list.2=restricted_mozilla
-
-browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for restricted profiles on Android tablets
-browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/controlledaccess
-browser.suggestedsites.restricted_fxsupport.bgcolor=#f37c00
-
-browser.suggestedsites.webmaker.title=Learn the Web: Mozilla Webmaker
-browser.suggestedsites.webmaker.url=https://webmaker.org/
-browser.suggestedsites.webmaker.bgcolor=#f37c00
-
-# LOCALIZATION NOTE: browser.suggestedsites.restricted_mozilla.url must be different from browser.suggestedsites.mozilla.url
-browser.suggestedsites.restricted_mozilla.title=The Mozilla Project
-browser.suggestedsites.restricted_mozilla.url=https://www.mozilla.org
-browser.suggestedsites.restricted_mozilla.bgcolor=#ce4e41
-browser.suggestedsites.restricted_mozilla.trackingid=632