Issue 2375 - Implement "Blocking lists" section in new options page

locale/en-US/options.json

 {
   "options_page_title": {
     "description": "Options page title",
     "message": "Adblock Plus Options"
   },
   "options_page_header_1": {
     "description": "Page title in navigation sidebar",
     "message": "Options"
   },
   "options_page_header_2": {
@@ skipping 58 matching lines @@
   },
   "options_furtherBlocking_title_tooltip": {
     "description": "Tooltip description for 'More blocking options' section in General tab",
     "message": "By default, Adblock Plus blocks all annoying ads, including video ads, animated ads, noisy ads, flashy banners, pop-ups, pop-unders and much more. In addition to ads, Adblock Plus can also block tracking, malware, social media buttons and more to increase your safety and privacy online."
   },
   "options_popular": {
     "description": "Popular label in further blocking options table",
     "message": "popular"
   },
   "options_furtherBlocking_add": {
-    "description": "Button name for adding other blocking list in General tab",
-    "message": "add other blocking list"
+    "description": "Button name for adding other filter list in General tab",
+    "message": "add other filter list"
   },
   "options_exceptions_title": {
     "description": "Exceptions section name in General tab",
     "message": "Exceptions"
   },
   "options_acceptableAds_title": {
     "description": "Acceptable ads option name in General tab",
     "message": "Acceptable ads"
   },
   "options_acceptableAds_title_tooltip_1": {
@@ skipping 38 matching lines @@
   },
   "options_button_add": {
     "description": "Add button label",
     "message": "add"
   },
   "options_button_cancel": {
     "description": "Cancel button label",
     "message": "cancel"
   },
   "options_tweaks_title": {
-    "description": "Tweaks section name in Advanced tab",
+    "description": "Section title in Advanced tab",
     "message": "Tweaks"
   },
   "options_tweaks_blockElement": {
     "description": "Show block Element option in Advanced tab",
     "message": "Show <a>Block Element</a> right-click menu item"
   },
-  "options_blockingList_title": {
-    "description": "Blocking list section title in Advanced tab",
-    "message": "Blocking list"
+  "options_filterList_title": {
+    "description": "Section title in Advanced tab",
+    "message": "Filter lists"
   },
   "options_tab_overview": {
     "description": "Tab name in Advanced tab",
     "message": "Overview"
   },
   "options_tab_ownList": {
     "description": "Tab name in Advanced tab",
-    "message": "Edit or create own blocking list"
-  },
-  "options_tableCol_name": {
+    "message": "Edit or create own filter list"
+  },
+  "options_column_name": {
     "description": "Name of column of subscription list table in Advanced tab",
     "message": "Name"
   },
-  "options_tableCol_description": {

[Thomas Greiner, 2016/01/19 11:27:27]

There's no "description" column anymore so please remove this message.

[saroyanm, 2016/01/22 09:55:04]

Done.

+  "options_column_date": {
     "description": "Name of column of subscription list table in Advanced tab",
-    "message": "Description"
-  },
-  "options_tableCol_date": {
-    "description": "Name of column of subscription list table in Advanced tab",
-    "message": "Date"

[Thomas Greiner, 2016/01/19 11:27:26]

According to the style guide this should be "Last update".

[saroyanm, 2016/01/22 09:55:05]

Done.

-  },
-  "options_blockingList_add": {
+    "message": "Last update"
+  },
+  "options_filterList_add": {
     "description": "Import button in Advanced tab",
-    "message": "add/import other blocking list"
-  },
-  "options_blockingList_update": {
+    "message": "add/import other filter list"
+  },
+  "options_filterList_update": {
     "description": "Update button in Advanced tab",
-    "message": "Update all blocking lists"

[Thomas Greiner, 2016/01/19 11:27:27]

According to the style guide this should be lower-case.

[saroyanm, 2016/01/22 09:55:05]

Done.

+    "message": "update all filter lists"
   },
   "options_customFilters_empty": {
     "description": "Text shown when list of custom filters is empty",
     "message": "There are no custom filters."
   },
-  "options_subscription_lastDownload_invalidURL": {
+  "options_filterList_lastDownload_invalidURL": {
     "description": "Error message in advanced tab",
     "message": "Failed, not a valid address"
   },
-  "options_subscription_lastDownload_connectionError": {
+  "options_filterList_lastDownload_connectionError": {
     "description": "Error message in advanced tab",
     "message": "Failed, download failure"
   },
-  "options_subscription_lastDownload_invalidData": {
+  "options_filterList_lastDownload_invalidData": {
     "description": "Error message in advanced tab",
-    "message": "Failed, not a valid filters list"

[Thomas Greiner, 2016/01/19 11:27:26]

Typo: Replace "filters list" with "filter list".

[saroyanm, 2016/01/22 09:55:05]

Done.

-  },
-  "options_subscription_lastDownload_checksumMismatch": {
+    "message": "Failed, not a valid filter list"
+  },
+  "options_filterList_lastDownload_checksumMismatch": {
     "description": "Error message in advanced tab",
     "message": "Failed, checksum mismatch"
   },
-  "options_blockingList_update_now": {

[Thomas Greiner, 2016/01/19 11:27:26]

Detail: The naming is a bit inconsistent because shouldn't it be either
"options_blockingList_updateNow" or "options_blockingList_update"?

[saroyanm, 2016/01/22 09:55:03]

Done.

+  "options_filterList_lastDownload_inProgress": {
+    "description": "Progress message in advanced tab",
+    "message": "Downloading…"
+  },
+  "options_filterList_updateNow": {
     "description": "Context menu item in advanced tab, appears after click on subscription",
     "message": "update now"
   },
-  "options_blockingList_website": {
+  "options_filterList_website": {
     "description": "Context menu item in advanced tab, appears after click on subscription",
     "message": "website"
   },
-  "options_blockingList_source": {
+  "options_filterList_source": {
     "description": "Context menu item in advanced tab, appears after click on subscription",
     "message": "source"
   },
-  "options_blockingList_delete": {
+  "options_filterList_delete": {
     "description": "Context menu item in advanced tab, appears after click on subscription",
     "message": "delete"
   },
-  "options_blockingList_own_list": {
-    "description": "Last subscription name in blocking list section in advnaced tab",

[Thomas Greiner, 2016/01/19 11:27:26]

Detail: Please don't mention details that depend on how the UI looks because
that might change. This text should describe the purpose of this text rather
than how it will look like.

e.g. Name of custom subscription entry in blocking list section in Advanced tab.

[Thomas Greiner, 2016/01/19 11:27:27]

Typo: Replace "advnaced" with "advanced".

[saroyanm, 2016/01/22 09:55:04]

Done.

[saroyanm, 2016/01/22 09:55:04]

Done.

-    "message": "Own blocking list"
-  },
-  "options_blockingList_edit_own_list": {
-    "description": "Link next to last subscription name in blocking list section in advnaced tab",
-    "message": "edit your blocking list"

[Thomas Greiner, 2016/01/19 11:27:27]

I thought we decided on calling them "filter lists"? Maybe quickly check back
with Lisa to ensure that each of those texts is up-to-date.

[saroyanm, 2016/01/22 09:55:04]

Done.

+  "options_filterList_own_list": {
+    "description": "Name of custom subscription entry in filter list section in Advanced tab",
+    "message": "Own filter list"
+  },
+  "options_filterList_edit_own_list": {
+    "description": "Entry in filter list section in Advanced tab",
+    "message": "edit your filter list"
   },
   "options_customFilters_title": {
     "description": "Custom filters option name in Advanced tab",
     "message": "Blocking rules"
   },
   "options_customFilters_textbox_placeholder": {
     "description": "Adding custom filter textbox placeholder text in Advanced tab",
     "message": "add your blocking rule here"
   },
   "options_customFilter_edit": {
     "description": "Label for editing custom filter in Advanced tab",
     "message": "edit rules"
   },
   "options_customFilter_list": {
     "description": "Label for editing custom filter in Advanced tab",
     "message": "list view"
   },
   "options_customFilter_save": {
     "description": "Label for editing custom filter in Advanced tab",
     "message": "save"
   },
   "options_faq_title": {
     "description": "FAQ section name in Help tab and link label in same section",
     "message": "Frequently asked questions"
   },
   "options_faq_description": {
     "description": "FAQ section description in Help tab",
-    "message": "You only need to refresh your blocking list in \"Advanced\" very often, but there are also other known problems."
+    "message": "You only need to refresh your filter list in \"Advanced\" very often, but there are also other known problems."
   },
   "options_forum_title": {
     "description": "Forum section name in Help tab",
     "message": "Forum"
   },
   "options_forum_description": {
     "description": "Forum section description in Help tab",
     "message": "If the frequently asked questions helped you can reach us in our forum."
   },
   "options_forum_link": {
     "description": "Forum section link in Help tab",
     "message": "Adblock Plus support forum"
   },
   "options_media_title": {
     "description": "Social media Section name in Help tab",
     "message": "Social media"
   },
   "options_media_description": {
     "description": "Social media section description in Help tab",
     "message": "If there are major problems with Adblock Plus which affects all of our users, we tell you in our social media channels."
   },
   "options_dialog_predefined_confirm": {
     "description": "Confirming to add a predefined subscription when asked in a dialog",
-    "message": "Yes, use this blocking list"
+    "message": "Yes, use this filter list"
   },
   "options_dialog_predefined_title": {
     "description": "Dialog title for adding a predefined subscription",
-    "message": "Do you really want to use this blocking list?"
+    "message": "Do you really want to use this filter list?"
   },
   "options_dialog_custom_title": {
     "description": "Title of custom subscription modal dialog",
-    "message": "Add other blocking list"
+    "message": "Add other filter list"
   },
   "options_close": {
     "description": "Close modal button",
     "message": "close"
   },
   "options_dialog_custom_subscription_title": {
     "description": "Add custom subscription modal import hint message",
     "message": "Via URL/Link"
   },
   "options_dialog_custom_import": {
     "description": "Button in add custom subscription modal dialog",
-    "message": "import blocking list with this URL"
+    "message": "import filter list with this URL"
   },
   "options_dialog_edit_own_list": {
-    "description": "Edit own blocking list section name in custom subscription modal dialog",
-    "message": "edit own blocking list"
+    "description": "Edit own filter list section name in custom subscription modal dialog",
+    "message": "edit own filter list"
   },
   "options_dialog_create_own_list": {
     "description": "Button in custom subscription modal dialog",
     "message": "create own blocking rules"
   },
    "options_dialog_language_title": {
     "description": "Button in gerenal tab",
     "message": "Add other website language"
   },
   "options_dialog_language_find": {
@@ skipping 70 matching lines @@
   },
   "options_language_ro": {
     "description": "Language name shown in add language modal dialog",
     "message": "Romanian"
   },
   "options_language_ru_uk": {
     "description": "Language name shown in add language modal dialog",
     "message": "Russian and Ukrainian"
   }
 }