Merge pull request #680 from jkriss/patch-1

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index ab98ec69609469134519b44775e141d3692b94d3..4f42c0253e74694b02452681df5abb410e227f22 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="2.2" schemaVersion="1.0" >

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


@@ -25,7 +25,13 @@
       <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="SUPPORTED_FF79">Firefox 79 or later, Firefox 78.1 ESR or later</string>
+      <string id="SUPPORTED_FF80">Firefox 80 or later, Firefox 78.2 ESR or later</string>
+      <string id="SUPPORTED_FF81">Firefox 81 or later, Firefox 78.3 ESR 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>


@@ -33,6 +39,7 @@
       <string id="Location_group">Location</string>
       <string id="Notifications_group">Notifications</string>
       <string id="Autoplay_group">Autoplay</string>
       <string id="Location_group">Location</string>
       <string id="Notifications_group">Notifications</string>
       <string id="Autoplay_group">Autoplay</string>

+      <string id="VirtualReality_group">Virtual Reality</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>


@@ -43,9 +50,13 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Search_group">Search</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Search_group">Search</string>

-      <string id="Preferences_group">Preferences</string>
+      <string id="Preferences_group">Preferences (Deprecated)</string>

       <string id="UserMessaging_group">User Messaging</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="Allow">Allowed Sites</string>

+      <string id="AllowSession">Allowed Sites (Session Only)</string>

       <string id="Block">Blocked Sites</string>
       <string id="AppAutoUpdate">Application Autoupdate</string>
       <string id="AppAutoUpdate_Explain">If this policy is enabled, Firefox is automatically updated without user approval.
       <string id="Block">Blocked Sites</string>
       <string id="AppAutoUpdate">Application Autoupdate</string>
       <string id="AppAutoUpdate_Explain">If this policy is enabled, Firefox is automatically updated without user approval.


@@ -87,6 +98,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.
 


@@ -316,7 +331,7 @@ In either case, the user will be able to change the value (it is not locked).</s
       <string id="PopupBlocking_Allow_Explain">If this policy is enabled, pop-up windows are always allowed for the origins indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default pop-up policy is followed.</string>
       <string id="PopupBlocking_Allow_Explain">If this policy is enabled, pop-up windows are always allowed for the origins indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default pop-up policy is followed.</string>

-      <string id="PopupBlocking_Default">Allow pop-ups from websites</string>
+      <string id="PopupBlocking_Default">Block pop-ups from websites</string>

       <string id="PopupBlocking_Default_Explain">If this policy is disabled, pop-up windows are allowed from websites by default.
 
 If this policy is not configured or enabled, popups are not allowed from websites.</string>
       <string id="PopupBlocking_Default_Explain">If this policy is disabled, pop-up windows are allowed from websites by default.
 
 If this policy is not configured or enabled, popups are not allowed from websites.</string>


@@ -333,6 +348,9 @@ If this policy is disabled or not configured, the default add-on policy is follo
 If this policy is not configured or enabled, add-ons can be installed.</string>
       <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the origins indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
 
 If this policy is not configured or enabled, add-ons can be installed.</string>
       <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the origins indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
 

+If this policy is disabled or not configured, the default cookie policy is followed.</string>
+      <string id="Cookies_AllowSession_Explain">If this policy is enabled, cookies are allowed for the origins indicated, but removed at the end of the session. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+

 If this policy is disabled or not configured, the default cookie policy is followed.</string>
       <string id="Cookies_Block_Explain">If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.
 
 If this policy is disabled or not configured, the default cookie policy is followed.</string>
       <string id="Cookies_Block_Explain">If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.
 


@@ -422,6 +440,33 @@ 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="VirtualReality_Allow_Explain">If this policy is enabled, access to virtual reality devices is always allowed for the origins indicated.
+
+If this policy is disabled or not configured, the default virtual reality policy is followed.</string>
+      <string id="VirtualReality_Block_Explain">If this policy is enabled, access to virtual reality devices is blocked for the origins indicated.
+
+If this policy is disabled or not configured, access to virtual reality devices is not blocked by default.</string>
+      <string id="VirtualReality_BlockNewRequests">Block new requests asking to access virtual reality devices.</string>
+      <string id="VirtualReality_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access virtual reality devices.
+
+If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to virtual reality devices.</string>
+      <string id="VirtualReality_Locked">Do not allow preferences to be changed</string>
+      <string id="VirtualReality_Locked_Explain">If this policy is enabled, virtual reality preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change their virtual reality preferences.</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.
 


@@ -578,6 +623,7 @@ If this policy is disabled or not configured, the start page defaults to the pre
       <string id="None">None</string>
       <string id="Homepage">Homepage</string>
       <string id="PreviousSession">Previous Session</string>
       <string id="None">None</string>
       <string id="Homepage">Homepage</string>
       <string id="PreviousSession">Previous Session</string>

