Add Autoplay permission policy

diff --git a/README.md b/README.md
index 394406df01ce6cc500c875f0f6939dd8474e2d5b..8e09c210de0dd10f90254d509e8da9aed102518b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2042,7 +2042,7 @@ Software\Policies\Mozilla\Firefox\PasswordManagerEnabled = 0x1 | 0x0
 }
 ```
 ### Permissions
 }
 ```
 ### Permissions

-Set permissions associated with camera, microphone, location, and notifications. Because these are origins, not domains, entries with unique ports must be specified separately. See examples below.
+Set permissions associated with camera, microphone, location, notifications, and autoplay. Because these are origins, not domains, entries with unique ports must be specified separately. See examples below.

 
 `Allow` is a list of origins where the feature is allowed.
 
 
 `Allow` is a list of origins where the feature is allowed.
 


@@ -2052,7 +2052,7 @@ Set permissions associated with camera, microphone, location, and notifications.
 
 `Locked` prevents the user from changing preferences for the feature.
 
 
 `Locked` prevents the user from changing preferences for the feature.
 

-**Compatibility:** Firefox 62, Firefox ESR 60.2\
+**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\

 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`
 
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`
 


@@ -2075,6 +2075,8 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Allow\1 = "https://e
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Block\1 = "https://example.edu"
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Block\1 = "https://example.edu"
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0

+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org"
+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu"

 ```
 #### macOS
 ```
 ```
 #### macOS
 ```


@@ -2142,6 +2144,17 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
       <key>Locked</key>
       <true/>
     </dict>
       <key>Locked</key>
       <true/>
     </dict>

+    <key>Autoplay</key>
+    <dict>
+      <key>Allow</key>
+      <array>
+        <string>https://example.org</string>
+      </array>
+      <key>Block</key>
+      <array>
+        <string>https://example.edu</string>
+      </array>
+    </dict>

   </dict>
 </dict>
 ```
   </dict>
 </dict>
 ```


@@ -2173,6 +2186,10 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
         "Block": ["https://example.edu"],
         "BlockNewRequests": true | false,
         "Locked": true | false
         "Block": ["https://example.edu"],
         "BlockNewRequests": true | false,
         "Locked": true | false

+      },
+      "Autoplay": {
+        "Allow": ["https://example.org"],
+        "Block": ["https://example.edu"]

       }
     }
   }
       }
     }
   }

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 1d489be52f6e66d257789d2872b34eebda7af8f9..c62f305a102b77ebae23c088e0f49f993ba194ed 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -361,6 +361,17 @@
                        <key>Locked</key>
                        <true/>
                </dict>
                        <key>Locked</key>
                        <true/>
                </dict>

+               <key>Autoplay</key>
+               <dict>
+                       <key>Allow</key>
+                       <array>
+                               <string>https://example.org</string>
+                       </array>
+                       <key>Block</key>
+                       <array>
+                               <string>https://example.edu</string>
+                       </array>
+               </dict>

        </dict>
        <key>PopupBlocking</key>
        <dict>
        </dict>
        <key>PopupBlocking</key>
        <dict>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 97a3f06f6a2376d06578fba9eb1e634768fdbcdb..a0f589899d8735ecf313720d3a01172164e9cb54 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">Mikrofon</string>
       <string id="Location_group">Standort</string>
       <string id="Notifications_group">Benachrichtigungen</string>
       <string id="Microphone_group">Mikrofon</string>
       <string id="Location_group">Standort</string>
       <string id="Notifications_group">Benachrichtigungen</string>

+      <string id="Autoplay_group">Autoplay</string>

       <string id="Authentication_group">Authentifizierung</string>
       <string id="Bookmarks_group">Lesezeichen</string>
       <string id="Certificates_group">Zertifikate</string>
       <string id="Authentication_group">Authentifizierung</string>
       <string id="Bookmarks_group">Lesezeichen</string>
       <string id="Certificates_group">Zertifikate</string>


@@ -380,6 +381,12 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, kann
       <string id="Notifications_Locked_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Einstellungen zu Benachrichtigungen nicht vom Anwender geändert werden.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, können Nutzer seine Einstellungen zu Benachrichtigungen ändern.</string>
       <string id="Notifications_Locked_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Einstellungen zu Benachrichtigungen nicht vom Anwender geändert werden.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, können Nutzer seine Einstellungen zu Benachrichtigungen ändern.</string>

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>

       <string id="FirefoxHome">Firefox Home anpassen</string>
       <string id="FirefoxHome_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen.
 
       <string id="FirefoxHome">Firefox Home anpassen</string>
       <string id="FirefoxHome_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index bda5df9a09a9e995a6d474667389eeb56ed7687c..7307f23d549363a943a2b4daac1a9a300b8baa67 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">Microphone</string>
       <string id="Location_group">Location</string>
       <string id="Notifications_group">Notifications</string>
       <string id="Microphone_group">Microphone</string>
       <string id="Location_group">Location</string>
       <string id="Notifications_group">Notifications</string>

