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 309f9843985291290883e01dfc1967ef747af41e..134ef6fb04000e2b8d269ee8ddcbeb7c3f5b520e 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -858,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:


@@ -1041,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">