Issue 5255 - Advanced tab (HTML, strings and functionality)

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": "Sidebar tab label and main heading inside corresponding tab",
+    "message": "Whitelisted websites"
   },
   "options_tab_advanced": {
     "description": "Sidebar tab label and main heading inside corresponding tab",
     "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_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",
-    "message": "Whitelisted websites"
-  },
-  "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_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."
+  "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_whitelist_add": {
+    "description": "Add whitelisted domain button",
+    "message": "Add website"
+  },
+  "options_whitelist_placeholder_example": {
+    "description": "Empty Whitelist input placeholder prefix",
+    "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_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_advanced_description": {
     "description": "Advanced tab description",
     "message": "Customize Adblock Plus, add or remove filter lists, create and maintain your own filter lists"
   },
   "options_customize_header": {
     "description": "Section title in Advanced tab",
-    "message": "CUSTOMIZE ON-PAGE ACTIONS"

[Thomas Greiner, 2017/07/07 13:01:08]

Detail: Don't capitalize the text here or otherwise we'd have to redo the
translation whenever we decide to capitalize the text differently. Instead use
`text-transform: uppercase;` in the CSS.

Same applies to "options_customFilters_title".

[saroyanm, 2017/07/10 11:37:59]

My idea was to capitalize and rollback to the lower case after introduction of
CSS UPPER_CASE, but while you mentioned this, I'll follow your suggestion.

[saroyanm, 2017/07/12 15:29:00]

Done.

[Thomas Greiner, 2017/07/14 17:36:11]

Ok, as long as we don't forget to add the necessary styles for transforming the
text to upper-case later on it's fine with me.

+    "message": "Customize on-page actions"
   },
   "options_customize_blockElement": {
     "description": "Option label of customize section in Advanced tab",
     "message": "Show 'Block element' right-click menu item"
   },
   "options_customize_blockElement_tooltip_1": {
     "description": "Tooltip text for Show 'Block element' option item of customize section in Advanced tab",
     "message": "Temporarily block annoying items on a webpage, e.g. images or animated slideshows."
   },
   "options_customize_showDevToolsPanel": {
@@ skipping 33 matching lines @@
     "message": "Last update"
   },
   "options_filterList_state_active": {
     "description": "State of filter list in Advanced tab",
     "message": "Active"
   },
   "options_filterList_state_disabled": {
     "description": "State of filter list in Advanced tab",
     "message": "Disabled"
   },
-  "options_filterList_just": {

[Thomas Greiner, 2017/07/07 13:01:08]

Detail: "just" is not a time indicator. Instead I'd suggest using "now".

[saroyanm, 2017/07/10 11:37:59]

Agree

[saroyanm, 2017/07/12 15:29:00]

Done.

+  "options_filterList_now": {
     "description": "Text inside 'Last update' column in Advanced tab",
     "message": "Just now"
   },
   "options_filterList_minutes": {
     "description": "Text inside 'Last update' column in Advanced tab",
     "message": "minutes ago"

[Thomas Greiner, 2017/07/07 13:01:08]

These two texts don't contain placeholders for the number of minutes/hours. In
some languages the number may appear not just before or after but in the middle
of the text.

[saroyanm, 2017/07/10 11:37:59]

I agree, I'll introduce placeholder here.

[saroyanm, 2017/07/12 15:29:00]

Done.

   },
   "options_filterList_hours": {
     "description": "Text inside 'Last update' column in Advanced tab",
     "message": "hours ago"
   },
   "options_filterList_add": {
     "description": "Import button in Advanced tab",
     "message": "add/import other filter list"
   },
   "options_filterList_update": {
     "description": "Update button in Advanced tab",
     "message": "update all filter lists"
   },
   "options_customFilters_title": {
     "description": "Section title in Advanced tab",
-    "message": "CREATE AND EDIT YOUR FILTER LIST"
+    "message": "Create and edit your filter list"
   },
   "options_customFilters_description": {
     "description": "Custom filter lists section description in Advanced tab",
     "message": "Write your own custom filters to further control what content Adblock PLus allows or blocks."
   },
   "options_customFilters_widget_title": {
     "description": "Custom filter widget title in Advanced tab",
     "message": "My filter list"
   },
   "options_customFilters_tip": {
@@ skipping 204 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"
   }
 }