Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/base/strings.xml.in

Issue 29341460: Issue 3069 - Change settings label from "Ad blocking" to "Adblock Plus" (Closed)
Patch Set: Leaving changes for just the en-US file as discussed with René Created May 17, 2016, 3:30 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 replaced by the Android OS version (e.g., 14)--> 596 replaced by the Android OS version (e.g., 14)-->
597 <string name="unsupported_sdk_version">Sorry! This &brandShortName; won\'t wor k on this device (&formatS1;, &formatS2;). Please download the correct version.< /string> 597 <string name="unsupported_sdk_version">Sorry! This &brandShortName; won\'t wor k on this device (&formatS1;, &formatS2;). Please download the correct version.< /string>
598 598
599 <!-- Adblock Browser --> 599 <!-- Adblock Browser -->
600 <string name="abb_block_ads">&abb_block_ads;</string> 600 <string name="abb_block_ads">&abb_block_ads;</string>
601 601
602 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring> 602 <string name="abb_pref_category_adblocking">&abb_pref_category_adblocking;</st ring>
603 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string> 603 <string name="abb_pref_category_adblocking_summary">&abb_pref_category_adblock ing_summary;</string>
604 <string name="abb_pref_category_adblocking_summary_main">&abb_pref_category_ad blocking_summary_main;</string> 604 <string name="abb_pref_category_adblocking_summary_main">&abb_pref_category_ad blocking_summary_main;</string>
605 605
606 <string name="abb_pref_category_abp">&abb_pref_category_abp;</string>
607
606 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string > 608 <string name="abb_pref_category_blocking">&abb_pref_category_blocking;</string >
607 609
608 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string> 610 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string>
609 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string> 611 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string>
610 612
611 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring> 613 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring>
612 614
613 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string> 615 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string>
614 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string> 616 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string>
615 617
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 657 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
656 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 658 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
657 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 659 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
658 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 660 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
659 661
660 <!-- This is currently just a filler-text --> 662 <!-- This is currently just a filler-text -->
661 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 663 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
662 664
663 </resources> 665 </resources>
664 666
OLDNEW

Powered by Google App Engine
This is Rietveld