Remove extra spaces

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 53edd1ca13fab04020494e7786f14302562d460f..18518ed5b6c47c08b86f57a81ba925b3304ab18e 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="5.11" schemaVersion="1.0">
+<policyDefinitionResources revision="6.1" schemaVersion="1.0">

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


@@ -588,18 +588,18 @@ If this policy is disabled or not configured, the cache is not cleared when the
       <string id="SanitizeOnShutdown_Cookies_Explain">If the policy is enabled, cookies are cleared when the browser is closed.
 
 If this policy is disabled or not configured, cookies are not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_Cookies_Explain">If the policy is enabled, cookies are cleared when the browser is closed.
 
 If this policy is disabled or not configured, cookies are not cleared when the browser is closed.</string>

-      <string id="SanitizeOnShutdown_Downloads">Download History</string>
+      <string id="SanitizeOnShutdown_Downloads">Download History (Deprecated)</string>

       <string id="SanitizeOnShutdown_Downloads_Explain">If the policy is enabled, download history is cleared when the browser is closed.
 
 If this policy is disabled or not configured, download history is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_Downloads_Explain">If the policy is enabled, download history is cleared when the browser is closed.
 
 If this policy is disabled or not configured, download history is not cleared when the browser is closed.</string>

-      <string id="SanitizeOnShutdown_FormData">Form &amp; Search History</string>
+      <string id="SanitizeOnShutdown_FormData">Form &amp; Search History (Deprecated)</string>

       <string id="SanitizeOnShutdown_FormData_Explain">If the policy is enabled, form data is cleared when the browser is closed.
 
 If this policy is disabled or not configured, form data is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_FormData_Explain">If the policy is enabled, form data is cleared when the browser is closed.
 
 If this policy is disabled or not configured, form data is not cleared when the browser is closed.</string>

-      <string id="SanitizeOnShutdown_History">Browsing History</string>
-      <string id="SanitizeOnShutdown_History_Explain">If the policy is enabled, browsing history is cleared when the browser is closed.
+      <string id="SanitizeOnShutdown_History">History</string>
+      <string id="SanitizeOnShutdown_History_Explain">If the policy is enabled, browsing history, download history, search history, and form data are cleared when the browser is closed.

 
 

-If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.</string>
+If this policy is disabled or not configured, browsing history, download history, search history, and form data are not cleared when the browser is closed.</string>

       <string id="SanitizeOnShutdown_Sessions">Active Logins</string>
       <string id="SanitizeOnShutdown_Sessions_Explain">If the policy is enabled, sessions cleared when the browser is closed.
 
       <string id="SanitizeOnShutdown_Sessions">Active Logins</string>
       <string id="SanitizeOnShutdown_Sessions_Explain">If the policy is enabled, sessions cleared when the browser is closed.
 


@@ -1106,6 +1106,18 @@ If this policy is disabled or not configured, the TLS feature Encrypted Client H
       <string id="PostQuantumKeyAgreementEnabled_Explain">If this policy is enabled, post-quantum key agreement for TLS will be enabled.
 
 If this policy is disabled or not configured, post-quantum key agreement for TLS will be disabled.</string>
       <string id="PostQuantumKeyAgreementEnabled_Explain">If this policy is enabled, post-quantum key agreement for TLS will be enabled.
 
 If this policy is disabled or not configured, post-quantum key agreement for TLS will be disabled.</string>

+      <string id="HttpsOnlyMode">HTTPS-Only Mode</string>
+      <string id="HttpsOnlyMode_Explain">If this policy is enabled, you can set the default behavior for HTTPS-Only Mode.
+
+If this policy is disabled or not configured, HTTPS-Only Mode is not enabled.</string>
+      <string id="HttpsOnlyMode_Allowed">Off by default</string>
+      <string id="HttpsOnlyMode_Disallowed">Off and locked</string>
+      <string id="HttpsOnlyMode_Enabled">On by default</string>
+      <string id="HttpsOnlyMode_ForceEnabled">On and locked</string>
+      <string id="HttpAllowlist">HTTP Allowlist</string>
+      <string id="HttpAllowlist_Explain">If this policy is enabled, you can specify a list origins that will not be upgraded to HTTPS.
+
+If this policy is disabled or not configured, all origins are upgraded to HTTPS if HTTPS-Only Mode is enabled.</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:


@@ -1472,6 +1484,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
         <text>Connections to localhost, 127.0.0.1/8, and ::1 are never proxied.</text>
       </presentation>
         <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
         <text>Connections to localhost, 127.0.0.1/8, and ::1 are never proxied.</text>
       </presentation>

+      <presentation id="HttpsOnlyMode">
+        <dropdownList refId="HttpsOnlyMode"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>