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

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: Merged Issue-2750 Created July 30, 2015, 11:13 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.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 <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>
547 <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>
548 548
549 <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>
550 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string> 550 <string name="abb_pref_acceptable_ads">&abb_pref_acceptable_ads;</string>
551 551
552 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string > 552 <string name="abb_pref_header_adblocking">&abb_pref_header_adblocking;</string >
553 553
554 <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>
555 555
556 <string name="abb_list_disable_tracking">&abb_list_disable_tracking;</string> 556 <string name="abb_subscription_disable_tracking">&abb_subscription_disable_tra cking;</string>
557 <string name="abb_list_disable_malware">&abb_list_disable_malware;</string> 557 <string name="abb_subscription_disable_malware">&abb_subscription_disable_malw are;</string>
558 <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>
559 <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>
560 560
561 <string name="abb_add_subscription_url">&abb_add_subscription_url;</string> 561 <string name="abb_add_subscription_url">&abb_add_subscription_url;</string>
562 <string name="abb_add_subscription_button">&abb_add_subscription_button;</stri ng> 562 <string name="abb_add_subscription_button">&abb_add_subscription_button;</stri ng>
563 <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</stri ng> 563 <string name="abb_add_subscription_adding">&abb_add_subscription_adding;</stri ng>
564 564
565 <string name="abb_invalid_url">&abb_invalid_url;</string> 565 <string name="abb_invalid_url">&abb_invalid_url;</string>
566 566
567 <!-- Adblock Browser onboarding (first run page [FRP]) --> 567 <!-- Adblock Browser onboarding (first run page [FRP]) -->
568 <string name="abb_frp_button_1">&abb_frp_button_1;</string> 568 <string name="abb_frp_button_1">&abb_frp_button_1;</string>
569 <string name="abb_frp_button_2">&abb_frp_button_2;</string> 569 <string name="abb_frp_button_2">&abb_frp_button_2;</string>
(...skipping 15 matching lines...) Expand all
585 <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>
586 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string> 586 <string name="abb_adblocking_none_available">&abb_adblocking_none_available;</ string>
587 <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>
588 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string> 588 <string name="abb_adblocking_waiting">&abb_adblocking_waiting;</string>
589 589
590 <!-- This is currently just a filler-text --> 590 <!-- This is currently just a filler-text -->
591 <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>
592 592
593 </resources> 593 </resources>
594 594
LEFTRIGHT

Powered by Google App Engine
This is Rietveld