+      <string id="Autoplay_group">Autoplay</string>

       <string id="Authentication_group">Authentication</string>
       <string id="Bookmarks_group">Bookmarks</string>
       <string id="Certificates_group">Certificates</string>
       <string id="Authentication_group">Authentication</string>
       <string id="Bookmarks_group">Bookmarks</string>
       <string id="Certificates_group">Certificates</string>


@@ -380,6 +381,12 @@ If this policy is disabled or not configured, any site that is not in the Block
       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, the user can change their notification preferences.</string>
       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, the user can change their notification preferences.</string>

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>

       <string id="FirefoxHome">Customize Firefox Home</string>
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.
 
       <string id="FirefoxHome">Customize Firefox Home</string>
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.
 

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 02829af220a0e444b5d4470153d7c71e77e2283f..49d43d62af28b61cdf1a69d2b8ff660d96c4dd62 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">Micrófono</string>
       <string id="Location_group">Ubicación</string>
       <string id="Notifications_group">Notificaciones</string>
       <string id="Microphone_group">Micrófono</string>
       <string id="Location_group">Ubicación</string>
       <string id="Notifications_group">Notificaciones</string>

+      <string id="Autoplay_group">Autoplay</string>

       <string id="Authentication_group">Autenticación</string>
       <string id="Bookmarks_group">Marcadores</string>
       <string id="Certificates_group">Certificados</string>
       <string id="Authentication_group">Autenticación</string>
       <string id="Bookmarks_group">Marcadores</string>
       <string id="Certificates_group">Certificados</string>


@@ -380,6 +381,12 @@ Si esta política está deshabilitada o no está configurada, cualquier sitio qu
       <string id="Notifications_Locked_Explain">Si esta política está habilitada, el usuario no puede cambiar las preferencias de notificaciones.
 
 Si esta política está deshabilitada o no está configurada, el usuario podrá cambiar sus preferencias de notificaciones.</string>
       <string id="Notifications_Locked_Explain">Si esta política está habilitada, el usuario no puede cambiar las preferencias de notificaciones.
 
 Si esta política está deshabilitada o no está configurada, el usuario podrá cambiar sus preferencias de notificaciones.</string>

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>

       <string id="FirefoxHome">Personalizar inicio de Firefox</string>
       <string id="FirefoxHome_Explain">Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie.
 
       <string id="FirefoxHome">Personalizar inicio de Firefox</string>
       <string id="FirefoxHome_Explain">Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index ea7e1a21fee2f6410ed19a9a3312c050e7e21ec0..acde2a9b9b89baada8a10f084491e8be7cdfaf06 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -75,6 +75,9 @@
     <category displayName="$(string.Notifications_group)" name="Notifications">
       <parentCategory ref="Permissions"/>
     </category>
     <category displayName="$(string.Notifications_group)" name="Notifications">
       <parentCategory ref="Permissions"/>
     </category>

+    <category displayName="$(string.Autoplay_group)" name="Autoplay">
+      <parentCategory ref="Permissions"/>
+    </category>

     <category displayName="$(string.Preferences_group)" name="Preferences">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Preferences_group)" name="Preferences">
       <parentCategory ref="firefox"/>
     </category>


@@ -441,6 +444,20 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="Autoplay_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Autoplay_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+      <parentCategory ref="Autoplay"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
+      <elements>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="Autoplay_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Autoplay_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+      <parentCategory ref="Autoplay"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
+      <elements>
+        <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block" valuePrefix=""/>
+      </elements>
+    </policy>

     <policy name="DefaultDownloadDirectory" class="Both" displayName="$(string.DefaultDownloadDirectory)" explainText="$(string.DefaultDownloadDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF68"/>
     <policy name="DefaultDownloadDirectory" class="Both" displayName="$(string.DefaultDownloadDirectory)" explainText="$(string.DefaultDownloadDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF68"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 5fb3afe7f8bc82fba93cbe6682c752a41edd933d..6485a9425f56d9aeb9c6b889ecbab124e7024e4d 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">Microphone</string>\r
       <string id="Location_group">Localisation</string>\r
       <string id="Notifications_group">Notifications</string>\r
       <string id="Microphone_group">Microphone</string>\r
       <string id="Location_group">Localisation</string>\r
       <string id="Notifications_group">Notifications</string>\r

+      <string id="Autoplay_group">Autoplay</string>\r

       <string id="Authentication_group">Authentification</string>\r
       <string id="Bookmarks_group">Signets</string>\r
       <string id="Certificates_group">Certificats</string>\r
       <string id="Authentication_group">Authentification</string>\r
       <string id="Bookmarks_group">Signets</string>\r
       <string id="Certificates_group">Certificats</string>\r


