Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 13:21:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1483445 - Change string from tracking protection to content blocking r=dragana!

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Valentin Gosu 2018-08-20 08:43:08 +00:00
parent 1e4de2fbb4
commit 20d09475cd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/webconsole/test/mochitest/browser_webconsole_trackingprotection_errors.js
View File

@ -28,7 +28,7 @@ add_task(async function testMessagesAppear() {
const message = await waitFor(() => findMessage(hud,
"The resource at \u201chttp://tracking.example.com/\u201d was " +
"blocked because tracking protection is enabled"));
"blocked because content blocking is enabled"));
await testClickOpenNewTab(hud, message);
});

2
netwerk/base/nsChannelClassifier.cpp
View File

@ -889,7 +889,7 @@ nsChannelClassifier::SetBlockedContent(nsIChannel *channel,
NS_ConvertUTF8toUTF16 spec(uri->GetSpecOrDefault());
const char16_t* params[] = { spec.get() };
const char* message = (aErrorCode == NS_ERROR_TRACKING_URI) ?
"TrackingUriBlocked" : "UnsafeUriBlocked";
"TrackerUriBlocked" : "UnsafeUriBlocked";
nsCString category = (aErrorCode == NS_ERROR_TRACKING_URI) ?
NS_LITERAL_CSTRING("Tracking Protection") :
NS_LITERAL_CSTRING("Safe Browsing");

2
netwerk/locales/en-US/necko.properties
View File

@ -40,7 +40,7 @@ PhishingAuthAccept=I understand and will be very careful
SuperfluousAuth=You are about to log in to the site “%1$S” with the username “%2$S”, but the website does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
AutomaticAuth=You are about to log in to the site “%1$S” with the username “%2$S”.
TrackingUriBlocked=The resource at “%1$S” was blocked because tracking protection is enabled.
TrackerUriBlocked=The resource at “%1$S” was blocked because content blocking is enabled.
UnsafeUriBlocked=The resource at “%1$S” was blocked by Safe Browsing.
# LOCALIZATION NOTE (nsICookieManagerAPIDeprecated): don't localize originAttributes.