Merge branch 'master' into PDFjs

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index c44ba4fb0c822cb2f5fbaeb3bdbad024eae7197e..caeaade1f1d66d90a8685ee9ec5428480bfee661 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.15" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.16" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -25,7 +25,10 @@
       <string id="SUPPORTED_FF75">Firefox 75 or later, Firefox 68.7 ESR or later</string>
       <string id="SUPPORTED_FF75_ONLY">Firefox 75 or later</string>
       <string id="SUPPORTED_FF76">Firefox 76 or later, Firefox 68.8 ESR or later</string>
       <string id="SUPPORTED_FF75">Firefox 75 or later, Firefox 68.7 ESR or later</string>
       <string id="SUPPORTED_FF75_ONLY">Firefox 75 or later</string>
       <string id="SUPPORTED_FF76">Firefox 76 or later, Firefox 68.8 ESR or later</string>

+      <string id="SUPPORTED_FF76_ONLY">Firefox 76 or later</string>

       <string id="SUPPORTED_FF77">Firefox 77 or later, Firefox 68.9 ESR or later</string>
       <string id="SUPPORTED_FF77">Firefox 77 or later, Firefox 68.9 ESR or later</string>

+      <string id="SUPPORTED_FF77_ONLY">Firefox 77 or later</string>
+      <string id="SUPPORTED_FF78">Firefox 78 or later</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>


@@ -46,6 +49,8 @@
       <string id="Preferences_group">Preferences</string>
       <string id="UserMessaging_group">User Messaging</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="Preferences_group">Preferences</string>
       <string id="UserMessaging_group">User Messaging</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>

+      <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
+      <string id="PDFjs_group">PDFjs</string>

       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="AppAutoUpdate">Application Autoupdate</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="AppAutoUpdate">Application Autoupdate</string>


@@ -88,6 +93,10 @@ If this policy is enabled (and the checkboxes are checked) or not configured, NT
       <string id="Authentication_Locked_Explain">If this policy is disabled, authentication preferences can be changed by the user.
 
 If this policy is enabled or not configured, authentication preferences cannot be changed by the user.</string>
       <string id="Authentication_Locked_Explain">If this policy is disabled, authentication preferences can be changed by the user.
 
 If this policy is enabled or not configured, authentication preferences cannot be changed by the user.</string>

+      <string id="Authentication_PrivateBrowsing">Allow authentication in private browsing</string>
+      <string id="Authentication_PrivateBrowsing_Explain">If this policy is enabled, integrated authentication is used in private browsing.
+
+If this policy is disabled or not configured, integrated authentication is not used in private browsing.</string>

       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 
       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 


@@ -423,6 +432,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol
       <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="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="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</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.
 


@@ -747,6 +769,22 @@ If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA ci
       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
 
 If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>
       <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA_Explain">If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled.
 
 If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled.</string>

+      <string id="EncryptedMediaExtensions_Enabled">Enable Encrypted Media Extensions</string>
+      <string id="EncryptedMediaExtensions_Enabled_Explain">If this policy is disabled, encrypted media extensions (like Widevine) are not downloaded by Firefox unless the user consents to installing them.
+
+If this policy is enabled or not configured, encrypted media extensions (like Widevine) are downloaded automatically and used by Firefox.</string>
+      <string id="EncryptedMediaExtensions_Locked">Lock Encrypted Media Extensions</string>
+      <string id="EncryptedMediaExtensions_Locked_Explain">If this policy is enabled and EncryptedMediaExtensions are disabled, Firefox will not download encrypted media extensions (like Widevine) or ask the user to install them.
+
+If this policy is not disabled or not configured, it has no effect.</string>
+      <string id="PDFjs_Enabled">Enable PDFjs</string>
+      <string id="PDFjs_Enabled_Explain">If this policy is disabled, the built-in PDF viewer is not used.
+
+If this policy is enabled or not configured, the built-in PDF viewer is used.</string>
+      <string id="PDFjs_EnablePermissions">Enable Permissions</string>
+      <string id="PDFjs_EnablePermissions_Explain">If this policy is enabled, the built-in PDF viewer will honor document permissions like preventing the copying of text.
+
+If this policy is not disabled or not configured, document permissions are ignored.</string>

       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
 
 For a description of the preference, see:
       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
 
 For a description of the preference, see:


@@ -798,7 +836,7 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <string id="geo_enabled">geo.enabled</string>
       <string id="extensions_getAddons_showPane">extensions.getAddons.showPane</string>
       <string id="intl_accept_languages">intl.accept_languages</string>
       <string id="geo_enabled">geo.enabled</string>
       <string id="extensions_getAddons_showPane">extensions.getAddons.showPane</string>
       <string id="intl_accept_languages">intl.accept_languages</string>

-      <string id="media_eme_enabled">media.eme.enabled</string>
+      <string id="media_eme_enabled">media.eme.enabled (Deprecated)</string>

       <string id="media_gmp-gmpopenh264_enabled">media.gmp-gmpopenh264.enabled</string>
       <string id="media_gmp-widevinecdm_enabled">media.gmp-widevinecdm.enabled</string>
       <string id="network_dns_disableIPv6">network.dns.disableIPv6</string>
       <string id="media_gmp-gmpopenh264_enabled">media.gmp-gmpopenh264.enabled</string>
       <string id="media_gmp-widevinecdm_enabled">media.gmp-widevinecdm.enabled</string>
       <string id="network_dns_disableIPv6">network.dns.disableIPv6</string>


@@ -1044,6 +1082,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>

+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>