Merge pull request #793 from mozilla/WindowsSSO

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f60936d9d1b796e1e92bff8917369ca2b22472ca..134ef6fb04000e2b8d269ee8ddcbeb7c3f5b520e 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.11" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.12" schemaVersion="1.0" >

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


@@ -40,6 +40,7 @@
       <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_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="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>


@@ -857,6 +858,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>
 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:
       <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 +1045,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
         <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">
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">