Merge pull request #743 from angela-d/master

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7476b39e452b15d61aeeafec6d96e96310f6ea4c..faa7442e52f5e3c27a8c156275fa5ed64bcee32c 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="2.4" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.8" schemaVersion="1.0" >

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


@@ -60,6 +60,7 @@
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
       <string id="PDFjs_group">PDFjs</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
       <string id="PDFjs_group">PDFjs</string>

+      <string id="PictureInPicture_group">Picture-in-Picture</string>

       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>


@@ -495,6 +496,8 @@ If this policy is disabled or not configured, the user can change their Flash pr
       <string id="OverrideFirstRunPage">Override the first run page</string>
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 
       <string id="OverrideFirstRunPage">Override the first run page</string>
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 

+Starting with Firefox 83, Firefox ESR 78.5, you can also specify multiple URLS separated by a vertical bar (|).
+

 If this policy is disabled or not configured, the first run page is displayed.</string>
       <string id="OverridePostUpdatePage">Override the upgrade page</string>
       <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
 If this policy is disabled or not configured, the first run page is displayed.</string>
       <string id="OverridePostUpdatePage">Override the upgrade page</string>
       <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.


@@ -545,11 +548,11 @@ If this policy is enabled, any shutdown preferences explicitly set via policy ca
 
 If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>
 
 If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>

-      <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
+      <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. There is a 1000 entry limit.

 
 If this policy is disabled or not configured, no websites are blocked.</string>
       <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>
 
 If this policy is disabled or not configured, no websites are blocked.</string>
       <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>

-      <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
+      <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. There is a 1000 entry limit.

 
 If this policy is disabled or not configured, there are no exceptions to the website filter.</string>
       <string id="Bookmark01">Bookmark 01</string>
 
 If this policy is disabled or not configured, there are no exceptions to the website filter.</string>
       <string id="Bookmark01">Bookmark 01</string>


@@ -793,10 +796,14 @@ If this policy is enabled or not configured, the built-in PDF viewer is used.</s
       <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="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.
+      <string id="PictureInPicture_Enabled">Enabled</string>
+      <string id="PictureInPicture_Enabled_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>
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>

+      <string id="PictureInPicture_Locked">Locked</string>
+      <string id="PictureInPicture_Locked_Explain">If this policy is enabled, Picture-in-Picture settings cannot be changed by the user.
+
+If this policy is disabled or not configured,Picture-in-Picture settings can be changed by the user.</string>

       <string id="PrimaryPassword">Primary (Master) Password</string>
       <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
 
       <string id="PrimaryPassword">Primary (Master) Password</string>
       <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.
 


@@ -810,7 +817,9 @@ 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>
 
 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.
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+If this policy is enabled, you can use JSON to configure preferences.

 
 If this policy is disabled or not configured, preferences are not modified.
 
 
 If this policy is disabled or not configured, preferences are not modified.