X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/525397bec68a070810b8dec08803782c2624a631..62950da17908ea2ee93c07335a95b89886ccada5:/windows/en-US/firefox.adml?ds=inline
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 30cd8fc..0c499f9 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="2.1" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.6" schemaVersion="1.0" >
<displayName/>
<description/>
<resources >
@@ -32,6 +32,11 @@
<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="SUPPORTED_FF82">Firefox 82 or later, Firefox 78.4 ESR or later</string>
+ <string id="SUPPORTED_FF83">Firefox 83 or later, Firefox 78.5 ESR or later</string>
+ <string id="SUPPORTED_FF84">Firefox 84 or later, Firefox 78.6 ESR or later</string>
+ <string id="SUPPORTED_FF85">Firefox 85 or later, Firefox 78.7 ESR or later</string>
+ <string id="SUPPORTED_FF86">Firefox 86 or later, Firefox 78.8 ESR or later</string>
<string id="firefox">Firefox</string>
<string id="Permissions_group">Permissions</string>
<string id="Camera_group">Camera</string>
@@ -50,11 +55,12 @@
<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="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>
@@ -176,7 +182,7 @@ If this policy is disabled or not configured, the browser receives updates.</str
<string id="DisableBuiltinPDFViewer_Explain">If this policy is enabled, PDF files are not viewed within Firefox.
If this policy is disabled or not configured, PDF files are viewed within Firefox.</string>
- <string id="DisableDefaultBrowserAgent">Disable the default browser agent.</string>
+ <string id="DisableDefaultBrowserAgent">Disable the default browser agent</string>
<string id="DisableDefaultBrowserAgent_Explain">If this policy is enabled, the default browser agent is disabled.
If this policy is disabled or not configured, the default browser agent is enabled.
@@ -490,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.
+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.
@@ -540,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>
- <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>
- <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>
@@ -788,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="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>
+ <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.
@@ -804,6 +816,20 @@ If this policy is not configured, users can choose to create a primary password.
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">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.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+ <string id="ManagedBookmarks">Managed Bookmarks</string>
+ <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
+
+If this policy is disabled or not configured, managed bookmarks are not added.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#managedbookmarks.</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:
@@ -1108,6 +1134,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
<presentation id="Autoplay_Default">
<dropdownList refId="Autoplay_Default"/>
</presentation>
+ <presentation id="JSON">
+ <multiTextBox refId="JSON"/>
+ </presentation>
</presentationTable>
</resources>
</policyDefinitionResources>