Delta Between Two Patch Sets: mobile/android/base/locales/adblockbrowser/en-GB/android_strings.dtd
Issue 29543774:
Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen (Closed)
Left Patch Set:
Created Sept. 13, 2017, 5:01 p.m.
Right Patch Set: Adjustments accordingly to Thomas's comments. Also, adjusting strings for multilocale build
Created Sept. 19, 2017, 3:18 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« mobile/android/base/locales/adblockbrowser/ar/android_strings.dtd ('K')
|
« mobile/android/base/locales/adblockbrowser/el/android_strings.dtd ('k')
|
mobile/android/base/locales/adblockbrowser/en-US/android_strings.dtd » ('j')
|
mobile/android/thirdparty/org/adblockplus/browser/UrlUtils.java » ('J')
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 |
|---|---|
| (no file at all) | |
| 1 <!-- Adblock Browser --> | 1 <!-- Adblock Browser --> |
| 2 <!ENTITY abb_block_ads "Block ads on this site"> | 2 <!ENTITY abb_block_ads "Block ads on this site"> |
| 3 | 3 |
| 4 <!ENTITY abb_pref_category_abp "Block intrusive elements"> | 4 <!ENTITY abb_pref_category_abp "Block intrusive elements"> |
| 5 <!ENTITY abb_pref_category_abp_summary "Block intrusive ads and other elements, such as images, on all websites"> | 5 <!ENTITY abb_pref_category_abp_summary "Block intrusive ads and other elements, such as images, on all websites"> |
| 6 | 6 |
| 7 <!ENTITY abb_pref_category_adblocking "Ad blocking"> | 7 <!ENTITY abb_pref_category_adblocking "Ad blocking"> |
| 8 <!ENTITY abb_pref_category_adblocking_summary "Change ad blocking language, opti ons, default settings"> | 8 <!ENTITY abb_pref_category_adblocking_summary "Change ad blocking language, opti ons, default settings"> |
| 9 | 9 |
| 10 <!ENTITY abb_pref_category_blocking "Blocking"> | 10 <!ENTITY abb_pref_category_blocking "Blocking"> |
| 11 | 11 |
| 12 <!ENTITY abb_pref_category_languages "Languages"> | 12 <!ENTITY abb_pref_category_languages "Languages"> |
| 13 <!ENTITY abb_pref_category_languages_summary "Add or remove language-specific fi lter lists"> | 13 <!ENTITY abb_pref_category_languages_summary "Add or remove language-specific fi lter lists"> |
| 14 | 14 |
| 15 <!ENTITY abb_pref_category_more_blocking "More blocking options"> | 15 <!ENTITY abb_pref_category_more_blocking "More blocking options"> |
| 16 <!ENTITY abb_pref_category_more_blocking_summary "Disable tracking and malware s ites, or add custom filter lists"> | 16 <!ENTITY abb_pref_category_more_blocking_summary "Disable tracking and malware s ites, or add custom filter lists"> |
| 17 | 17 |
| 18 <!ENTITY abb_pref_category_exceptions "Exceptions"> | 18 <!ENTITY abb_pref_category_exceptions "Exceptions"> |
| 19 | 19 |
| 20 <!ENTITY abb_pref_category_acceptable_ads "Acceptable Ads"> | 20 <!ENTITY abb_pref_category_acceptable_ads "Acceptable Ads"> |
| 21 <!ENTITY abb_pref_category_acceptable_ads_summary "Show nonintrusive ads or hide all ads"> | 21 <!ENTITY abb_pref_category_acceptable_ads_summary "Show nonintrusive ads or hide all ads"> |
| 22 | 22 |
| 23 <!ENTITY abb_pref_category_whitelisted_sites "Whitelisted websites"> | 23 <!ENTITY abb_pref_category_whitelisted_websites "Whitelisted websites"> |
| 24 <!ENTITY abb_pref_category_whitelisted_sites_summary "Add exceptions for website s"> | 24 <!ENTITY abb_pref_category_whitelisted_websites_summary "Add exceptions for webs ites"> |
| 25 | 25 |
| 26 <!ENTITY abb_pref_about_acceptable_ads "About Acceptable Ads"> | 26 <!ENTITY abb_pref_about_acceptable_ads "About Acceptable Ads"> |
| 27 <!ENTITY abb_pref_acceptable_ads "Allow some non-intrusive advertising"> | 27 <!ENTITY abb_pref_acceptable_ads "Allow some non-intrusive advertising"> |
| 28 | 28 |
| 29 <!ENTITY abb_pref_header_adblocking "Ad blocking"> | 29 <!ENTITY abb_pref_header_adblocking "Ad blocking"> |
| 30 | 30 |
| 31 <!ENTITY abb_pref_category_add_other_list "Add other filter list"> | 31 <!ENTITY abb_pref_category_add_other_list "Add other filter list"> |
| 32 | 32 |
| 33 <!ENTITY abb_subscription_disable_tracking "Disable tracking"> | 33 <!ENTITY abb_subscription_disable_tracking "Disable tracking"> |
| 34 <!ENTITY abb_subscription_disable_malware "Disable malware domains"> | 34 <!ENTITY abb_subscription_disable_malware "Disable malware domains"> |
| 35 <!ENTITY abb_subscription_disable_anti_adblock "Disable anti-ad blocking message s"> | 35 <!ENTITY abb_subscription_disable_anti_adblock "Disable anti-ad blocking message s"> |
| 36 <!ENTITY abb_subscription_disable_social_media "Disable social media buttons"> | 36 <!ENTITY abb_subscription_disable_social_media "Disable social media buttons"> |
| 37 | 37 |
| 38 <!ENTITY abb_add_subscription_url "www.example.com/filterlist.txt"> | 38 <!ENTITY abb_add_subscription_url "www.example.com/filterlist.txt"> |
| 39 <!ENTITY abb_add_subscription_button "Add other filter list"> | 39 <!ENTITY abb_add_subscription_button "Add other filter list"> |
| 40 <!ENTITY abb_add_subscription_adding "Adding new filter list..."> | 40 <!ENTITY abb_add_subscription_adding "Adding new filter list..."> |
| 41 | |
| 42 <!ENTITY abb_whitelisted_websites_loading "Loading whitelisted websites..."> | |
| 43 <!ENTITY abb_whitelisted_websites_add_button "Add a website to the whitelist"> | |
| 44 <!ENTITY abb_whitelist_website_dialog_title "Whitelist website"> | |
| 45 <!ENTITY abb_whitelist_website_dialog_message "Enter the website"> | |
| 46 <!ENTITY abb_whitelist_website_dialog_hint "www.example.com"> | |
| 47 <!ENTITY abb_whitelist_remove_dialog_title "Remove whitelisted website"> | |
| 48 <!ENTITY abb_whitelist_remove_dialog_message "Are you sure you want to remove &f ormatS;?"> | |
| 41 | 49 |
| 42 <!ENTITY abb_invalid_url "Please enter a valid URL"> | 50 <!ENTITY abb_invalid_url "Please enter a valid URL"> |
| 43 | 51 |
| 44 <!-- Adblock Browser onboarding (first run page [FRP]) --> | 52 <!-- Adblock Browser onboarding (first run page [FRP]) --> |
| 45 <!ENTITY abb_frp_button_1 "Two more steps"> | 53 <!ENTITY abb_frp_button_1 "Two more steps"> |
| 46 <!ENTITY abb_frp_button_2 "Only one more step"> | 54 <!ENTITY abb_frp_button_2 "Only one more step"> |
| 47 <!ENTITY abb_frp_button_3 "Finish"> | 55 <!ENTITY abb_frp_button_3 "Finish"> |
| 48 | 56 |
| 49 <!ENTITY abb_frp_headline_1 "Browse in peace"> | 57 <!ENTITY abb_frp_headline_1 "Browse in peace"> |
| 50 <!ENTITY abb_frp_headline_2 "You\'re in control"> | 58 <!ENTITY abb_frp_headline_2 "You\'re in control"> |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 66 | 74 |
| 67 <!ENTITY abb_pref_category_acceptable_ads_extra_summary "We\'d like to encourage websites to use straightforward, non-intrusive | 75 <!ENTITY abb_pref_category_acceptable_ads_extra_summary "We\'d like to encourage websites to use straightforward, non-intrusive |
| 68 advertising. That\'s why we\'ve established strict guidelines to identify Accept able Ads, which are shown under default settings. If you | 76 advertising. That\'s why we\'ve established strict guidelines to identify Accept able Ads, which are shown under default settings. If you |
| 69 wish to browse ad-free, you can disable this setting at any time."> | 77 wish to browse ad-free, you can disable this setting at any time."> |
| 70 | 78 |
| 71 <!-- Adblock Browser bookmarks --> | 79 <!-- Adblock Browser bookmarks --> |
| 72 <!ENTITY abb_bookmarks_about_browser "About your browser"> | 80 <!ENTITY abb_bookmarks_about_browser "About your browser"> |
| 73 <!ENTITY abb_bookmarks_adblock_plus "Adblock Plus"> | 81 <!ENTITY abb_bookmarks_adblock_plus "Adblock Plus"> |
| 74 <!ENTITY abb_bookmarks_acceptable_ads "Acceptable Ads"> | 82 <!ENTITY abb_bookmarks_acceptable_ads "Acceptable Ads"> |
| 75 <!ENTITY abb_bookmarks_beta_community "Beta community"> | 83 <!ENTITY abb_bookmarks_beta_community "Beta community"> |
| LEFT | RIGHT |
