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

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

Index: mobile/android/base/locales/en-US/android_strings.dtd
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index ec94191ccdd3791573a1aeb29950ecb29adf3ef8..c1523765ab8d7b925896ba41046f7d96aed7fb97 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -648,7 +648,7 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 
 <!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">
@@ -663,7 +663,20 @@ just addresses the organization to follow, e.g. "This site is run by " -->
 <!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">