Issue 3127 - Merge conflicts, base 42.0.1

mobile/android/base/strings.xml.in

Index: mobile/android/base/strings.xml.in
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index 776ab02277cfc31cfa09091492fafeed242959f4..e51fde15bde5fe75d74baeb163d73ad21c0c9ef0 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -7,6 +7,7 @@
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
+#includesubst @ABBSTRINGSPATH@
 #includesubst @SYNCSTRINGSPATH@
 #includesubst @SEARCHSTRINGSPATH@
 
@@ -137,7 +138,9 @@
   <string name="pref_category_display_summary">&pref_category_display_summary;</string>
   <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
   <string name="pref_category_privacy_summary">&pref_category_privacy_summary2;</string>
-  <string name="pref_category_vendor">&pref_category_vendor;</string>
+  <!-- We changed this to display the brand name instead of the vendor name
+       in Adblock Browser, see: https://issues.adblockplus.org/ticket/2980 -->
+  <string name="pref_category_vendor">&brandShortName;</string>
   <string name="pref_category_vendor_summary">&pref_category_vendor_summary;</string>
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
   <string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
@@ -175,7 +178,9 @@
   <string name="pref_header_display">&pref_header_display;</string>
   <string name="pref_header_privacy_short">&pref_header_privacy_short;</string>
   <string name="pref_header_language">&pref_header_language;</string>
-  <string name="pref_header_vendor">&pref_header_vendor;</string>
+  <!-- We changed this to display the brand name instead of the vendor name
+       in Adblock Browser, see: https://issues.adblockplus.org/ticket/2980 -->
+  <string name="pref_header_vendor">&brandShortName;</string>
   <string name="pref_header_devtools">&pref_header_devtools;</string>
 
   <string name="pref_learn_more">&pref_learn_more;</string>
@@ -451,19 +456,19 @@
   <!-- Default bookmarks. We used to use bookmark titles shared with XUL from mobile's
        profile/bookmarks.inc (see bug 964946). Don't expose the URLs to L10N. -->
   <string name="bookmarkdefaults_title_aboutfirefox">@bookmarks_aboutBrowser@</string>
-  <string name="bookmarkdefaults_url_aboutfirefox">about:firefox</string>
+  <string name="bookmarkdefaults_url_aboutfirefox">about:</string>
 
-  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_addons -->
-  <string name="bookmarkdefaults_title_addons">@bookmarks_addons@</string>
-  <string name="bookmarkdefaults_url_addons">https://addons.mozilla.org/android/</string>
+  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_adblockplus -->
+  <string name="bookmarkdefaults_title_adblockplus">@bookmarks_adblockplus@</string>
+  <string name="bookmarkdefaults_url_adblockplus">https://adblockplus.org</string>
 
-  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_support -->
-  <string name="bookmarkdefaults_title_support">@bookmarks_support@</string>
-  <string name="bookmarkdefaults_url_support">https://support.mozilla.org/products/mobile</string>
+  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_acceptableads -->
+  <string name="bookmarkdefaults_title_acceptableads">@bookmarks_acceptableads@</string>
+  <string name="bookmarkdefaults_url_acceptableads">https://acceptableads.org</string>
 
-  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_marketplace -->
-  <string name="bookmarkdefaults_title_marketplace">@bookmarks_marketplace@</string>
-  <string name="bookmarkdefaults_url_marketplace">https://marketplace.firefox.com/</string>
+  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_adblockbrowserbetacommunity -->
+  <string name="bookmarkdefaults_title_adblockbrowserbetacommunity">@bookmarks_adblockbrowserbetacommunity@</string>
+  <string name="bookmarkdefaults_url_adblockbrowserbetacommunity">https://adblockplus.org/redirect?link=adblock_browser_android_beta_community</string>
 
   <!-- Site identity popup -->
   <string name="identity_connection_secure">&identity_connection_secure;</string>
@@ -570,4 +575,69 @@
   <string name="intent_uri_cannot_open">&intent_uri_cannot_open;</string>
 
   <string name="devtools_auth_scan_header">&devtools_auth_scan_header;</string>
+
+  <!-- Adblock Browser -->
+  <string name="abb_block_ads">&abb_block_ads;</string>
+
+  <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</string>
+  <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblocking_summary;</string>
+  <string name="abb_pref_category_adblocking_summary_main">&abb_pref_category_adblocking_summary_main;</string>
+
+  <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string>
+
+  <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blocking;</string>
+  <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more_blocking_summary;</string>
+
+  <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</string>
+
+  <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ads;</string>
+  <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acceptable_ads_summary;</string>
+
+  <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelisted_sites;</string>
+  <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_whitelisted_sites_summary;</string>
+
+  <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</string>
+  <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string>
+
+  <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string>
+
+  <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_list;</string>
+
+  <string name="abb_subscription_disable_tracking">&abb_subscription_disable_tracking;</string>
+  <string name="abb_subscription_disable_malware">&abb_subscription_disable_malware;</string>
+  <string name="abb_subscription_disable_anti_adblock">&abb_subscription_disable_anti_adblock;</string>
+  <string name="abb_subscription_disable_social_media">&abb_subscription_disable_social_media;</string>
+
+  <string name="abb_add_subscription_url">&abb_add_subscription_url;</string>
+  <string name="abb_add_subscription_button">&abb_add_subscription_button;</string>
+  <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</string>
+
+  <string name="abb_invalid_url">&abb_invalid_url;</string>
+
+  <!-- Adblock Browser onboarding (first run page [FRP]) -->
+  <string name="abb_frp_button_1">&abb_frp_button_1;</string>
+  <string name="abb_frp_button_2">&abb_frp_button_2;</string>
+  <string name="abb_frp_button_3">&abb_frp_button_3;</string>
+
+  <string name="abb_frp_headline_1">&abb_frp_headline_1;</string>
+  <string name="abb_frp_headline_2">&abb_frp_headline_2;</string>
+  <string name="abb_frp_headline_3">&abb_frp_headline_3;</string>
+
+  <string name="abb_frp_step_1_text">&abb_frp_step_1_text;</string>
+  <string name="abb_frp_step_2_text">&abb_frp_step_2_text;</string>
+  <string name="abb_frp_step_2_text_where">&abb_frp_step_2_text_where;</string>
+  <string name="abb_frp_step_2_text_learn">&abb_frp_step_2_text_learn;</string>
+  <string name="abb_frp_step_3_text">&abb_frp_step_3_text;</string>
+
+  <string name="abb_adblocking_active_languages">&abb_adblocking_active_languages;</string>
+  <string name="abb_adblocking_available_languages">&abb_adblocking_available_languages;</string>
+  <string name="abb_adblocking_none_selected">&abb_adblocking_none_selected;</string>
+  <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</string>
+  <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</string>
+  <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</string>
+  <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
+
+  <!-- This is currently just a filler-text -->
+  <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_category_acceptable_ads_extra_summary;</string>
 </resources>
+