Issue 5539 - Implement "Acceptable Ads notification"

locale/en-US/new-options.json

 {
   "options_page_title": {
     "description": "Options page title",
     "message": "Adblock Plus Options"
   },
-  "options_page_header_1": {
+  "options_page_title": {
     "description": "Page title in navigation sidebar",
-    "message": "Options"
-  },
-  "options_page_header_2": {
-    "description": "Name of extension in navigation sidebar",
-    "message": "Adblock <strong>Plus</strong>"
+    "message": "Settings"
   },
   "options_tab_general": {
     "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": "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"
-  },
-  "options_tab_contribute": {
-    "description": "Button in navigation sidebar to support Adblock Plus",
-    "message": "Support us"
+  "options_footer_contribute": {
+    "description": "Sidebar button label",
+    "message": "Contribute"
+  },
+  "options_footer_about": {
+    "description": "Sidebar button label",
+    "message": "About Adblock Plus"
   },
   "options_control_remove_title": {
     "description": "Title of remove controls",
     "message": "remove"
   },
-  "options_readMore": {
-    "description": "Read more element that shows tooltip with description",
-    "message": "read more"
-  },
   "options_general_description": {
     "description": "General tab description",
     "message": "Determine what Adblock Plus shows and hides on websites"
   },
   "options_privacy_header": {
     "description": "Section title in General tab",
     "message": "PRIVACY & SECURITY"
   },
-  "options_acceptable_ads_header": {
+  "options_protection_privacy_tooltip": {
+    "description": "Tooltip for 'Disable tracking' option in General tab",
+    "message": "Protect your personal data by removing all forms of tracking from the Internet including information collectors."
+  },
+  "options_protection_social_tooltip": {
+    "description": "Tooltip for 'Remove Social Media Buttons' option in General tab",
+    "message": "The social media buttons (or icons) on the websites that you visit allow social media networks to build a profile of you based on your browsing habits - even when you don't click on them. Hide these buttons to protect your profile."
+  },
+  "options_acceptableAds_header": {
     "description": "Section title in General tab",
     "message": "Acceptable Ads"
   },
-  "options_acceptable_ads_description": {
+  "options_acceptableAds_description": {
     "description": "Acceptable Ads section description in General tab",
     "message": "Acceptable Ads are nonintrusive ads. They are the middle ground between ad blocking and supporting online content because they generate revenue for website owners."
   },
-  "options_acceptable_ads_label": {
+  "options_acceptableAds_ads_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow some nonintrusive ads"
   },
-  "options_acceptable_ads_privacy_description_1": {
+  "options_acceptableAds_ads_description_1": {
     "description": "Acceptable Ads section 'Allow some nonintrusive ads' option description in General tab",
     "message": "Nonintrusive ads are not annoying and do not interfere with the content you are viewing. These ads collect some information about your browsing habits to provide you with more relevant ads. <a>Read more about the nonintrusive ad criteria</a>"
   },
-  "options_acceptable_ads_privacy_description_2": {
+  "options_acceptableAds_ads_description_2": {
     "description": "Acceptable Ads section 'Allow some nonintrusive ads' option description in General tab",
     "message": "<strong>Note:</strong> The ads collect data about your browsing habits <strong>not</strong> Adblock Plus."
   },
-  "options_acceptable_ads_privacy_label": {
+  "options_acceptableAds_privacy_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow only nonintrusive ads that are privacy-friendly"
   },
-  "options_acceptable_ads_no_privacy_description": {
+  "options_acceptableAds_privacy_description": {
     "description": "Acceptable Ads section 'Allow only nonintrusive ads that are privacy-friendly ' option description in General tab",
     "message": "These ads do not collect personal user information. Ads may be less relevant as a result."
   },
-  "options_acceptable_ads_dnt_notification": {
+  "options_acceptableAds_dnt_notification": {
     "description": "Acceptable Ads section's notification (being shown if Do Not Track is not enabled) in General tab",
     "message": "<strong>Note:</strong> You have <strong>Do Not Track (DNT)</strong> disabled in your Chrome settings. For this feature to work properly, please enable <strong>DNT</strong> in your browser preferences. <a>Find out how to turn on DNT</a>."
   },
-  "options_acceptable_ads_disable_label": {
+  "options_acceptableAds_none_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Block all ads"
   },
   "options_language_header": {
     "description": "Section title in General tab",
     "message": "Language"
   },
   "options_language_description": {
     "description": "Language section description in General tab",
     "message": "Optimize Adblock Plus for the language(s) you typically browse websites in."
@@ skipping 18 matching lines @@
     "description": "More filters section description in General tab",
     "message": "These are additional filters you previously added to Adblock Plus."
   },
   "options_more_filters_note": {
     "description": "More filters section note in General tab",
     "message": "<strong>Note:</strong> These filters are managed by third party authors. Adblock Plus is not responsible for them."
   },
   "options_language_add": {
     "description": "Add other language button in General Tab",
     "message": "+ add a language"
-  },
-  "options_more_anti-adblock_tooltip": {
-    "message": "Some websites show messages that ask you to turn off your ad blocker. Access to content will not be limited on sites that require no action from you (i.e. you are not required to turn off Adblock Plus to access the content)."
-  },
-  "options_more_malware_tooltip": {
-    "message": "Malicious software (or \"malware\") is software that is intended to gain access to and damage your computer. Computer viruses, worms, spyware and Trojan horses are all forms of malware."
-  },
-  "options_more_privacy_tooltip": {
-    "message": "Protect your personal data by removing all forms of tracking from the Internet including information collectors."
-  },
-  "options_more_social_tooltip": {
-    "message": "The social media buttons (or icons) on the websites that you visit allow social media networks to build a profile of you based on your browsing habits - even when you don't click on them. Hide these buttons to protect your profile."
   },
   "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": {
@@ skipping 11 matching lines @@
     "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_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",
@@ skipping 58 matching lines @@
   "options_filterList_minutes": {
     "description": "Text inside 'Last update' column in Advanced tab",
     "message": "minutes ago"
   },
   "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"
+    "message": "+ Add a new 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"
   },
   "options_customFilters_description": {
@@ skipping 67 matching lines @@
     "message": "Edit filters"
   },
   "options_customFilter_cancel": {
     "description": "Label below raw view of user's filter list in Advanced tab",
     "message": "Cancel"
   },
   "options_customFilter_save": {
     "description": "Label below raw view of user's filter list 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 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_help_description": {
+    "description": "Help tab description",
+    "message": "Find help or get in touch with us"
+  },
+  "options_support_title": {
+    "description": "Section title in Help tab",
+    "message": "Support"
+  },
+  "options_report_issue": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Think content or functionality is being incorrectly blocked by us? <a>Report incorrectly blocked items here</a>"
+  },
+  "options_report_ad": {
+    "description": "'Support' section list item in Help tab",
+    "message": "See an ad that you think shouldn't be there? <a>Report an ad</a>"
+  },
+  "options_report_bug": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Found a bug? <a>Send us a bug report</a>"
+  },
+  "options_report_forum": {
+    "description": "'Support' section list item in Help tab",
+    "message": "Want support from our community? <a>Go to the Forum</a>"
+  },
+  "options_social_title": {
+    "description": "'Section' title in Help tab",
+    "message": "Get in touch"
+  },
+  "options_social_description": {
+    "description": "'Get in touch' section description in Help tab",
+    "message": "Have a question or a new idea? We're here to help."
+  },
+  "options_email": {
+    "description": "Email label in Help tab",
+    "message": "Email:"
+  },
+  "options_dialog_about_title": {
+    "description": "Title of about ABP dialog",
+    "message": "About Adblock Plus"
+  },
+  "options_dialog_about_version": {
+    "description": "Version information in 'about Adblock Plus' modal dialog ",
+    "message": "Version number $version$",
+    "placeholders": {
+      "version": {
+        "content": "$1",
+        "example": "2.6.7"
+      }
+    }
+  },
+  "options_dialog_about_copyright": {
+    "description": "Copyright information in 'about Adblock Plus' modal dialog ",
+    "message": "Copyright © 2017 eyeo GmbH."
+  },
+  "options_dialog_about_trademark": {
+    "description": "Trademark information in 'about Adblock Plus' modal dialog ",
+    "message": "Adblock Plus is a registered ® trademark of eyeo GmbH."
   },
   "options_dialog_predefined_confirm": {
     "description": "Confirming to add a predefined subscription when asked in a dialog",
     "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 filter list?"
   },
-  "options_dialog_custom_title": {
-    "description": "Title of custom subscription modal dialog",
-    "message": "Add other filter list"
+  "options_dialog_import_title": {
+    "description": "Title of 'Add a filter list' dialog",
+    "message": "Add a 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 filter list with this URL"
+  "options_dialog_import_subscription_title": {
+    "description": "Input label in 'Add a filter list' dialog",
+    "message": "Filter list name"
+  },
+  "options_dialog_import_subscription_title_error": {
+    "description": "Error message of 'Filter list name' input in 'Add a filter list' dialog",
+    "message": "Please fill out the field"
+  },
+  "options_dialog_import_subscription_location": {
+    "description": "Input label in 'Add a filter list' dialog",
+    "message": "Filter list URL"
+  },
+  "options_dialog_import_subscription_location_error": {
+    "description": "Error message of 'Filter list URL' input in 'Add a filter list' dialog",
+    "message": "Enter a valid URL"
   },
   "options_dialog_edit_own_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 filter rules"
-  },
    "options_dialog_language_title": {
     "description": "Title of lanugage modal dialog",
     "message": "Select a language"
   },
   "options_dialog_language_find": {
     "description": "Placeholder text in add language modal dialog",
     "message": "Find language"
   },
   "options_dialog_language_added": {
     "description": "Table headline in add language modal dialog",
     "message": "Added languages"
   },
   "options_dialog_language_other": {
     "description": "Table headline in add language modal dialog",
     "message": "Other languages"
   },
   "options_dialog_language_other_empty": {
     "description": "Text shown when list of available languages is empty",
     "message": "There are no available languages."
   },
   "options_dialog_tracking_title": {
     "description": "Title of tracking modal dialog",
     "message": "Allow tracking on Acceptable Ads?"
   },
-  "options_dialog_tracking_notification": {
-    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
-    "message": "You currently allow Acceptable Ads to be shown. These ads are respectful and do not interfere with content that you view. Some of these ads require tracking to show you more relevant ads. Click <strong>YES</strong> to continue seeing relevant nonintrusive ads."

[saroyanm, 2017/08/19 00:00:40]

In specs each sentence looks to be on it's own line, but we do not support row
breaks in the strings.
One solution is that I can put them inside <span>s with <br> in between:
<span></span><br>
<span></span><br>
<span></span><br>
<span></span>

[Thomas Greiner, 2017/08/25 18:44:51]

This is not a viable solution because we don't support `<span>` tags either.
Furthermore, it'd increase the probability of syntax errors that can be
introduced during translation.

If you don't want to modify the translation code you could simply split it up
into one string per paragraph as we did with "options_page_header_*", for
instance.

Alternatively, you could implement support for `<br>`. I had to do that for
Flattr already so if you want, I could provide you with the code we're using
there.

[saroyanm, 2017/08/27 16:25:28]

Actually that what I meant by the example of spans, so I was thinking to use
<span>s instead of <p> tags.
Yes please, I think that will be best solution and save me time.

[Thomas Greiner, 2017/08/29 10:20:41]

Ah ok. In that case `<div>` would be more appropriate than `<span>` though
because it's already a block element so no need for `<br>`.
I uploaded it to
https://gist.github.com/ThomasGreiner/a2f32ed70cdb19e5e24654ae3b4f5fac (see
`getNodes()`). But note that we're working with a virtual DOM there so you'd
still need to adapt that to using the actual DOM API.

Obviously, we need to be very careful when dealing with transforming arbitrary
text into DOM elements so if you're uncomfortable with doing that feel free to
use multiple strings instead as you suggested.

[saroyanm, 2017/09/14 21:56:14]

Having another look I think we don't need to use <br>, this seems to be
different strings separated into paragraphs, or lists I think.

-  },
-  "options_dialog_tracking_relevent_ads": {

[Thomas Greiner, 2017/08/25 18:44:51]

Detail: Those IDs are specific to how the text is phrased. Instead they should
reflect what the message is.

e.g.
Replace "options_dialog_tracking_relevant_ads" with
"options_dialog_tracking_allow"
Replace "options_dialog_tracking_privacy_ads" with
"options_dialog_tracking_disallow"

[Thomas Greiner, 2017/08/25 18:44:51]

Typo: Replace "relevent" with "relevant"

[saroyanm, 2017/08/27 16:25:28]

agree.

[saroyanm, 2017/09/14 21:56:13]

Done.

+  "options_dialog_tracking_notification_1": {
+    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
+    "message": "You currently allow Acceptable Ads to be shown."
+  },
+  "options_dialog_tracking_notification_2": {
+    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
+    "message": "These ads are respectful and do not interfere with content that you view."
+  },
+  "options_dialog_tracking_notification_3": {
+    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
+    "message": "Some of these ads require tracking to show you more relevant ads."
+  },
+  "options_dialog_tracking_notification_4": {
+    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
+    "message": "Click <strong>YES</strong> to continue seeing relevant nonintrusive ads."
+  },
+  "options_dialog_tracking_allow": {
     "description": "Button text in 'Allow tracking on Acceptable Ads' dialog",
     "message": "Yes, allow relevant ads"
   },
-  "options_dialog_tracking_privacy_ads": {
+  "options_dialog_tracking_disallow": {
     "description": "Button text in 'Allow tracking on Acceptable Ads' dialog",
     "message": "No, turn off tracking"
   },
-  "options_dialog_tracking_note": {
-    "description": "Text in 'Allow tracking on Acceptable Ads' dialog",

[Thomas Greiner, 2017/08/25 18:44:51]

Detail: I wasn't able to tell where this text is supposed to be without looking
at the screenshot. It'd be great if the ID and the description were more
descriptive.

e.g.
"options_dialog_tracking_note_title"
"Text preceding list of notes in 'Allow tracking on Acceptable Ads' dialog"

[saroyanm, 2017/08/27 16:25:28]

Agree.

[saroyanm, 2017/09/14 21:56:14]

Done.

+  "options_dialog_tracking_note_title": {
+    "description": "Text preceding list of notes in 'Allow tracking on Acceptable Ads' dialog",
     "message": "Note:"
   },
   "options_dialog_tracking_note_1": {
     "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
     "message": "Adblock Plus cannot guarantee that all tracking is disabled."
   },
   "options_dialog_tracking_note_2": {
     "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
     "message": "Ads shown are chosen by the website you visit, not Adblock Plus."
   },
   "options_dialog_tracking_note_3": {
     "description": "Text in 'Allow tracking on Acceptable Ads' dialog",
     "message": "Adblock Plus never tracks your data."
+  },
+  "options_whitelist_notification": {
+    "description": "Notification that is shown after a new website is whitelisted",
+    "message": "\"$website$\" has been whitelisted.",
+    "placeholders": {
+      "website": {
+        "content": "$1",
+        "example": "example.com"
+      }
+    }
+  },
+  "options_notification_hide": {
+    "description": "Hidden text attached to the close button for screen readers of Notification",
+    "message": "Close notification"
   },
   "options_language_en": {
     "description": "Language name shown in add language modal dialog",
     "message": "English"
   },
   "options_language_id": {
     "description": "Language name shown in add language modal dialog",
     "message": "Indonesian"
   },
   "options_language_bg": {
@@ skipping 42 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"
   }
 }