Backed out changeset 2aee1f1d976c (bug 1566861) for browser-chrome failures at browser/base/content/test/static/browser_all_files_referenced.js on a CLOSED TREE
authorCoroiu Cristina <ccoroiu@mozilla.com>
Thu, 08 Aug 2019 22:19:24 +0300
changeset 11890 4b571d222fea68bc0d62e3fbd9b56812bcb10957
parent 11889 b015ed3c143ad0fb7a747eaaece87e783dff1cd0
child 11891 fbe00f28d9e1e45ed1ebc63e5c29b4b97d3963c1
push id160
push userflodolo@mozilla.com
push dateSat, 10 Aug 2019 05:18:26 +0000
bugs1566861
Backed out changeset 2aee1f1d976c (bug 1566861) for browser-chrome failures at browser/base/content/test/static/browser_all_files_referenced.js on a CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 56f1c824cf952ea281320ff65a368bb9ea9933c2 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/browser/preferences/permissions.ftl
browser/browser/preferences/preferences.ftl
--- a/browser/browser/preferences/permissions.ftl
+++ b/browser/browser/preferences/permissions.ftl
@@ -79,21 +79,16 @@ permissions-invalid-uri-label = Please e
 
 ## Exceptions - Tracking Protection
 
 permissions-exceptions-content-blocking-window =
     .title = Exceptions - Content Blocking
     .style = { permissions-window.style }
 permissions-exceptions-content-blocking-desc = You have disabled content blocking on these websites.
 
-permissions-exceptions-etp-window =
-    .title = Exceptions for Enhanced Tracking Protection
-    .style = { permissions-window.style }
-permissions-exceptions-etp-desc = You’ve turned off protections 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.
 
 ## Exceptions - Pop-ups
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -847,21 +847,16 @@ sitedata-disallow-cookies-option =
 
 # This label means 'type of content that is blocked', and is followed by a drop-down list with content types below.
 # The list items are the strings named sitedata-block-*-option*.
 sitedata-block-desc = Type blocked
     .accesskey = T
 
 sitedata-option-block-trackers =
     .label = Third-party trackers
-
-sitedata-option-block-cross-site-trackers =
-    .label = Cross-site trackers
-sitedata-option-block-cross-site-and-social-media-trackers =
-    .label = Cross-site and social media trackers
 sitedata-option-block-unvisited =
     .label = Cookies from unvisited websites
 sitedata-option-block-all-third-party =
     .label = All third-party cookies (may cause websites to break)
 sitedata-option-block-all =
     .label = All cookies (will cause websites to break)
 
 sitedata-clear =
@@ -893,18 +888,16 @@ addressbar-locbar-openpage-option =
     .accesskey = O
 
 addressbar-suggestions-settings = Change preferences for search engine suggestions
 
 ## Privacy Section - Content Blocking
 
 content-blocking-header = Content Blocking
 
-content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection
-
 content-blocking-section-description = Protect your privacy while you browse. Block invisible content that tracks the sites you visit and profiles you. Blocking some of this content may make pages load faster.
 
 content-blocking-learn-more = Learn more
 
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
 content-blocking-setting-standard =
   .label = Standard
@@ -917,51 +910,35 @@ content-blocking-setting-custom =
   .accesskey = C
 
 content-blocking-standard-desc = Balanced for protection and performance. Allows some trackers so websites function properly.
 content-blocking-strict-description = Stronger protection, may cause some sites to break.
 content-blocking-custom-desc = Choose what to block.
 
 content-blocking-private-trackers = Known trackers only in Private Windows
 content-blocking-third-party-cookies = Third-party tracking cookies
-
-content-blocking-etp-standard-desc = Balanced for protection and performance. Pages will load normally.
-content-blocking-etp-strict-desc = Stronger protection, but may cause some sites or content to break.
-content-blocking-etp-custom-desc = Choose which trackers and scripts to block.
-
-content-blocking-private-windows = Tracking content in Private Windows
-content-blocking-cross-site-tracking-cookies = Cross-site tracking cookies
-content-blocking-social-media-trackers = Social media trackers
 content-blocking-all-cookies = All cookies
 content-blocking-unvisited-cookies = Cookies from unvisited sites
 content-blocking-all-windows-trackers = Known trackers in all windows
-content-blocking-all-windows-tracking-content = Tracking content in all windows
 content-blocking-all-third-party-cookies = All third-party cookies
 content-blocking-cryptominers = Cryptominers
 content-blocking-fingerprinters = Fingerprinters
 
 content-blocking-warning-title = Heads up!
 content-blocking-warning-description = Blocking content can cause some websites to break. It’s easy to disable blocking for sites you trust.
 content-blocking-learn-how = Learn how
 
-content-blocking-etp-warning-description = Blocking trackers could impact the functionality of some sites. Reload a page with trackers to load all content.
-content-blocking-warning-learn-how = Learn how
-
 content-blocking-reload-description = You will need to reload your tabs to apply these changes.
 content-blocking-reload-tabs-button =
   .label = Reload All Tabs
   .accesskey = R
 
 content-blocking-trackers-label =
   .label = Trackers
   .accesskey = T
-
-content-blocking-tracking-content-label =
-  .label = Tracking content
-  .accesskey = T
 content-blocking-tracking-protection-option-all-windows =
   .label = In all windows
   .accesskey = A
 content-blocking-option-private =
   .label = Only in Private Windows
   .accesskey = p
 content-blocking-tracking-protection-change-block-list = Change block list