Issue 7281 - Remove Google+ links

mobile/android/base/strings.xml.in

 #filter substitution
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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/. -->
 
 <!DOCTYPE resources [
 #includesubst @BRANDPATH@
 #includesubst @STRINGSPATH@
 #includesubst @ABBSTRINGSPATH@
@@ skipping 296 matching lines @@
   <string name="pref_default_browser_mozilla_support_tablet">&pref_default_browser_mozilla_support_tablet;</string>
 
   <string name="pref_about_firefox">&pref_about_firefox;</string>
 
   <string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
   <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 -->
   <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%LOCALE% -->
   <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_android_faq&amp;version=&formatS1;&amp;os=&formatS2;&amp;lang=&formatS3;</string>
 
   <string name="pref_vendor_feedback">&pref_vendor_feedback;</string>
-  <!-- Changed Feedback URL. See https://issues.adblockplus.org/ticket/6015 -->
-  <!-- https://adblockplus.org/redirect?link=adblock_browser_android_beta_community
+  <!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-settings
        This should be kept in sync with the "app.feedbackURL" pref defined in mobile.js -->
-  <string name="feedback_link">https://adblockplus.org/redirect?link=adblock_browser_android_beta_community</string>
+  <string name="feedback_link">https://input.mozilla.org/feedback/android/&formatS1;/&formatS2;/?utm_source=feedback-settings</string>
 
   <string name="pref_dialog_set_default">&pref_dialog_set_default;</string>
   <string name="pref_default">&pref_dialog_default;</string>
   <string name="pref_dialog_remove">&pref_dialog_remove;</string>
   <string name="pref_dialog_activitystream_header_content">&pref_dialog_activitystream_header_content;</string>
   <string name="pref_dialog_activitystream_recentBookmarks">&pref_dialog_activitystream_recentBookmarks;</string>
   <string name="pref_dialog_activitystream_visited">&pref_dialog_activitystream_visited;</string>
 
 
   <string name="pref_search_last_toast">&pref_search_last_toast;</string>
@@ skipping 155 matching lines @@
   <string name="bookmarkdefaults_url_about_browser">about:</string>
 
   <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_adblock_plus -->
   <string name="bookmarkdefaults_title_adblock_plus">&abb_bookmarks_adblock_plus;</string>
   <string name="bookmarkdefaults_url_adblock_plus">https://adblockplus.org</string>
 
   <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_acceptable_ads -->
   <string name="bookmarkdefaults_title_acceptable_ads">&abb_bookmarks_acceptable_ads;</string>
   <string name="bookmarkdefaults_url_acceptable_ads">https://acceptableads.com</string>
 
-  <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_beta_community -->
-  <string name="bookmarkdefaults_title_beta_community">&abb_bookmarks_beta_community;</string>
-  <string name="bookmarkdefaults_url_beta_community">https://adblockplus.org/redirect?link=adblock_browser_android_beta_community</string>
-
   <!-- Site identity popup -->
   <string name="identity_connection_secure">&identity_connection_secure;</string>
   <string name="identity_connection_insecure">&identity_connection_insecure;</string>
   <string name="identity_connection_chromeui">&identity_connection_chromeui;</string>
 
   <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string>
   <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</string>
   <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</string>
   <string name="mixed_content_protection_disabled">&mixed_content_protection_disabled1;</string>
 
@@ skipping 210 matching lines @@
   <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>