@@ -380,6 +381,12 @@ Si cette stratégie est désactivée ou non configurée, tout site ne figurant p
       <string id="Notifications_Locked_Explain">Si cette stratégie est activée, les préférences de notification ne peuvent pas être modifiées par l'utilisateur.\r
 \r
 Si cette stratégie est désactivée ou non configurée, l'utilisateur peut modifier ses préférences de notification.</string>\r
       <string id="Notifications_Locked_Explain">Si cette stratégie est activée, les préférences de notification ne peuvent pas être modifiées par l'utilisateur.\r
 \r
 Si cette stratégie est désactivée ou non configurée, l'utilisateur peut modifier ses préférences de notification.</string>\r

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.\r
+\r
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>\r
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.\r
+\r
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>\r

       <string id="FirefoxHome">Customize Firefox Home</string>\r
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.\r
 \r
       <string id="FirefoxHome">Customize Firefox Home</string>\r
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.\r
 \r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 074d6c80cf8ad27a9b827f046123649eb79d2724..2fd2caabab05ca47752b79c19c6a272d0ab1e17a 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">Microfono</string>
       <string id="Location_group">Posizione</string>
       <string id="Notifications_group">Notifiche</string>
       <string id="Microphone_group">Microfono</string>
       <string id="Location_group">Posizione</string>
       <string id="Notifications_group">Notifiche</string>

+      <string id="Autoplay_group">Autoplay</string>

       <string id="Authentication_group">Autenticazione</string>
       <string id="Bookmarks_group">Segnalibri</string>
       <string id="Certificates_group">Certificati</string>
       <string id="Authentication_group">Autenticazione</string>
       <string id="Bookmarks_group">Segnalibri</string>
       <string id="Certificates_group">Certificati</string>


@@ -380,6 +381,12 @@ Se questo criterio è disabilitato o non configurato, qualunque sito non nel cri
       <string id="Notifications_Locked_Explain">Se questo criterio è abilitato, le preferenze relative alle notifiche non possono essere modificate dall'utente.
 
 Se questo criterio è disabilitato o non configurato, l'utente può modificare le preferenze relative alle notifiche.</string>
       <string id="Notifications_Locked_Explain">Se questo criterio è abilitato, le preferenze relative alle notifiche non possono essere modificate dall'utente.
 
 Se questo criterio è disabilitato o non configurato, l'utente può modificare le preferenze relative alle notifiche.</string>

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>

       <string id="FirefoxHome">Personalizza pagina iniziale di Firefox</string>
       <string id="FirefoxHome_Explain">Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle.
 
       <string id="FirefoxHome">Personalizza pagina iniziale di Firefox</string>
       <string id="FirefoxHome_Explain">Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle.
 

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 3f0338c3c9aeadce3e6bbb6e9f4b6b6c4041d0e9..33a0cf5b1729ba81706768cb32f049c84a83c56e 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -28,6 +28,7 @@
       <string id="Microphone_group">麥克風</string>
       <string id="Location_group">位置</string>
       <string id="Notifications_group">通知</string>
       <string id="Microphone_group">麥克風</string>
       <string id="Location_group">位置</string>
       <string id="Notifications_group">通知</string>

+      <string id="Autoplay_group">Autoplay</string>

       <string id="Authentication_group">驗證</string>
       <string id="Bookmarks_group">書籤</string>
       <string id="Certificates_group">憑證</string>
       <string id="Authentication_group">驗證</string>
       <string id="Bookmarks_group">書籤</string>
       <string id="Certificates_group">憑證</string>


@@ -378,6 +379,12 @@ If this policy is disabled or not configured, the menu bar is not displayed by d
       <string id="Notifications_Locked_Explain">若啟用此原則，使用者將無法調整通知偏好設定。
 
 若停用或不設定此原則，則使用者能夠自行調整位置通知偏好設定。</string>
       <string id="Notifications_Locked_Explain">若啟用此原則，使用者將無法調整通知偏好設定。
 
 若停用或不設定此原則，則使用者能夠自行調整位置通知偏好設定。</string>

+      <string id="Autoplay_Allow_Explain">If this policy is enabled, autoplay is always enabled for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
+
+If this policy is disabled or not configured, the default autoplay policy is followed.</string>

       <string id="FirefoxHome">自訂 Firefox 首頁</string>
       <string id="FirefoxHome_Explain">若啟用此原則，將可以設定要在 Firefox 首頁顯示哪些段落，並防止使用者更改設定。
 
       <string id="FirefoxHome">自訂 Firefox 首頁</string>
       <string id="FirefoxHome_Explain">若啟用此原則，將可以設定要在 Firefox 首頁顯示哪些段落，並防止使用者更改設定。