Bug 1517562 - Update media autoplay strings. r=flod,johannh
authorDale Harvey <dale@arandomurl.com>
Wed, 23 Jan 2019 20:52:53 +0000
changeset 515189 371bf42a4b472344a50f4e8adb3e72811f31151e
parent 515188 862a9e4f4cc877826d51acbcd3a6fbbd03d4f4d2
child 515190 de6426e0f4910ebe27666feb8153c3220d81edee
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod, johannh
bugs1517562
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1517562 - Update media autoplay strings. r=flod,johannh Differential Revision: https://phabricator.services.mozilla.com/D17131
browser/components/preferences/in-content/privacy.xul
browser/locales/en-US/browser/preferences/preferences.ftl
browser/locales/en-US/chrome/browser/sitePermissions.properties
browser/modules/SitePermissions.jsm
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -553,17 +553,17 @@
   <vbox id="notificationsDoNotDisturbBox" hidden="true">
     <checkbox id="notificationsDoNotDisturb" class="indent"/>
   </vbox>
 
   <separator flex="1"/>
 
   <hbox align="start" id="autoplayMediaCheckboxWrapper">
     <checkbox id="autoplayMediaCheckbox"
-              data-l10n-id="permissions-block-autoplay-media"
+              data-l10n-id="permissions-block-autoplay-media2"
               flex="1" />
     <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
     <hbox>
       <button id="autoplayMediaPolicyButton"
               class="accessory-button"
               data-l10n-id="permissions-block-autoplay-media-exceptions"
               search-l10n-ids="permissions-address,
                                permissions-button-cancel.label,
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -893,18 +893,18 @@ permissions-notification-settings =
     .label = Settings…
     .accesskey = t
 permissions-notification-link = Learn more
 
 permissions-notification-pause =
     .label = Pause notifications until { -brand-short-name } restarts
     .accesskey = n
 
-permissions-block-autoplay-media =
-    .label = Block websites from automatically playing media with sound
+permissions-block-autoplay-media2 =
+    .label = Block websites from automatically playing sound
     .accesskey = B
 
 permissions-block-autoplay-media-exceptions =
     .label = Exceptions…
     .accesskey = E
 
 permissions-block-popups =
     .label = Block pop-up windows
--- a/browser/locales/en-US/chrome/browser/sitePermissions.properties
+++ b/browser/locales/en-US/chrome/browser/sitePermissions.properties
@@ -23,17 +23,17 @@ 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
 
-permission.autoplay-media.label = Automatically Play Media with Sound
+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
 permission.popup.label = Open Pop-up Windows
--- a/browser/modules/SitePermissions.jsm
+++ b/browser/modules/SitePermissions.jsm
@@ -719,17 +719,17 @@ var gPermissionObject = {
                                             Ci.nsIAutoplay.BLOCKED);
       if (state == Ci.nsIAutoplay.ALLOWED) {
         return SitePermissions.ALLOW;
       } else if (state == Ci.nsIAutoplay.BLOCKED) {
         return SitePermissions.BLOCK;
       }
       return SitePermissions.UNKNOWN;
     },
-    labelID: "autoplay-media",
+    labelID: "autoplay-media2",
     states: [ SitePermissions.ALLOW, SitePermissions.BLOCK ],
   },
 
   "image": {
     states: [ SitePermissions.ALLOW, SitePermissions.BLOCK ],
   },
 
   "cookie": {