Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1496244 - Change 'Tracking Protection' to 'Content Blocking' in Exceptions Dialog under Content Blocking r=flod,johannh

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Michael Kohler 2018-10-15 10:56:36 +00:00
parent 076f7d04f7
commit ac301cd115
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/preferences/in-content/privacy.xul
View File

@ -51,8 +51,8 @@
permissions-remove-all.label, permissions-remove-all.label,
permissions-button-cancel.label, permissions-button-cancel.label,
permissions-button-ok.label, permissions-button-ok.label,
permissions-exceptions-tracking-protection-window.title, permissions-exceptions-content-blocking-window.title,
permissions-exceptions-tracking-protection-desc, permissions-exceptions-content-blocking-desc,
"/> "/>
</hbox> </hbox>
</vbox> </vbox>

4
browser/components/preferences/permissions.js
View File

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

6
browser/locales/en-US/browser/preferences/permissions.ftl
View File

@ -63,10 +63,10 @@ permissions-invalid-uri-label = Please enter a valid hostname
## Exceptions - Tracking Protection ## Exceptions - Tracking Protection
permissions-exceptions-tracking-protection-window = permissions-exceptions-content-blocking-window =
.title = Exceptions - Tracking Protection .title = Exceptions - Content Blocking
.style = { permissions-window.style } .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 ## Exceptions - Cookies