Merge pull request #374 from mozilla/67_updates

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 66247e7d33acfb93720e41d1ee79768140813680..3f6572f6a875593474613dfda10d454d805d9e6e 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="1.3" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.5" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -9,6 +9,8 @@
       <string id="SUPPORTED_FF62">Firefox 62 or later, Firefox 60.2 ESR or later</string>
       <string id="SUPPORTED_FF63">Firefox 63 or later</string>
       <string id="SUPPORTED_FF64">Firefox 64 or later, Firefox 60.4 ESR or later</string>
+      <string id="SUPPORTED_FF66">Firefox 66 or later, Firefox 60.6 ESR or later</string>
+      <string id="SUPPORTED_FF67">Firefox 67 or later, Firefox 60.7 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
@@ -74,6 +76,10 @@ If this policy is disabled or not configured, the user can access Troubleshootin
       <string id="DisableSetDesktopBackground_Explain">If this policy is enabled, the user cannot set an image as their desktop background.
 
 If this policy is disabled or not configured, users can set images as their desktop background.</string>
+      <string id="CaptivePortal">Captive Portal</string>
+      <string id="CaptivePortal_Explain">If this policy is disabled, captive portal support is disabled.
+
+If this policy is enabled or not configured, captive portal support is enabled.</string>
       <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
@@ -91,7 +97,7 @@ If this policy is disabled or not configured, DNS Over HTTPS uses the default Fi
 
 If this policy is disabled or not configured, users can create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
-      <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive udpates.
+      <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive updates.
 
 If this policy is disabled or not configured, the browser receives updates.</string>
       <string id="DisableBuiltinPDFViewer">Disable Built-in PDF Viewer (PDF.js)</string>
@@ -192,10 +198,18 @@ If this policy is disabled or not configured, no extensions are uninstalled.</st
       <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
 
 If this policy is disabled or not configured, no extensions are locked</string>
+      <string id="ExtensionUpdate">Extension Update</string>
+      <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
+
+If this policy is enabled or not configured, extensions will be updated automatically.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
 If this policy is enabled or not configured, hardware acceleration is enabled.</string>
+      <string id="NetworkPrediction">Network Prediction</string>
+      <string id="NetworkPrediction_Explain">If this policy is disabled, network prediction (DNS prefetching) will be disabled.
+
+If this policy is enabled or not configured, network prediction (DNS prefetching) will be enabled.</string>
       <string id="OfferToSaveLogins">Offer to save logins</string>
       <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
 
@@ -291,7 +305,7 @@ If this policy is disabled or not configured, any site that is not in the Block
 If this policy is disabled or not configured, the user can change location preferences.</string>
       <string id="Notifications_Allow_Explain">If this policy is enabled, notifications can always be sent for the origins indicated.
 
-If this policy is disabled or not configured, the default nofication policy is followed.</string>
+If this policy is disabled or not configured, the default notification policy is followed.</string>
       <string id="Notifications_Block_Explain">If this policy is enabled, notifications are always blocked for the origins indicated.
 
 If this policy is disabled or not configured, notifications are not blocked by default.</string>
@@ -475,6 +489,18 @@ If this policy is disabled or not configured, search engines can be installed fr
       <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
 
 If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
+      <string id="SSLVersionMin">Minimum SSL version enabled</string>
+      <string id="SSLVersionMin_Explain">If this policy is enabled, Firefox will not use SSL/TLS versions less than the value specified.
+
+If this policy is disabled or not configured, Firefox defaults to a minimum of TLS 1.0.</string>
+      <string id="SSLVersionMax">Maximum SSL version enabled</string>
+      <string id="SSLVersionMax_Explain">If this policy is enabled, Firefox will not use SSL/TLS versions greater than the value specified.
+
+If this policy is disabled or not configured, Firefox defaults to a maximum of TLS 1.3.</string>
+      <string id="TLS1">TLS 1.0</string>
+      <string id="TLS1_1">TLS 1.1</string>
+      <string id="TLS1_2">TLS 1.2</string>
+      <string id="TLS1_3">TLS 1.3</string>
     </stringTable>
     <presentationTable>
       <presentation id="AppUpdateURL">
@@ -626,6 +652,9 @@ If this policy is disabled or not configured, search engines will not be removed
         <checkBox refId="DNSOverHTTPSEnabled">Enable DNS over HTTPS.</checkBox>
         <checkBox refId="DNSOverHTTPSLocked">Don't allow DNS over HTTPS preferences to be changed.</checkBox>
       </presentation>
+      <presentation id="SSLVersion">
+        <dropdownList refId="SSLVersion"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>