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

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

Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)
Patch Set: Changed screen title Created July 20, 2015, 5 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 @SYNCSTRINGSPATH@ 10 #includesubst @SYNCSTRINGSPATH@
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string> 543 <string name="abb_pref_category_acceptable_ads_summary">&abb_pref_category_acc eptable_ads_summary;</string>
544 544
545 <string name="abb_pref_category_whitelisted_sites">&abb_pref_category_whitelis ted_sites;</string> 545 <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> 546 <string name="abb_pref_category_whitelisted_sites_summary">&abb_pref_category_ whitelisted_sites_summary;</string>
547 547
548 <string name="abb_pref_about_acceptable_ads">&abb_pref_about_acceptable_ads;</ string> 548 <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> 549 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string>
550 550
551 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > 551 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string >
552 552
553 <string name="abb_pref_category_add_other_list">&abb_pref_category_add_other_l ist;</string>
554
555 <string name="abb_disable_tracking">&abb_disable_tracking;</string>
556 <string name="abb_disable_malware">&abb_disable_malware;</string>
557 <string name="abb_disable_anti_adblock">&abb_disable_anti_adblock;</string>
558 <string name="abb_disable_social_media">&abb_disable_social_media;</string>
559
560 <string name="abb_block_list_url">&abb_block_list_url;</string>
561 <string name="abb_block_list_button">&abb_block_list_button;</string>
562 <string name="abb_block_list_adding">&abb_block_list_adding;</string>
563
564 <string name="abb_invalid_url">&abb_invalid_url;</string>
565
553 <!-- Adblock Browser onboarding (first run page [FRP]) --> 566 <!-- Adblock Browser onboarding (first run page [FRP]) -->
554 <string name="abb_frp_button_1">&abb_frp_button_1;</string> 567 <string name="abb_frp_button_1">&abb_frp_button_1;</string>
555 <string name="abb_frp_button_2">&abb_frp_button_2;</string> 568 <string name="abb_frp_button_2">&abb_frp_button_2;</string>
556 <string name="abb_frp_button_3">&abb_frp_button_3;</string> 569 <string name="abb_frp_button_3">&abb_frp_button_3;</string>
557 570
558 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string> 571 <string name="abb_frp_headline_1">&abb_frp_headline_1;</string>
559 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string> 572 <string name="abb_frp_headline_2">&abb_frp_headline_2;</string>
560 <string name="abb_frp_headline_3">&abb_frp_headline_3;</string> 573 <string name="abb_frp_headline_3">&abb_frp_headline_3;</string>
561 574
562 <string name="abb_frp_step_1_text">&abb_frp_step_1_text;</string> 575 <string name="abb_frp_step_1_text">&abb_frp_step_1_text;</string>
563 <string name="abb_frp_step_2_text">&abb_frp_step_2_text;</string> 576 <string name="abb_frp_step_2_text">&abb_frp_step_2_text;</string>
564 <string name="abb_frp_step_2_text_where">&abb_frp_step_2_text_where;</string> 577 <string name="abb_frp_step_2_text_where">&abb_frp_step_2_text_where;</string>
565 <string name="abb_frp_step_2_text_learn">&abb_frp_step_2_text_learn;</string> 578 <string name="abb_frp_step_2_text_learn">&abb_frp_step_2_text_learn;</string>
566 <string name="abb_frp_step_3_text">&abb_frp_step_3_text;</string> 579 <string name="abb_frp_step_3_text">&abb_frp_step_3_text;</string>
567 580
568 <string name="abb_adblocking_active_languages">&abb_adblocking_active_language s;</string> 581 <string name="abb_adblocking_active_languages">&abb_adblocking_active_language s;</string>
569 <string name="abb_adblocking_available_languages">&abb_adblocking_available_la nguages;</string> 582 <string name="abb_adblocking_available_languages">&abb_adblocking_available_la nguages;</string>
570 <string name="abb_adblocking_none_selected">&abb_adblocking_none_selected;</st ring> 583 <string name="abb_adblocking_none_selected">&abb_adblocking_none_selected;</st ring>
571 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng> 584 <string name="abb_adblocking_select_below">&abb_adblocking_select_below;</stri ng>
572 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 585 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
573 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng> 586 <string name="abb_adblocking_all_selected">&abb_adblocking_all_selected;</stri ng>
574 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 587 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
575 588
576 <!-- This is currently just a filler-text --> 589 <!-- This is currently just a filler-text -->
577 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string> 590 <string name="abb_pref_category_acceptable_ads_extra_summary">&abb_pref_catego ry_acceptable_ads_extra_summary;</string>
578 591
579 </resources> 592 </resources>
580 593
OLDNEW

Powered by Google App Engine
This is Rietveld