Backed out changeset 5aff488dd9e9 (bug 1496244) for Browser chrome failures in browser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_2.js

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-content-blocking-window.title,
-                    permissions-exceptions-content-blocking-desc,
+                    permissions-exceptions-tracking-protection-window.title,
+                    permissions-exceptions-tracking-protection-desc,
                   "/>
         </hbox>
       </vbox>

browser/components/preferences/permissions.js

@@ -7,8 +7,8 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 const permissionExceptionsL10n = {
   "trackingprotection": {
-    window: "permissions-exceptions-content-blocking-window",
-    description: "permissions-exceptions-content-blocking-desc",
+    window: "permissions-exceptions-tracking-protection-window",
+    description: "permissions-exceptions-tracking-protection-desc",
   },
   "cookie": {
     window: "permissions-exceptions-cookie-window",

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-content-blocking-window =
-    .title = Exceptions - Content Blocking
+permissions-exceptions-tracking-protection-window =
+    .title = Exceptions - Tracking Protection
     .style = { permissions-window.style }
-permissions-exceptions-content-blocking-desc = You have disabled Content Blocking on these websites.
+permissions-exceptions-tracking-protection-desc = You have disabled Tracking Protection on these websites.
 
 ## Exceptions - Cookies