Unified Diff: mobile/android/base/strings.xml.in
Issue 30018598:
Issue 7281 - Remove Google+ links (Closed)
Patch Set: Adjustments in regards to Anton's comments
Created Feb. 27, 2019, 5 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« mobile/android/base/moz.build ('k')
|
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/strings.xml.in |
| =================================================================== |
| --- a/mobile/android/base/strings.xml.in |
| +++ b/mobile/android/base/strings.xml.in |
| @@ -309,20 +309,19 @@ |
| <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&version=&formatS1;&os=&formatS2;&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> |
| @@ -488,20 +487,16 @@ |
| <!-- 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> |
« no previous file with comments
|
« mobile/android/base/moz.build ('k')
|
mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/StringHelper.java » ('j')
|
no next file with comments »
