Backed out 2 changesets (bug 1567896) for bc failures in browser_duplicateIDs.js on a CLOSED TREE
authorOana Pop Rus <opoprus@mozilla.com>
Tue, 30 Jul 2019 23:04:32 +0300
changeset 11834 3b698726b47071c8bac5fd19068729b3913a8c81
parent 11833 228b8674b2047f327b8a367c90b957fc9ad75d9d
child 11835 baa6e563543d9147c1a1a9d865bd4432b35ddc69
push id157
push userflodolo@mozilla.com
push dateFri, 02 Aug 2019 11:41:38 +0000
bugs1567896
Backed out 2 changesets (bug 1567896) for bc failures in browser_duplicateIDs.js on a CLOSED TREE Backed out changeset 9f3d76a1c6b6 (bug 1567896) Backed out changeset d2567cf47a5f (bug 1567896) X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: b7fde879dbe39b315dbf6918875cc4d8c89d553f X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: e5d98eda2ec359a0968c567076b1a625cb6c99ce X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 2fb19d0466d2f61674c0af80813645cccd510593 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: a8da73ce90a4110e14caaba3e93d8a086b3a0669
browser/chrome/browser/browser.dtd
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -911,20 +911,16 @@ you can use these alternative items. Oth
 <!ENTITY contentBlocking.trackingProtection3.label "Trackers">
 
 <!ENTITY contentBlocking.manageSettings.label "Manage Content Blocking">
 <!ENTITY contentBlocking.manageSettings.accesskey "M">
 
 <!ENTITY contentBlocking.trackersView.label "Trackers">
 <!ENTITY contentBlocking.trackersView.strictInfo.label "To block all trackers, set content blocking to “Strict”.">
 
-<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
-<!ENTITY contentBlocking.socialblockView.label "Social Media Trackers Blocked">
-<!ENTITY contentBlocking.socialblockView.description "Social networks place trackers on other websites to follow what you do, see, and watch online. This allows social media companies to learn more about you beyond what you share on your social media profiles.">
-
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies and Site Data">
 
 <!ENTITY contentBlocking.cryptominers.label "Cryptominers">
 <!ENTITY contentBlocking.cryptominersView.label "Cryptominers">
 
 <!ENTITY contentBlocking.fingerprinters.label "Fingerprinters">
 <!ENTITY contentBlocking.fingerprintersView.label "Fingerprinters">