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 49 matching lines @@
     "message": "The social media icons on the websites 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. Hiding these icons can protect your profile."
   },
   "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_notification_1": {
+  "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>Block additional tracking</strong>' and '<strong>Allow Acceptable Ads</strong>' enabled."
-  },
-  "options_tracking_notification_2": {
+    "message": "We noticed you have both '<strong>$tracking$</strong>' and '<strong>$acceptableAds$</strong>' enabled.",
+    "placeholders": {
+      "tracking": {
+        "content": "$1",
+        "example": "Block additional tracking"
+      },
+      "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_notification_3": {
+  "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>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": {
+    "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"
   },
   "options_acceptableAds_ads_description_1": {
     "description": "Acceptable Ads section 'Allow some nonintrusive ads' option description in General tab",
     "message": "Acceptable Ads are not annoying and do not interfere with the content you are viewing. <a>Read more about the Acceptable Ads criteria</a>"
@@ skipping 342 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"
   }
 }