Bug 1496244 - Change 'Tracking Protection' to 'Content Blocking' in Exceptions Dialog under Content Blocking r=flod,johannh
☠☠ backed out by 4d2fbdbead3a ☠ ☠
authorMichael Kohler <me@michaelkohler.info>
Mon, 15 Oct 2018 10:56:36 +0000
changeset 499711 5aff488dd9e943c985dc7ffed98d26e46c71dfab
parent 499710 69252f7e6d81935bacf4f12e45aa055026328a50
child 499712 dc5c09d437018c7bbd72dda3b162c1b3b06b03a1
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod, johannh
bugs1496244
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
browser/components/preferences/in-content/privacy.xul
browser/components/preferences/permissions.js
browser/locales/en-US/browser/preferences/permissions.ftl
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -46,18 +46,18 @@
                   flex="1"
                   data-l10n-id="tracking-exceptions"
                   preference="pref.privacy.disable_button.tracking_protection_exceptions"
                   search-l10n-ids="
                     permissions-remove.label,
                     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>
     </hbox>
     <hbox id="contentBlockingCheckboxContainer">
       <checkbox id="contentBlockingCheckbox"
                 onsyncfrompreference="return gPrivacyPane.updateContentBlockingToggle()"
                 preference="browser.contentblocking.enabled"/>
--- a/browser/components/preferences/permissions.js
+++ b/browser/components/preferences/permissions.js
@@ -2,18 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 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",
     description: "permissions-exceptions-cookie-desc",
   },
   "popup": {
     window: "permissions-exceptions-popup-window",
     description: "permissions-exceptions-popup-desc",
--- a/browser/locales/en-US/browser/preferences/permissions.ftl
+++ b/browser/locales/en-US/browser/preferences/permissions.ftl
@@ -58,20 +58,20 @@ permissions-capabilities-prompt =
 
 ## Invalid Hostname Dialog
 
 permissions-invalid-uri-title = Invalid Hostname Entered
 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
 
 permissions-exceptions-cookie-window =
     .title = Exceptions - Cookies and Site Data
     .style = { permissions-window.style }
 permissions-exceptions-cookie-desc = You can specify which websites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.