Issue 6031 - Implement Acceptable Ads notification

locale/en_US/desktop-options.json

 {
   "options_page_title": {
     "description": "Options page title",
     "message": "Adblock Plus Options"
   },
   "options_page_title": {
     "description": "Page title in navigation sidebar",
     "message": "Settings"
   },
   "options_tab_general": {
@@ skipping 51 matching lines @@
   "options_acceptableAds_header": {
     "description": "Section title in General tab",
     "message": "Acceptable Ads"
   },
   "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_tracking_warning_1": {
     "description": "Text of the tracking notification (being shown when both 'Acceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
-    "message": "We noticed you have both <strong>'$easy-privacy$'</strong> and '<strong>$acceptable-ads$</strong>' enabled.",

[saroyanm, 2017/11/17 16:13:26]

Detail: <strong> should go inside of "'" for consistency 

[Thomas Greiner, 2017/11/20 18:36:05]

Might be a personal preference but I agree. In any case, we should sync up with
our technical writers to keep this consistent also in the future.

[saroyanm, 2017/11/21 14:58:33]

I agree that this should be documented somewhere, it was more note for myself,
to make it consistent, as I moved the tag outside while I was testing the passed
variable.

-    "placeholders": {
-      "easy-privacy": {

[Thomas Greiner, 2017/11/20 18:36:05]

Detail: I'd recommend avoiding special characters such as "-" because it's not
clear which characters we are allowed to use in the placeholder IDs according to
https://developer.chrome.com/apps/i18n-messages#placeholders

[Thomas Greiner, 2017/11/20 18:36:05]

Detail: The filter list behind the "privacy" feature might change so, while we
can mention "EasyPrivacy" as an example, we should use a more generic name for
the placeholder ID.

[saroyanm, 2017/11/21 14:58:33]

Agree, done.

[saroyanm, 2017/11/21 14:58:33]

Okey, I use "tracking" now.

-        "content": "$1"

[Thomas Greiner, 2017/11/20 18:36:05]

Detail: Let's also include the "example" property for each placeholder as we do
for others in this file.

[saroyanm, 2017/11/21 14:58:33]

Done.

+    "message": "We noticed you have both '<strong>$tracking$</strong>' and '<strong>$acceptableAds$</strong>' enabled.",
+    "placeholders": {
+      "tracking": {
+        "content": "$1",
+        "example": "Block additional tracking"
       },
-      "acceptable-ads": {
-        "content": "$2"
+      "acceptableAds": {
+        "content": "$2",
+        "example": "Allow Acceptable Ads"
       }
     }
   },
   "options_tracking_warning_2": {
     "description": "Text of the tracking notification (being shown when both 'Acceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
     "message": "We want you to know that in order for advertisers to show you more relevant ads, there <strong>may</strong> be some tracking with Acceptable Ads."
   },
   "options_tracking_warning_3": {
     "description": "Text of the tracking notification (being shown when both 'Acceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
-    "message": "If you prefer extra privacy, select the '<strong>$privacy-friendly-acceptable-ads$</strong>' checkbox below.",
-    "placeholders": {
-      "privacy-friendly-acceptable-ads": {
-        "content": "$1"
+    "message": "If you prefer extra privacy, select the '<strong>$acceptableAdsPrivacy$</strong>' checkbox below.",
+    "placeholders": {
+      "acceptableAdsPrivacy": {
+        "content": "$1",
+        "example": "Only allow ads without third-party tracking"
       }
     }
   },
   "options_tracking_warning_acknowledgment": {
     "description": "Text in the tracking notification (being shown when both 'Acceptable Ads' and 'EasyPrivacy' are enabled) in General tab",
     "message": "OK, got it"
   },
   "options_acceptableAds_ads_label": {
     "description": "Acceptable Ads section option label in General tab",
     "message": "Allow Acceptable Ads"
@@ skipping 346 matching lines @@
         "content": "$1",
         "example": "example.com"
       }
     }
   },
   "options_notification_hide": {
     "description": "Hidden text attached to the close button for screen readers of Notification",
     "message": "Close notification"
   }
 }