Delta Between Two Patch Sets: mobile/android/base/strings.xml.in
Issue 29370610:
Issue 4760 - Change Ad blocking settings text (Closed)
Left Patch Set:
Created Jan. 2, 2017, 4:07 p.m.
Right Patch Set: Renaming category_filters to category_languages
Created Jan. 2, 2017, 5:09 p.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_abp.xml ('k')
|
no next file »
|
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 @ABBSTRINGSPATH@ |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 614 <string name="abb_block_ads">&abb_block_ads;</string> | 614 <string name="abb_block_ads">&abb_block_ads;</string> |
| 615 | 615 |
| 616 <string name="abb_pref_category_abp">&abb_pref_category_abp;</string> | 616 <string name="abb_pref_category_abp">&abb_pref_category_abp;</string> |
| 617 <string name="abb_pref_category_abp_summary">&abb_pref_category_abp_summary;</ string> | 617 <string name="abb_pref_category_abp_summary">&abb_pref_category_abp_summary;</ string> |
| 618 | 618 |
| 619 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring> | 619 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring> |
| 620 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string> | 620 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string> |
| 621 | 621 |
| 622 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string > | 622 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string > |
| 623 | 623 |
| 624 <string name="abb_pref_category_filters">&abb_pref_category_filters;</string> | 624 <string name="abb_pref_category_languages">&abb_pref_category_languages;</stri ng> |
| 625 <string name="abb_pref_category_filters_summary">&abb_pref_category_filters_su mmary;</string> | 625 <string name="abb_pref_category_languages_summary">&abb_pref_category_language s_summary;</string> |
| 626 | 626 |
| 627 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string> | 627 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string> |
| 628 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string> | 628 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string> |
| 629 | 629 |
| 630 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring> | 630 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring> |
| 631 | 631 |
| 632 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string> | 632 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string> |
| 633 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string> | 633 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string> |
| 634 | 634 |
| 635 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> | 635 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 674 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> | 674 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> |
| 675 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> | 675 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> |
| 676 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> | 676 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> |
| 677 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> | 677 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> |
| 678 | 678 |
| 679 <!-- This is currently just a filler-text --> | 679 <!-- This is currently just a filler-text --> |
| 680 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> | 680 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> |
| 681 | 681 |
| 682 </resources> | 682 </resources> |
| 683 | 683 |
| LEFT | RIGHT |
« mobile/android/base/resources/xml/preferences_abb_abp.xml ('k')
|
no next file »
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
