Delta Between Two Patch Sets: mobile/android/base/strings.xml.in
Issue 29322610:
Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)
Left Patch Set: Mostly naming
Created July 28, 2015, 10:58 a.m.
Right Patch Set: Last naming nit
Created July 31, 2015, 9:36 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/resources/xml/preferences_abb_more_blocking.xml ('k')
|
mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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 @SYNCSTRINGSPATH@ | 11 #includesubst @SYNCSTRINGSPATH@ |
| 11 #includesubst @SEARCHSTRINGSPATH@ | 12 #includesubst @SEARCHSTRINGSPATH@ |
| 12 | 13 |
| 13 <!-- C-style format strings. --> | 14 <!-- C-style format strings. --> |
| 14 <!ENTITY formatI "%I"> | 15 <!ENTITY formatI "%I"> |
| 15 <!ENTITY formatS "%s"> | 16 <!ENTITY formatS "%s"> |
| 16 <!ENTITY formatS1 "%1$s"> | 17 <!ENTITY formatS1 "%1$s"> |
| 17 <!ENTITY formatS2 "%2$s"> | 18 <!ENTITY formatS2 "%2$s"> |
| 18 <!ENTITY formatS3 "%3$s"> | 19 <!ENTITY formatS3 "%3$s"> |
| 19 <!ENTITY formatD "%d"> | 20 <!ENTITY formatD "%d"> |
| (...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 545 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> | 546 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> |
| 546 <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_ whitelisted_sites_summary;</string> | 547 <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_ whitelisted_sites_summary;</string> |
| 547 | 548 |
| 548 <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</ string> | 549 <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</ string> |
| 549 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string> | 550 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string> |
| 550 | 551 |
| 551 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > | 552 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > |
| 552 | 553 |
| 553 <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_l ist;</string> | 554 <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_l ist;</string> |
| 554 | 555 |
| 555 <string name="abb_list_disable_tracking">&abb_list_disable_tracking;</string> | 556 <string name="abb_subscription_disable_tracking">&abb_subscription_disable_tra cking;</string> |
| 556 <string name="abb_list_disable_malware">&abb_list_disable_malware;</string> | 557 <string name="abb_subscription_disable_malware">&abb_subscription_disable_malw are;</string> |
| 557 <string name="abb_list_disable_anti_adblock">&abb_list_disable_anti_adblock;</ string> | 558 <string name="abb_subscription_disable_anti_adblock">&abb_subscription_disable _anti_adblock;</string> |
| 558 <string name="abb_list_disable_social_media">&abb_list_disable_social_media;</ string> | 559 <string name="abb_subscription_disable_social_media">&abb_subscription_disable _social_media;</string> |
| 559 | 560 |
| 560 <string name="abb_add_filter_list_url">&abb_add_filter_list_url;</string> | 561 <string name="abb_add_subscription_url">&abb_add_subscription_url;</string> |
| 561 <string name="abb_add_filter_list_button">&abb_add_filter_list_button;</string > | 562 <string name="abb_add_subscription_button">&abb_add_subscription_button;</stri ng> |
| 562 <string name="abb_add_filter_list_adding">&abb_add_filter_list_adding;</string > | 563 <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</stri ng> |
| 563 | 564 |
| 564 <string name="abb_invalid_url">&abb_invalid_url;</string> | 565 <string name="abb_invalid_url">&abb_invalid_url;</string> |
| 565 | 566 |
| 566 <!-- Adblock Browser onboarding (first run page [FRP]) --> | 567 <!-- Adblock Browser onboarding (first run page [FRP]) --> |
| 567 <string name="abb_frp_button_1">&abb_frp_button_1;</string> | 568 <string name="abb_frp_button_1">&abb_frp_button_1;</string> |
| 568 <string name="abb_frp_button_2">&abb_frp_button_2;</string> | 569 <string name="abb_frp_button_2">&abb_frp_button_2;</string> |
| 569 <string name="abb_frp_button_3">&abb_frp_button_3;</string> | 570 <string name="abb_frp_button_3">&abb_frp_button_3;</string> |
| 570 | 571 |
| 571 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string> | 572 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string> |
| 572 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string> | 573 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 584 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> | 585 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> |
| 585 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> | 586 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> |
| 586 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> | 587 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> |
| 587 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> | 588 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> |
| 588 | 589 |
| 589 <!-- This is currently just a filler-text --> | 590 <!-- This is currently just a filler-text --> |
| 590 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> | 591 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> |
| 591 | 592 |
| 592 </resources> | 593 </resources> |
| 593 | 594 |
| LEFT | RIGHT |
