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,22 @@
     "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_notification_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>Block additional tracking</strong>' and '<strong>Allow Acceptable Ads</strong>' enabled."
+  },
+  "options_tracking_notification_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_notification_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>Only allow Acceptable Ads that are privacy-friendly</strong>' checkbox below."

[Thomas Greiner, 2017/11/16 19:25:05]

"Only allow Acceptable Ads that are privacy-friendly" has been renamed.

Generally, I noticed that we mention a lot of filter list and option names in
those strings. So we could use placeholders for those in translatable strings
which would allow us to ensure that the texts for those are always exactly the
same.

[saroyanm, 2017/11/17 16:10:39]

Done.

+  },
+  "options_tracking_notification_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"