Issue 2720 - [Adblocking settings] Add the other filter lists category

mobile/android/base/locales/en-US/android_strings.dtd

 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
 <!ENTITY  no_space_to_start_error "There is not enough space available for &brandShortName; to start.">
 <!ENTITY  error_loading_file "An error occurred when trying to load files required to run &brandShortName;">
 
 <!ENTITY  onboard_start_message2 "Welcome to &brandShortName;">
 <!ENTITY  onboard_start_subtext2 "More privacy features and ways to customize than ever.">
@@ skipping 630 matching lines @@
 <!ENTITY find_matchcase "Aa">
 
 <!-- Adblock Browser -->
 <!ENTITY abb_block_ads "Block Ads on this Site">
 
 <!ENTITY abb_pref_category_adblocking "Ad blocking">
 <!ENTITY abb_pref_category_adblocking_summary "Configure your filter subscriptions">
 
 <!ENTITY abb_pref_category_blocking "Blocking">
 
-<!ENTITY abb_pref_category_further_blocking "Further blocking options">
+<!ENTITY abb_pref_category_further_blocking "More blocking options">

[Felix Dahlke, 2015/07/26 17:06:21]

"further_blocking" disappeared as a term and presumably won't come back, so we
shouldn't use it in the code IMO. The most robust thing I can come up with would
be `more_subscriptions` :)

[Felix Dahlke, 2015/07/26 17:06:21]

The term we sort of ended up agreeing on for this is "More blocking options".

[René Jeschke, 2015/07/28 10:55:25]

Done.

[René Jeschke, 2015/07/28 10:55:25]

Done.

 <!ENTITY abb_pref_category_further_blocking_summary "Disable tracking and malware sites or add custom filter lists">
 
 <!ENTITY abb_pref_category_exceptions "Exceptions">
 
 <!ENTITY abb_pref_category_acceptable_ads "Acceptable Ads">
 <!ENTITY abb_pref_category_acceptable_ads_summary "Configure Acceptable Ads">
 
 <!ENTITY abb_pref_category_whitelisted_sites "Whitelisted Websites">
 <!ENTITY abb_pref_category_whitelisted_sites_summary "Add exceptions for websites">
 
 <!ENTITY abb_pref_about_acceptable_ads "About Acceptable Ads">
 <!ENTITY abb_pref_acceptable_ads "Allow some non-intrusive advertising">
 
 <!ENTITY abb_pref_header_adblocking "Ad blocking">
-  
+
+<!ENTITY abb_pref_category_add_other_list "Add other blocking list">

[Felix Dahlke, 2015/07/26 17:06:22]

We're not using the term "blocking list" at this point, so that should be
"filter list" for now.

[René Jeschke, 2015/07/28 10:55:25]

Done.

+
+<!ENTITY abb_disable_tracking "Disable Tracking">

[Felix Dahlke, 2015/07/26 17:06:21]

Nit: I'd prefer to prefix these to make things more clear, e.g.
abb_list_disable_tracking

[René Jeschke, 2015/07/28 10:55:25]

Done.

+<!ENTITY abb_disable_malware "Disable Malware Domains">
+<!ENTITY abb_disable_anti_adblock "Disable Anti-Adblocking Messages">
+<!ENTITY abb_disable_social_media "Disable Social Media Buttons">
+
+<!ENTITY abb_block_list_url "www.yourURL.com/blockinglist.txt">

[Felix Dahlke, 2015/07/26 17:06:21]

Nit: Call these keys "abb_filter_list_*"? We could also play it safe and always
call filter lists "subscriptions" in the code. It'd be consistent with the rest
of the ABP code base and would be resistant to naming changes.

[Felix Dahlke, 2015/07/26 17:06:21]

Nit: yoururl.com actually exists and is a questionable thing, how about using
example.org instead?

[René Jeschke, 2015/07/28 10:55:25]

Done.

[René Jeschke, 2015/07/28 10:55:25]

Done.

+<!ENTITY abb_block_list_button "Add filter list from this URL">
+<!ENTITY abb_block_list_adding "Adding new subscription...">

[Felix Dahlke, 2015/07/26 17:06:21]

"Add new filter list" for consistency.

[René Jeschke, 2015/07/28 10:55:25]

Done.

+
+<!ENTITY abb_invalid_url "Please enter a valid URL">
+
 <!-- Adblock Browser onboarding (first run page [FRP]) -->
 <!ENTITY abb_frp_button_1 "Two more steps">
 <!ENTITY abb_frp_button_2 "Only one more step">
 <!ENTITY abb_frp_button_3 "Finish">
 
 <!ENTITY abb_frp_headline_1 "Browse in peace">
 <!ENTITY abb_frp_headline_2 "You\'re in control">
 <!ENTITY abb_frp_headline_3 "Be the first">
 
 <!ENTITY abb_frp_step_1_text "Ad blocking is automatically integrated - no more annoying ads while you surf!">
 <!ENTITY abb_frp_step_2_text "Annoying ads are always blocked, while nonintrusive ads are displayed by default. You can change this setting at any time.">
 <!ENTITY abb_frp_step_2_text_where "Tap the Menu » Settings » Ad blocking » Acceptable Ads">
 <!ENTITY abb_frp_step_2_text_learn "Learn more about Acceptable Ads by clicking on the thumbnail when you first launch the browser.">
 <!ENTITY abb_frp_step_3_text "Bugs can be reported in our Google+ community. The link to the Adblock Browser Google+ community will be added to your favorites.">
 
 <!ENTITY abb_adblocking_active_languages "Active for websites in...">
 <!ENTITY abb_adblocking_available_languages "Other Languages">
 <!ENTITY abb_adblocking_none_selected "None">
 <!ENTITY abb_adblocking_select_below "Select one below">
 <!ENTITY abb_adblocking_none_available "None">
 <!ENTITY abb_adblocking_all_selected "No more available subscriptions">
 <!ENTITY abb_adblocking_waiting "Fetching available subscriptions...">
 
 <!-- This is currently just a filler-text -->
 <!ENTITY abb_pref_category_acceptable_ads_extra_summary "We\'d like to encourage websites to use straightforward, unobtrusive
 advertising. That\'s why we established strict guidelines to identify acceptable ads, which are shown under default settings. If you
  still want to block every ad you can disable this in a few seconds.">