From ebb1072247cf14bef2cceb886ff09ce111e05f3d Mon Sep 17 00:00:00 2001
From: Johann Hofmann <jhofmann@mozilla.com>
Date: Wed, 29 Aug 2018 16:13:00 +0000
Subject: [PATCH] Bug 1484832 - Update DNT section for Content Blocking.
 r=Gijs,flod

Differential Revision: https://phabricator.services.mozilla.com/D4517

--HG--
extra : moz-landing-system : lando
---
 browser/components/preferences/in-content/privacy.js      | 8 ++++++++
 browser/locales/en-US/browser/preferences/preferences.ftl | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/browser/components/preferences/in-content/privacy.js b/browser/components/preferences/in-content/privacy.js
index 38c877d0b412..b205a405e620 100644
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -578,6 +578,14 @@ var gPrivacyPane = {
       document.getElementById(id).hidden = contentBlockingUiEnabled != visibleState[id];
     }
 
+    // Update the Do Not Track section to not mention "Tracking Protection".
+    if (contentBlockingUiEnabled) {
+      let dntDefaultRadioItem =
+        document.querySelector("#doNotTrackRadioGroup > radio[value=false]");
+      document.l10n.setAttributes(
+        dntDefaultRadioItem, "do-not-track-option-default-content-blocking");
+    }
+
     // Allow turning off the "(recommended)" label using a pref
     let blockCookiesFromTrackers = document.getElementById("blockCookiesFromTrackers");
     if (contentBlockingCookiesAndSiteDataRejectTrackersRecommended) {
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
index 8a725bd70f5d..265aa090a87d 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -6,6 +6,8 @@ do-not-track-description = Send websites a “Do Not Track” signal that you do
 do-not-track-learn-more = Learn more
 do-not-track-option-default =
     .label = Only when using Tracking Protection
+do-not-track-option-default-content-blocking =
+    .label = Only when { -brand-short-name } is set to block Detected Trackers
 do-not-track-option-always =
     .label = Always