From ac301cd115fe910274b18244c8f08cb80d1d842c Mon Sep 17 00:00:00 2001
From: Michael Kohler <me@michaelkohler.info>
Date: Mon, 15 Oct 2018 10:56:36 +0000
Subject: [PATCH] Bug 1496244 - Change 'Tracking Protection' to 'Content
 Blocking' in Exceptions Dialog under Content Blocking r=flod,johannh

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

--HG--
extra : moz-landing-system : lando
---
 browser/components/preferences/in-content/privacy.xul     | 4 ++--
 browser/components/preferences/permissions.js             | 4 ++--
 browser/locales/en-US/browser/preferences/permissions.ftl | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
index 479c0dd9740d..c9060959981a 100644
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -51,8 +51,8 @@
                     permissions-remove-all.label,
                     permissions-button-cancel.label,
                     permissions-button-ok.label,
-                    permissions-exceptions-tracking-protection-window.title,
-                    permissions-exceptions-tracking-protection-desc,
+                    permissions-exceptions-content-blocking-window.title,
+                    permissions-exceptions-content-blocking-desc,
                   "/>
         </hbox>
       </vbox>
diff --git a/browser/components/preferences/permissions.js b/browser/components/preferences/permissions.js
index 78d1f954d49d..577c1082bd70 100644
--- a/browser/components/preferences/permissions.js
+++ b/browser/components/preferences/permissions.js
@@ -7,8 +7,8 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const permissionExceptionsL10n = {
   "trackingprotection": {
-    window: "permissions-exceptions-tracking-protection-window",
-    description: "permissions-exceptions-tracking-protection-desc",
+    window: "permissions-exceptions-content-blocking-window",
+    description: "permissions-exceptions-content-blocking-desc",
   },
   "cookie": {
     window: "permissions-exceptions-cookie-window",
diff --git a/browser/locales/en-US/browser/preferences/permissions.ftl b/browser/locales/en-US/browser/preferences/permissions.ftl
index a0be771940d0..d8e51d2920e1 100644
--- a/browser/locales/en-US/browser/preferences/permissions.ftl
+++ b/browser/locales/en-US/browser/preferences/permissions.ftl
@@ -63,10 +63,10 @@ permissions-invalid-uri-label = Please enter a valid hostname
 
 ## Exceptions - Tracking Protection
 
-permissions-exceptions-tracking-protection-window =
-    .title = Exceptions - Tracking Protection
+permissions-exceptions-content-blocking-window =
+    .title = Exceptions - Content Blocking
     .style = { permissions-window.style }
-permissions-exceptions-tracking-protection-desc = You have disabled Tracking Protection on these websites.
+permissions-exceptions-content-blocking-desc = You have disabled Content Blocking on these websites.
 
 ## Exceptions - Cookies