Merge pull request #830 from mozilla/empty_bookmarks

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 465f5cdbe01a015e5df77b33fbbf54acbcdd88a2..f3085d72e99fe06d897438eee1afd3b95331fa99 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"?>
-<policyDefinitionResources revision="2.12" schemaVersion="1.0" >
+<policyDefinitionResources revision="3.3" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -40,6 +40,13 @@
       <string id="SUPPORTED_FF88">Firefox 88 or later, Firefox 78.10 ESR or later</string>
       <string id="SUPPORTED_FF89">Firefox 89 or later, Firefox 78.11 ESR or later</string>
       <string id="SUPPORTED_FF90">Firefox 90 or later, Firefox 78.12 ESR or later</string>
+      <string id="SUPPORTED_FF91">Firefox 91 or later</string>
+      <string id="SUPPORTED_FF95">Firefox 95 or later, Firefox 91.4 ESR or later</string>
+      <string id="SUPPORTED_FF96">Firefox 96 or later, Firefox 91.5 ESR or later</string>
+      <string id="SUPPORTED_FF97">Firefox 97 or later, Firefox 91.6 ESR or later</string>
+      <string id="SUPPORTED_FF98">Firefox 98 or later, Firefox 91.7 ESR or later</string>
+      <string id="SUPPORTED_FF99">Firefox 99 or later, Firefox 91.8 ESR or later</string>
+      <string id="SUPPORTED_FF100">Firefox 100 or later, Firefox 91.9 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
@@ -62,7 +69,7 @@
       <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="PDFjs_group">PDF.js</string>
       <string id="PictureInPicture_group">Picture-in-Picture</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
@@ -801,7 +808,7 @@ If this policy is enabled or not configured, encrypted media extensions (like Wi
       <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">Enable PDF.js</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>
@@ -837,6 +844,16 @@ 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="Bookmarks">Bookmarks (JSON)</string>
+      <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
+
+If this policy is disabled or not configured, the individual bookmark policies are used.
+
+If this policy is enabled along with individual bookmarks, those bookmarks will not be added.
+
+This policy has no effect on Managed Bookmarks.
+
+For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
       <string id="ManagedBookmarks">Managed Bookmarks</string>
       <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
 
@@ -857,6 +874,10 @@ If this policy is enabled or not configured, application updates may be installe
 If this policy is disabled or not configured, any site that invokes an external protocol will ask the user for permission.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins.</string>
+      <string id="WindowsSSO">Windows SSO</string>
+      <string id="WindowsSSO_Explain">If this policy is enabled, Firefox will use credentials stored in Windows to sign in to Microsoft, work, and school accounts.
+
+If this policy is disabled or not configured, credentials must be entered manually.</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:
@@ -1040,6 +1061,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">