Merge pull request #528 from apizz/readmepatch-1

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index ab629f67f93b58dc0e0698caa56635043f8b250a..67c0dad759e7d06183ef450bb3aa682843413b07 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="1.10" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.12" schemaVersion="1.0" >

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


@@ -17,6 +17,8 @@
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF69">Firefox 69 or later, Firefox 68.1 ESR or later</string>
       <string id="SUPPORTED_FF70">Firefox 70 or later, Firefox 68.2 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF69">Firefox 69 or later, Firefox 68.1 ESR or later</string>
       <string id="SUPPORTED_FF70">Firefox 70 or later, Firefox 68.2 ESR or later</string>

+      <string id="SUPPORTED_FF71">Firefox 71 or later, Firefox 68.3 ESR or later</string>
+      <string id="SUPPORTED_FF72">Firefox 72 or later, Firefox 68.4 ESR 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>


@@ -63,9 +65,13 @@ For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integ
 
 If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>
       <string id="Authentication_AllowProxies">Allow Proxies</string>
 
 If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>
       <string id="Authentication_AllowProxies">Allow Proxies</string>

-      <string id="Authentication_AllowProxies_Explain">If this disabled, SPNEGO and NTLM will not authenticate with proxy servers.
+      <string id="Authentication_AllowProxies_Explain">If this policy is disabled, SPNEGO and NTLM will not authenticate with proxy servers.

 
 If this policy is enabled (and the checkboxes are checked) or not configured, NTLM and SPNEGO will always authenticate with proxies.</string>
 
 If this policy is enabled (and the checkboxes are checked) or not configured, NTLM and SPNEGO will always authenticate with proxies.</string>

+      <string id="Authentication_Locked">Do not allow authentication preferences to be changed</string>
+      <string id="Authentication_Locked_Explain">If this policy is disabled, authentication preferences can be changed by the user.
+
+If this policy is enabled or not configured, authentication preferences cannot be changed by the user.</string>

       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 
       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 


@@ -152,6 +158,10 @@ If this policy is disabled or not configured, the &quot;Forget&quot; button is a
       <string id="DisableFormHistory_Explain">If this policy is enabled, Firefox will not remember form or search history.
 
 If this policy is disabled or not configured, Firefox will remember form and search history.</string>
       <string id="DisableFormHistory_Explain">If this policy is enabled, Firefox will not remember form or search history.
 
 If this policy is disabled or not configured, Firefox will remember form and search history.</string>

+      <string id="DisablePasswordReveal">Do not allow passwords to be revealed in saved logins</string>
+      <string id="DisablePasswordReveal_Explain">If this policy is enabled, users cannot show passwords in saved logins.
+
+If this policy is disabled or not configured, users can show passwords in saved logins.</string>

       <string id="DisablePocket">Disable Pocket</string>
       <string id="DisablePocket_Explain">If this policy is enabled, Pocket is not available.
 
       <string id="DisablePocket">Disable Pocket</string>
       <string id="DisablePocket_Explain">If this policy is enabled, Pocket is not available.
 


@@ -628,6 +638,13 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <string id="security_ssl_errorReporting_enabled">security.ssl.errorReporting.enabled</string>
       <string id="security_mixed_content_block_active_content">security.mixed_content.block_active_content</string>
       <string id="ui_key_menuAccessKeyFocuses">ui.key.menuAccessKeyFocuses</string>
       <string id="security_ssl_errorReporting_enabled">security.ssl.errorReporting.enabled</string>
       <string id="security_mixed_content_block_active_content">security.mixed_content.block_active_content</string>
       <string id="ui_key_menuAccessKeyFocuses">ui.key.menuAccessKeyFocuses</string>

+      <string id="browser_newtabpage_activity-stream_default_sites">browser.newtabpage.activity-stream.default.sites</string>
+      <string id="extensions_htmlaboutaddons_recommendations_enabled">extensions.htmlaboutaddons.recommendations.enabled</string>
+      <string id="media_peerconnection_enabled">media.peerconnection.enabled</string>
+      <string id="media_peerconnection_ice_obfuscate_host_addresses_whitelist">media.peerconnection.ice.obfuscate_host_addresses.whitelist</string>
+      <string id="security_osclientcerts_autoload">security.osclientcerts.autoload</string>
+      <string id="security_tls_hello_downgrade_check">security.tls.hello_downgrade_check</string>
+      <string id="widget_content_gtk-theme-override">widget.content.gtk-theme-override</string>

     </stringTable>
     <presentationTable>
       <presentation id="AppUpdateURL">
     </stringTable>
     <presentationTable>
       <presentation id="AppUpdateURL">