Issue 6031 - Implement Acceptable Ads notification

locale/en_US/desktop-options.json

Index: locale/en_US/desktop-options.json
===================================================================
--- a/locale/en_US/desktop-options.json
+++ b/locale/en_US/desktop-options.json
@@ -67,6 +67,37 @@
     "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>$tracking$</strong>' and '<strong>$acceptableAds$</strong>' enabled.",
+    "placeholders": {
+      "tracking": {
+        "content": "$1",
+        "example": "EasyPrivacy"

[Thomas Greiner, 2017/11/21 17:17:29]

Detail: These examples don't reflect the feature label (i.e. "Block additional
tracking" and "Allow Acceptable Ads") as seen in the spec but the filter list
title and are therefore not representative of the values we'd expect for those
placeholders.

[saroyanm, 2017/11/21 18:17:35]

Done.

+      },
+      "acceptableAds": {
+        "content": "$2",
+        "example": "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": {

[Thomas Greiner, 2017/11/21 17:17:29]

Detail: See
https://codereview.adblockplus.org/29609587/diff/29611601/locale/en_US/deskto...
and
https://codereview.adblockplus.org/29609587/diff/29611601/locale/en_US/deskto...

[saroyanm, 2017/11/21 18:17:35]

Sorry, done.

+        "content": "$1"
+      }
+    }
+  },
+  "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"