+      <string id="HomepageLocked">Homepage (Locked)</string>

       <string id="PasswordManagerEnabled">Password Manager</string>
       <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
 
       <string id="PasswordManagerEnabled">Password Manager</string>
       <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
 


@@ -705,11 +751,65 @@ If this policy is enabled or not configured, extensions will be recommended as t
       <string id="UserMessaging_FeatureRecommendations">Feature Recommendations</string>
       <string id="UserMessaging_FeatureRecommendations_Explain">If this policy is disabled, Firefox features will not be recommended as the user uses Firefox.
 
       <string id="UserMessaging_FeatureRecommendations">Feature Recommendations</string>
       <string id="UserMessaging_FeatureRecommendations_Explain">If this policy is disabled, Firefox features will not be recommended as the user uses Firefox.
 

-If this policy is enabled or not configured, Firefox features wil be recommended as the user uses Firefox.</string>
+If this policy is enabled or not configured, Firefox features will be recommended as the user uses Firefox.</string>

       <string id="UserMessaging_UrlbarInterventions">Urlbar Interventions</string>
       <string id="UserMessaging_UrlbarInterventions_Explain">If this policy is disabled, actions will not be recommended based on what the user types in the URL bar.
 
 If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar.</string>
       <string id="UserMessaging_UrlbarInterventions">Urlbar Interventions</string>
       <string id="UserMessaging_UrlbarInterventions_Explain">If this policy is disabled, actions will not be recommended based on what the user types in the URL bar.
 
 If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar.</string>

+      <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256">TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA">TLS_RSA_WITH_AES_128_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA">TLS_RSA_WITH_AES_256_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA">TLS_RSA_WITH_3DES_EDE_CBC_SHA</string>
+      <string id="DisabledCiphers_TLS_RSA_WITH_AES_128_GCM_SHA256">TLS_RSA_WITH_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_RSA_WITH_AES_256_GCM_SHA384">TLS_RSA_WITH_AES_256_GCM_SHA384</string>
+      <string id="DisabledCiphers_Explain">If this policy is enabled, the corresponding cipher is disabled.
+
+If this policy is disabled, the corresponding cipher is enabled.
+
+If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox.</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="PictureInPicture">Picture-in-Picture</string>
+      <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
+
+If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
+      <string id="PrimaryPassword">Primary (Master) Password</string>
+      <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
+
+If this policy is disabled, users cannot create a primary password.
+
+If this policy is not configured, users can choose to create a primary password.</string>
+      <string id="Handlers">Handlers</string>
+      <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
+
+If this policy is disabled or not configured, Firefox defaults are used.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Preferences</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</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:


@@ -761,7 +861,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>


@@ -775,7 +875,8 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <string id="browser_newtabpage_activity-stream_default_sites">browser.newtabpage.activity-stream.default.sites</string>
       <string id="extensions_htmlaboutaddons_recommendations_enabled">extensions.htmlaboutaddons.recommendations.enabled</string>
       <string id="media_peerconnection_enabled">media.peerconnection.enabled</string>
       <string id="browser_newtabpage_activity-stream_default_sites">browser.newtabpage.activity-stream.default.sites</string>
       <string id="extensions_htmlaboutaddons_recommendations_enabled">extensions.htmlaboutaddons.recommendations.enabled</string>
       <string id="media_peerconnection_enabled">media.peerconnection.enabled</string>

-      <string id="media_peerconnection_ice_obfuscate_host_addresses_whitelist">media.peerconnection.ice.obfuscate_host_addresses.whitelist</string>
+      <string id="media_peerconnection_ice_obfuscate_host_addresses_whitelist">media.peerconnection.ice.obfuscate_host_addresses.whitelist (Deprecated)</string>
+      <string id="media_peerconnection_ice_obfuscate_host_addresses_blocklist">media.peerconnection.ice.obfuscate_host_addresses.blocklist</string>

       <string id="security_osclientcerts_autoload">security.osclientcerts.autoload</string>
       <string id="security_tls_hello_downgrade_check">security.tls.hello_downgrade_check</string>
       <string id="widget_content_gtk-theme-override">widget.content.gtk-theme-override</string>
       <string id="security_osclientcerts_autoload">security.osclientcerts.autoload</string>
       <string id="security_tls_hello_downgrade_check">security.tls.hello_downgrade_check</string>
       <string id="widget_content_gtk-theme-override">widget.content.gtk-theme-override</string>


@@ -996,6 +1097,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="ExtensionSettings">
         <multiTextBox refId="ExtensionSettings"/>
       </presentation>
       <presentation id="ExtensionSettings">
         <multiTextBox refId="ExtensionSettings"/>
       </presentation>

+      <presentation id="Handlers">
+        <multiTextBox refId="Handlers"/>
+      </presentation>

       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>


@@ -1007,6 +1111,12 @@ 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>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>

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