Issue 5169 - Add whitelisted tab to the new options page

locale/en-US/new-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": {
     "description": "Name of extension in navigation sidebar",
     "message": "Adblock <strong>Plus</strong>"
   },
   "options_tab_general": {
-    "description": "Name in sidebar for General tab",
+    "description": "Sidebar tab label",
     "message": "General"
   },
   "options_tab_whitelist": {
-    "description": "Name in sidebar for Whitelisted websites tab",
+    "description": "Sidebar tab label and main heading inside corresponding tab",
     "message": "Whitelisted websites"
   },
   "options_tab_advanced": {
-    "description": "Name in sidebar for Advanced tab",
+    "description": "Sidebar tab label",
     "message": "Advanced"
   },
   "options_tab_help": {
-    "description": "Name in sidebar for Help tab",
+    "description": "Sidebar tab label",
     "message": "Help"
   },
   "options_version": {
     "description": "Version label in navigation sidebar",
     "message": "Version"
   },
   "options_tab_share": {
     "description": "Share button in navigation sidebar",
     "message": "Share"
   },
@@ skipping 20 matching lines @@
   "options_language_title": {
     "description": "Ad blocking list option name in General tab",
     "message": "<strong>Adblocking</strong> for websites in..."
   },
   "options_language_title_tooltip_1": {
     "description": "Top part of tooltip description for 'Adblocking' section in General tab",
     "message": "The default filter list is based on your browser's language settings. If you live in Germany, your default filter list is German+English. However, if you live in Germany and frequently visit Italian websites, you need to subscribe to the Italian filter list. To maintain optimal performance, it is recommended to select only the language that you need."
   },
   "options_language_title_tooltip_notes_1": {
     "description": "First bottom part of tooltip description for 'Adblocking' section in General tab",
-    "message": "Consider: Sometimes ads appear because your filter lists are not up to date. If this is the case, it’s recommended to manually update all your filter lists. You can do that by going to <strong>Advanced > Update all filter lists</strong>."
+    "message": "Consider: Sometimes ads appear because your filter lists are not up to date. If this is the case, it's recommended to manually update all your filter lists. You can do that by going to <strong>Advanced > Update all filter lists</strong>."
   },
   "options_language_title_tooltip_notes_2": {
     "description": "Second bottom part of tooltip description for 'Adblocking' section in General tab",
     "message": "If you still see ads, please report them in our Adblock Plus sub-forum under <strong>Help > Forum > Filters for Adblock Plus</strong>."
   },
   "options_language_add": {
     "description": "Add other language button in General Tab",
     "message": "add other website languages"
   },
   "options_more_title": {
@@ skipping 20 matching lines @@
   "options_more_privacy_tooltip_1": {
     "message": "Adblock Plus can disable tracking (e.g. from ad agencies) to further protect your privacy on the web."
   },
   "options_more_privacy_tooltip_2": {
     "message": "Companies such as ad agencies are tracking your online activity and browsing history every time you surf the web. According to Stanford University research, Adblock Plus is the most efficient solution available against third-party tracking companies."
   },
   "options_more_privacy_tooltip_notes_1": {
     "message": "Note that this feature may conflict with Acceptable Ads, which allows some nonintrusive ads to be displayed, as well as the tracking that is needed to measure the performance of those ads. This is necessary because some websites only earn revenue from ads if their impact can be measured."
   },
   "options_more_social_tooltip_1": {
-    "message": "Adblock Plus can disable social media buttons on websites, ensuring that social networks can’t create a profile based on the websites you visit."
+    "message": "Adblock Plus can disable social media buttons on websites, ensuring that social networks can't create a profile based on the websites you visit."
   },
   "options_more_social_tooltip_2": {
     "message": "Buttons used to share content on social media platforms such as Facebook, Twitter, Google Plus and others are placed on almost every website that you visit. Even if you don't click them, these buttons send requests to the servers of the social network which use information to create a profile based on your browsing habits."
   },
   "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": {
     "description": "First part of tooltip description for 'Acceptable Ads' section in General tab",
     "message": "Since many websites rely on advertising revenue, we encourage the use of noninstrusive advertising."
   },
   "options_acceptableAds_title_tooltip_2": {
     "description": "Second part of tooltip description for 'Acceptable Ads' section in General tab",
     "message": "The Acceptable Ads initiative, which supports both users and website owners, is a set of strict guidelines that identifies acceptable ads. Ads meeting these criteria are displayed to users."
   },
   "options_acceptableAds_title_tooltip_3": {
     "description": "Third part of tooltip description for 'Acceptable Ads' section in General tab",
     "message": "You can, however, disable this feature at any time and browse ad-free."
   },
   "options_acceptableAds_description": {
     "description": "Acceptable ads descriptive name in General tab",
     "message": "Allow some non-intrusive advertising"
   },
-  "options_whitelist_title": {
-    "description": "Whitelist tab headline",
-    "message": "Whitelisted websites"
-  },
   "options_whitelist_description": {
     "description": "Whitelist tab description",
-    "message": "You’ve turned off ad blocking on these websites. You will see ads on these websites."
+    "message": "You've turned off ad blocking on these websites. You will see ads on these websites."
   },
   "options_whitelist_add": {
     "description": "Add whitelisted domain button",
     "message": "Add website"
   },
   "options_whitelist_placeholder_example": {
     "description": "Empty Whitelist input placeholder prefix",
-    "message": "e.g."

[Thomas Greiner, 2017/05/09 13:42:55]

This assumes that we know where the prefix is placed but it may differ by
language so let's use a placeholder instead.

e.g.
"e.g. $domain$"

That way we can insert the domain at runtime and don't have to worry about where
the "e.g." is positioned in the text.

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

Done.

+    "message": "e.g. $domain$",
+    "placeholders": {
+      "domain": {
+        "content": "$1",
+        "example": "www.example.com"
+      }
+    }
   },
   "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_invalid": {
-    "description": "Invalid hostname notification of whitelist text input",
-    "message": "Not a valid hostname"
-  },
   "options_whitelist_duplicate": {
-    "description": "Duplicate hostname notification of whitelist text input",

[Thomas Greiner, 2017/05/09 13:42:55]

Detail: "notification" is a bit ambiguous so what about calling it "error
message" or "warning"?

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

Done.

+    "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_whitelisted_add": {
-    "description": "Button label for adding whitelisted website",
-    "message": "add website"
-  },
-  "options_whitelisted_title": {

[Thomas Greiner, 2017/05/09 13:42:55]

Detail: Those string names should probably be updated for consistenty because
you're no longer calling them "options_whitelisted_*" but "options_whitelist_*".

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

Thanks for noticing, this is a duplication.

-    "description": "Whitelisting option name in General tab",
-    "message": "Whitelisted websites"
-  },
-  "options_whitelisted_title_tooltip_1": {

[Thomas Greiner, 2017/05/09 13:42:55]

Detail: These texts don't appear to be used anymore.

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

Done.

-    "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_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_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."
+    "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"
   },
   "options_tweaks_blockElement": {
     "description": "Show 'Block element' option in Advanced tab",
     "message": "Show 'Block element' right-click menu item"
   },
   "options_tweaks_showDevToolsPanel": {
     "description": "Show developer tools panel option in Advanced tab",
@@ skipping 253 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"
   }
 }