Issue 5169 - Add whitelisted tab to the new options page

locale/en-US/new-options.json

Index: locale/en-US/new-options.json
===================================================================
--- a/locale/en-US/new-options.json
+++ b/locale/en-US/new-options.json
@@ -15,6 +15,10 @@
     "description": "Name in sidebar for General tab",
     "message": "General"
   },
+  "options_tab_whitelist": {
+    "description": "Name in sidebar for Whitelisted websites tab",
+    "message": "Whitelisted websites"
+  },
   "options_tab_advanced": {
     "description": "Name in sidebar for Advanced tab",
     "message": "Advanced"
@@ -131,38 +135,47 @@
     "description": "Acceptable ads descriptive name in General tab",
     "message": "Allow some non-intrusive advertising"
   },
-  "options_whitelisted_add": {
-    "description": "Button label for adding whitelisted website",
-    "message": "add website"
-  },
-  "options_whitelisted_empty": {
-    "description": "Text shown when list of whitelisted websites is empty",
-    "message": "There are no websites in your whitelist."
-  },
-  "options_whitelisted_title": {
-    "description": "Whitelisting option name in General tab",
+  "options_whitelist_title": {
+    "description": "Whitelist tab headline",
     "message": "Whitelisted websites"

[saroyanm, 2017/05/17 13:15:16]

I think we can reuse, options_tab_whitelist here ?
Probably will need to be renamed and description updated to make it obvious that
the text can be found in couple of places, until we intentionally want to
separate the strings.

[saroyanm, 2017/05/18 16:21:52]

This is a duplication, we should reuse the string.

[saroyanm, 2017/05/22 09:38:23]

Done.

   },
-  "options_whitelisted_title_tooltip_1": {
-    "description": "First top part of tooltip description for 'Whitelisted domains' section in General tab",
-    "message": "You can allow a website to display ads by adding it to your whitelist."
+  "options_whitelist_description": {
+    "description": "Whitelist tab description",
+    "message": "You’ve turned off ad blocking on these websites. You will see ads on these websites."
   },
-  "options_whitelisted_title_tooltip_2": {
-    "description": "Second top part of tooltip description for 'Whitelisted domains' section in General tab",
-    "message": "This means that Adblock Plus is completely deactivated on the whitelisted site. Ads and other annoyances, such as tracking scripts, may be activated."
+  "options_whitelist_add": {
+    "description": "Add whitelisted domain button",
+    "message": "Add website"
   },
-  "options_whitelisted_title_tooltip_notes_1": {
-    "description": "Bottom part of tooltip description for 'Whitelisted domains' section in General tab",
-    "message": "Note that this feature is different from whitelisted Acceptable Ads."
+  "options_whitelist_placeholder_example": {
+    "description": "Empty Whitelist input placeholder prefix",
+    "message": "e.g. $domain$",
+    "placeholders": {
+      "domain": {
+        "content": "www.example.com"

[saroyanm, 2017/05/16 20:20:07]

Is this solution fine, or we might want to pass the placeholder value in the
code ?

[saroyanm, 2017/05/18 16:21:52]

We will move this placeholder into JS code to make the placeholder reusable in
other places (if needed).

[saroyanm, 2017/05/22 09:38:23]

Done.

+      }
+    }
+  },
+  "options_whitelist_empty_1": {
+    "description": "Empty Whitelist placeholder",
+    "message": "You aren't whitelisting any websites yet."
+  },
+  "options_whitelist_empty_2": {
+    "description": "Empty Whitelist placeholder",
+    "message": "Websites you trust and want to allow ads on will be shown here."
+  },
+  "options_whitelist_duplicate": {
+    "description": "Duplicate hostname warning of whitelist text input",
+    "message": "Website is already whitelisted"
+  },
+  "options_whitelist_description": {
+    "description": "Section description in whitelisted tab",
+    "message": "You’ve turned off ad blocking on these websites. You will see ads on these websites."
   },
   "options_button_add": {
     "description": "Add button label",
     "message": "add"
   },
-  "options_button_cancel": {
-    "description": "Cancel button label",
-    "message": "cancel"
-  },
   "options_tweaks_title": {
     "description": "Section title in Advanced tab",
     "message": "Tweaks"