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

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

Issue 29543774: Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen (Closed)
Patch Set: Created Sept. 13, 2017, 5:01 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 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 <string name="abb_pref_category_languages_summary">&abb_pref_category_language s_summary;</string> 665 <string name="abb_pref_category_languages_summary">&abb_pref_category_language s_summary;</string>
666 666
667 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string> 667 <string name="abb_pref_category_more_blocking">&abb_pref_category_more_blockin g;</string>
668 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string> 668 <string name="abb_pref_category_more_blocking_summary">&abb_pref_category_more _blocking_summary;</string>
669 669
670 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring> 670 <string name="abb_pref_category_exceptions">&abb_pref_category_exceptions;</st ring>
671 671
672 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string> 672 <string name="abb_pref_category_acceptable_ads">&abb_pref_category_acceptable_ ads;</string>
673 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string> 673 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string>
674 674
675 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> 675 <string name="abb_pref_category_whitelisted_websites">&abb_pref_category_white listed_websites;</string>
676 <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_ whitelisted_sites_summary;</string> 676 <string name="abb_pref_category_whitelisted_websites_summary">&abb_pref_catego ry_whitelisted_websites_summary;</string>
677 677
678 <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</ string> 678 <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</ string>
679 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string> 679 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string>
680 680
681 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > 681 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string >
682 682
683 <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_l ist;</string> 683 <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_l ist;</string>
684 684
685 <string name="abb_subscription_disable_tracking">&abb_subscription_disable_tra cking;</string> 685 <string name="abb_subscription_disable_tracking">&abb_subscription_disable_tra cking;</string>
686 <string name="abb_subscription_disable_malware">&abb_subscription_disable_malw are;</string> 686 <string name="abb_subscription_disable_malware">&abb_subscription_disable_malw are;</string>
687 <string name="abb_subscription_disable_anti_adblock">&abb_subscription_disable _anti_adblock;</string> 687 <string name="abb_subscription_disable_anti_adblock">&abb_subscription_disable _anti_adblock;</string>
688 <string name="abb_subscription_disable_social_media">&abb_subscription_disable _social_media;</string> 688 <string name="abb_subscription_disable_social_media">&abb_subscription_disable _social_media;</string>
689 689
690 <string name="abb_add_subscription_url">&abb_add_subscription_url;</string> 690 <string name="abb_add_subscription_url">&abb_add_subscription_url;</string>
691 <string name="abb_add_subscription_button">&abb_add_subscription_button;</stri ng> 691 <string name="abb_add_subscription_button">&abb_add_subscription_button;</stri ng>
692 <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</stri ng> 692 <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</stri ng>
693 693
694 <string name="abb_whitelisted_websites_loading">&abb_whitelisted_websites_load ing;</string>
695 <string name="abb_whitelisted_websites_add_button">&abb_whitelisted_websites_a dd_button;</string>
696 <string name="abb_whitelist_website_dialog_title">&abb_whitelist_website_dialo g_title;</string>
697 <string name="abb_whitelist_website_dialog_message">&abb_whitelist_website_dia log_message;</string>
698 <string name="abb_whitelist_website_dialog_hint">&abb_whitelist_website_dialog _hint;</string>
699 <string name="abb_whitelist_remove_dialog_title">&abb_whitelist_remove_dialog_ title;</string>
700 <string name="abb_whitelist_remove_dialog_message">&abb_whitelist_remove_dialo g_message;</string>
701
694 <string name="abb_invalid_url">&abb_invalid_url;</string> 702 <string name="abb_invalid_url">&abb_invalid_url;</string>
695 703
696 <!-- Adblock Browser onboarding (first run page [FRP]) --> 704 <!-- Adblock Browser onboarding (first run page [FRP]) -->
697 <string name="abb_frp_button_1">&abb_frp_button_1;</string> 705 <string name="abb_frp_button_1">&abb_frp_button_1;</string>
698 <string name="abb_frp_button_2">&abb_frp_button_2;</string> 706 <string name="abb_frp_button_2">&abb_frp_button_2;</string>
699 <string name="abb_frp_button_3">&abb_frp_button_3;</string> 707 <string name="abb_frp_button_3">&abb_frp_button_3;</string>
700 708
701 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string> 709 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string>
702 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string> 710 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string>
703 <string name="abb_frp_headline_3">&abb_frp_headline_3;</string> 711 <string name="abb_frp_headline_3">&abb_frp_headline_3;</string>
(...skipping 10 matching lines...) Expand all
714 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 722 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
715 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 723 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
716 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 724 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
717 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 725 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
718 726
719 <!-- This is currently just a filler-text --> 727 <!-- This is currently just a filler-text -->
720 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 728 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
721 729
722 </resources> 730 </resources>
723 731
OLDNEW

Powered by Google App Engine
This is Rietveld