Side by Side 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.
| Left: | ||
| Right: |
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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 #filter substitution | 1 #filter substitution |
| 2 <?xml version="1.0" encoding="utf-8"?> | 2 <?xml version="1.0" encoding="utf-8"?> |
| 3 <!-- This Source Code Form is subject to the terms of the Mozilla Public | 3 <!-- This Source Code Form is subject to the terms of the Mozilla Public |
| 4 - License, v. 2.0. If a copy of the MPL was not distributed with this | 4 - License, v. 2.0. If a copy of the MPL was not distributed with this |
| 5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> | 5 - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
| 6 | 6 |
| 7 <!DOCTYPE resources [ | 7 <!DOCTYPE resources [ |
| 8 #includesubst @BRANDPATH@ | 8 #includesubst @BRANDPATH@ |
| 9 #includesubst @STRINGSPATH@ | 9 #includesubst @STRINGSPATH@ |
| 10 #includesubst @ABBSTRINGSPATH@ | 10 #includesubst @ABBSTRINGSPATH@ |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 <string name="pref_default_browser_mozilla_support_tablet">&pref_default_brows er_mozilla_support_tablet;</string> | 307 <string name="pref_default_browser_mozilla_support_tablet">&pref_default_brows er_mozilla_support_tablet;</string> |
| 308 | 308 |
| 309 <string name="pref_about_firefox">&pref_about_firefox;</string> | 309 <string name="pref_about_firefox">&pref_about_firefox;</string> |
| 310 | 310 |
| 311 <string name="pref_vendor_faqs">&pref_vendor_faqs;</string> | 311 <string name="pref_vendor_faqs">&pref_vendor_faqs;</string> |
| 312 <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 --> | 312 <!-- Changed FAQ link. See https://issues.adblockplus.org/ticket/3220 --> |
| 313 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%L OCALE% --> | 313 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_faq&lang=%L OCALE% --> |
| 314 <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_ android_faq&version=&formatS1;&os=&formatS2;&lang=&formatS3;</string > | 314 <string name="faq_link">https://adblockplus.org/redirect?link=adblock_browser_ android_faq&version=&formatS1;&os=&formatS2;&lang=&formatS3;</string > |
| 315 | 315 |
| 316 <string name="pref_vendor_feedback">&pref_vendor_feedback;</string> | 316 <string name="pref_vendor_feedback">&pref_vendor_feedback;</string> |
| 317 <!-- Changed Feedback URL. See https://issues.adblockplus.org/ticket/6015 --> | 317 <!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_sourc e=feedback-settings |
| 318 <!-- https://adblockplus.org/redirect?link=adblock_browser_android_beta_commun ity | |
| 319 This should be kept in sync with the "app.feedbackURL" pref defined in mo bile.js --> | 318 This should be kept in sync with the "app.feedbackURL" pref defined in mo bile.js --> |
| 320 <string name="feedback_link">https://adblockplus.org/redirect?link=adblock_bro wser_android_beta_community</string> | 319 <string name="feedback_link">https://input.mozilla.org/feedback/android/&forma tS1;/&formatS2;/?utm_source=feedback-settings</string> |
| 321 | 320 |
| 322 <string name="pref_dialog_set_default">&pref_dialog_set_default;</string> | 321 <string name="pref_dialog_set_default">&pref_dialog_set_default;</string> |
| 323 <string name="pref_default">&pref_dialog_default;</string> | 322 <string name="pref_default">&pref_dialog_default;</string> |
| 324 <string name="pref_dialog_remove">&pref_dialog_remove;</string> | 323 <string name="pref_dialog_remove">&pref_dialog_remove;</string> |
| 325 <string name="pref_dialog_activitystream_header_content">&pref_dialog_activity stream_header_content;</string> | 324 <string name="pref_dialog_activitystream_header_content">&pref_dialog_activity stream_header_content;</string> |
| 326 <string name="pref_dialog_activitystream_recentBookmarks">&pref_dialog_activit ystream_recentBookmarks;</string> | 325 <string name="pref_dialog_activitystream_recentBookmarks">&pref_dialog_activit ystream_recentBookmarks;</string> |
| 327 <string name="pref_dialog_activitystream_visited">&pref_dialog_activitystream_ visited;</string> | 326 <string name="pref_dialog_activitystream_visited">&pref_dialog_activitystream_ visited;</string> |
| 328 | 327 |
| 329 | 328 |
| 330 <string name="pref_search_last_toast">&pref_search_last_toast;</string> | 329 <string name="pref_search_last_toast">&pref_search_last_toast;</string> |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 486 <string name="bookmarkdefaults_url_about_browser">about:</string> | 485 <string name="bookmarkdefaults_url_about_browser">about:</string> |
| 487 | 486 |
| 488 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblock_plus --> | 487 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ adblock_plus --> |
| 489 <string name="bookmarkdefaults_title_adblock_plus">&abb_bookmarks_adblock_plus ;</string> | 488 <string name="bookmarkdefaults_title_adblock_plus">&abb_bookmarks_adblock_plus ;</string> |
| 490 <string name="bookmarkdefaults_url_adblock_plus">https://adblockplus.org</stri ng> | 489 <string name="bookmarkdefaults_url_adblock_plus">https://adblockplus.org</stri ng> |
| 491 | 490 |
| 492 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptable_ads --> | 491 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ acceptable_ads --> |
| 493 <string name="bookmarkdefaults_title_acceptable_ads">&abb_bookmarks_acceptable _ads;</string> | 492 <string name="bookmarkdefaults_title_acceptable_ads">&abb_bookmarks_acceptable _ads;</string> |
| 494 <string name="bookmarkdefaults_url_acceptable_ads">https://acceptableads.com</ string> | 493 <string name="bookmarkdefaults_url_acceptable_ads">https://acceptableads.com</ string> |
| 495 | 494 |
| 496 <!-- Icon is automatically generated from R.drawable.bookmarkdefaults_favicon_ beta_community --> | |
| 497 <string name="bookmarkdefaults_title_beta_community">&abb_bookmarks_beta_commu nity;</string> | |
| 498 <string name="bookmarkdefaults_url_beta_community">https://adblockplus.org/red irect?link=adblock_browser_android_beta_community</string> | |
| 499 | |
| 500 <!-- Site identity popup --> | 495 <!-- Site identity popup --> |
| 501 <string name="identity_connection_secure">&identity_connection_secure;</string > | 496 <string name="identity_connection_secure">&identity_connection_secure;</string > |
| 502 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring> | 497 <string name="identity_connection_insecure">&identity_connection_insecure;</st ring> |
| 503 <string name="identity_connection_chromeui">&identity_connection_chromeui;</st ring> | 498 <string name="identity_connection_chromeui">&identity_connection_chromeui;</st ring> |
| 504 | 499 |
| 505 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> | 500 <string name="mixed_content_blocked_all">&mixed_content_blocked_all1;</string> |
| 506 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g> | 501 <string name="mixed_content_blocked_some">&mixed_content_blocked_some1;</strin g> |
| 507 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring> | 502 <string name="mixed_content_display_loaded">&mixed_content_display_loaded1;</s tring> |
| 508 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string> | 503 <string name="mixed_content_protection_disabled">&mixed_content_protection_dis abled1;</string> |
| 509 | 504 |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 720 <string name="abb_adblocking_none_selected">&abb_adblocking_none_selected;</st ring> | 715 <string name="abb_adblocking_none_selected">&abb_adblocking_none_selected;</st ring> |
| 721 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> | 716 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> |
| 722 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> | 717 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> |
| 723 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> | 718 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> |
| 724 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> | 719 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> |
| 725 | 720 |
| 726 <!-- This is currently just a filler-text --> | 721 <!-- This is currently just a filler-text --> |
| 727 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> | 722 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> |
| 728 | 723 |
| 729 </resources> | 724 </resources> |
| OLD | NEW |
« 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 »
