Backed out changeset d64cb52ebf88 (bug 1543812) for xpcshell failure at parser/xml/test/unit/test_sanitizer.js. On a CLOSED TREE
authorDaniel Varga <dvarga@mozilla.com>
Wed, 05 Jun 2019 03:50:16 +0300
changeset 11596 0c169afe99193c2b76171cae0d383a9aabc75369
parent 11595 f29db32f6ba6a399709bfc9215ea723acec24d0c
child 11597 74a5ef1496def030b718d12d8274a1517d79a77c
push id145
push userflodolo@mozilla.com
push dateFri, 07 Jun 2019 15:44:13 +0000
bugs1543812
Backed out changeset d64cb52ebf88 (bug 1543812) for xpcshell failure at parser/xml/test/unit/test_sanitizer.js. On a CLOSED TREE X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: dd4f29419f51bcca3546e29aa4e5fbf0bde2b0b2 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 4e5980a74c9c5023f5f64741a4bee1c1055af24c X-Channel-Repo: releases/mozilla-release X-Channel-Revision: df853c362664989e025d1206b59c37c435186a91
browser/browser/preferences/permissions.ftl
browser/browser/preferences/preferences.ftl
browser/chrome/browser/sitePermissions.properties
--- a/browser/browser/preferences/permissions.ftl
+++ b/browser/browser/preferences/permissions.ftl
@@ -41,28 +41,19 @@ permissions-remove-all =
 permissions-button-cancel =
     .label = Cancel
     .accesskey = C
 
 permissions-button-ok =
     .label = Save Changes
     .accesskey = S
 
-permissions-autoplay-menu = Default for all websites:
-
 permissions-searchbox =
     .placeholder = Search Website
 
-permissions-capabilities-autoplay-allow =
-    .label = Allow Audio and Video
-permissions-capabilities-autoplay-block =
-    .label = Block Audio
-permissions-capabilities-autoplay-blockall =
-    .label = Block Audio and Video
-
 permissions-capabilities-allow =
     .label = Allow
 permissions-capabilities-block =
     .label = Block
 permissions-capabilities-prompt =
     .label = Always Ask
 
 permissions-capabilities-listitem-allow =
@@ -114,23 +105,16 @@ permissions-exceptions-addons-desc = You
 
 ## Exceptions - Autoplay Media
 
 permissions-exceptions-autoplay-media-window2 =
     .title = Exceptions - Autoplay
     .style = { permissions-window.style }
 permissions-exceptions-autoplay-media-desc2 = You can specify which websites are always or never allowed to autoplay media with sound. Type the address of the site you want to manage and then click Block or Allow.
 
-## Site Permissions - Autoplay
-
-permissions-site-autoplay-window =
-    .title = Settings - Autoplay
-    .style = { permissions-window.style }
-permissions-site-autoplay-desc = You can manage the sites that do not follow your default autoplay settings here.
-
 ## Site Permissions - Notifications
 
 permissions-site-notification-window =
     .title = Settings - Notification Permissions
     .style = { permissions-window.style }
 permissions-site-notification-desc = The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
 permissions-site-notification-disable-label =
     .label = Block new requests asking to allow notifications
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -900,17 +900,17 @@ content-blocking-option-private =
   .label = Only in Private Windows
   .accesskey = p
 content-blocking-tracking-protection-change-block-list = Change block list
 
 content-blocking-cookies-label =
   .label = Cookies
   .accesskey = C
 
-content-blocking-expand-section =
+content-blocking-expand-section = 
   .tooltiptext = More information
 
 # Cryptomining refers to using scripts on websites that can use a computer’s resources to mine cryptocurrency without a user’s knowledge.
 content-blocking-cryptominers-label =
   .label = Cryptominers
   .accesskey = y
 
 # Browser fingerprinting is a method of tracking users by the configuration and settings information (their "digital fingerprint")
@@ -957,22 +957,16 @@ permissions-notification-pause =
 permissions-block-autoplay-media2 =
     .label = Block websites from automatically playing sound
     .accesskey = B
 
 permissions-block-autoplay-media-exceptions =
     .label = Exceptions…
     .accesskey = E
 
-permissions-autoplay = Autoplay
-
-permissions-autoplay-settings =
-    .label = Settings…
-    .accesskey = t
-
 permissions-block-popups =
     .label = Block pop-up windows
     .accesskey = B
 
 permissions-block-popups-exceptions =
     .label = Exceptions…
     .accesskey = E
 
--- a/browser/chrome/browser/sitePermissions.properties
+++ b/browser/chrome/browser/sitePermissions.properties
@@ -23,20 +23,16 @@ state.current.hide = Hide Prompt
 #                    state.multichoice.allowForSession,
 #                    state.multichoice.block):
 # Used to label permission state checkboxes in the page info dialog.
 state.multichoice.alwaysAsk = Always Ask
 state.multichoice.allow = Allow
 state.multichoice.allowForSession = Allow for Session
 state.multichoice.block = Block
 
-state.multichoice.autoplayblock = Block Audio
-state.multichoice.autoplayblockall = Block Audio and Video
-state.multichoice.autoplayallow = Allow Audio and Video
-
 permission.autoplay-media2.label = Autoplay sound
 permission.cookie.label = Set Cookies
 permission.desktop-notification3.label = Send Notifications
 permission.image.label = Load Images
 permission.camera.label = Use the Camera
 permission.microphone.label = Use the Microphone
 permission.screen.label = Share the Screen
 permission.install.label = Install Add-ons