Merge pull request #1081 from mozilla/Fallback

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 019add3f10909394e56b0f8316c9f0460ec5ec2f..4fd9d031ae58287d2a9a9ead764673666fd16ab1 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.5" schemaVersion="1.0">
+<policyDefinitionResources revision="5.8" schemaVersion="1.0">

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


@@ -66,6 +66,7 @@
       <string id="SUPPORTED_FF122">Firefox 122 or later, Firefox 115.7 ESR or later</string>
       <string id="SUPPORTED_FF123">Firefox 123 or later, Firefox 115.8 ESR or later</string>
       <string id="SUPPORTED_FF124">Firefox 124 or later, Firefox 115.9 ESR or later</string>
       <string id="SUPPORTED_FF122">Firefox 122 or later, Firefox 115.7 ESR or later</string>
       <string id="SUPPORTED_FF123">Firefox 123 or later, Firefox 115.8 ESR or later</string>
       <string id="SUPPORTED_FF124">Firefox 124 or later, Firefox 115.9 ESR or later</string>

+      <string id="SUPPORTED_FF124_ONLY">Firefox 124 or later</string>

       <string id="SUPPORTED_FF125">Firefox 125 or later, Firefox 115.10 ESR or later</string>
       <string id="SUPPORTED_FF126">Firefox 126 or later, Firefox 115.11 ESR or later</string>
       <string id="SUPPORTED_FF127">Firefox 127 or later, Firefox 115.12 ESR or later</string>
       <string id="SUPPORTED_FF125">Firefox 125 or later, Firefox 115.10 ESR or later</string>
       <string id="SUPPORTED_FF126">Firefox 126 or later, Firefox 115.11 ESR or later</string>
       <string id="SUPPORTED_FF127">Firefox 127 or later, Firefox 115.12 ESR or later</string>


@@ -208,6 +209,10 @@ If this policy is disabled or not configured, no domains are excluded from DNS o
       <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
 
 If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>
       <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
 
 If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>

+      <string id="DNSOverHTTPS_Fallback">Fallback</string>
+      <string id="DNSOverHTTPS_Fallback_Explain">If this policy is disabled, Firefox will not fallback to your default DNS resolver if there is a problem with the secure DNS provider.
+
+If this policy is enabled or not configured, Firefox will use your default DNS resolver if there is a problem with the secure DNS provider.</string>

       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 
       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 


@@ -231,9 +236,9 @@ For more information about the default browser agent, see https://firefox-source
 
 If this policy is disabled or not configured, web developer tools are available within Firefox.</string>
       <string id="DisableFeedbackCommands">Disable Feedback Commands</string>
 
 If this policy is disabled or not configured, web developer tools are available within Firefox.</string>
       <string id="DisableFeedbackCommands">Disable Feedback Commands</string>

-      <string id="DisableFeedbackCommands_Explain">If this policy is enabled, the &quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot; menuitems are not available from the help menu.
+      <string id="DisableFeedbackCommands_Explain">If this policy is enabled, the "Submit Feedback" and "Report Deceptive Site" menuitems are not available from the help menu.

 
 

-If this policy is disabled or not configured, the &quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot; menuitems are available from the help menu.</string>
+If this policy is disabled or not configured, the "Submit Feedback" and "Report Deceptive Site" menuitems are available from the help menu.</string>

       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts_Explain">If this policy is enabled, Firefox Accounts is disabled which includes disabling Sync.
 
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts_Explain">If this policy is enabled, Firefox Accounts is disabled which includes disabling Sync.
 


@@ -249,9 +254,9 @@ If this policy is disabled or not configured, the user can choose to enable SHIE
 
 For more information, see https://support.mozilla.org/en-US/kb/shield and https://wiki.mozilla.org/Firefox/Shield/Heartbeat</string>
       <string id="DisableForgetButton">Disable Forget Button</string>
 
 For more information, see https://support.mozilla.org/en-US/kb/shield and https://wiki.mozilla.org/Firefox/Shield/Heartbeat</string>
       <string id="DisableForgetButton">Disable Forget Button</string>

-      <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
+      <string id="DisableForgetButton_Explain">If this policy is enabled, the "Forget" button is not available.

 
 

-If this policy is disabled or not configured, the &quot;Forget&quot; button is available.</string>
+If this policy is disabled or not configured, the "Forget" button is available.</string>

       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">If this policy is enabled, Firefox will not remember form or search history.
 
       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableFormHistory_Explain">If this policy is enabled, Firefox will not remember form or search history.
 


@@ -269,19 +274,19 @@ If this policy is disabled or not configured, Pocket is available.</string>
 
 If this policy is disabled or not configured, private browsing is allowed.</string>
       <string id="DisableProfileImport">Disable Profile Import</string>
 
 If this policy is disabled or not configured, private browsing is allowed.</string>
       <string id="DisableProfileImport">Disable Profile Import</string>

-      <string id="DisableProfileImport_Explain">If this policy is enabled, the &quot;Import data from another browser&quot; option is not available in the bookmarks window.
+      <string id="DisableProfileImport_Explain">If this policy is enabled, the "Import data from another browser" option is not available in the bookmarks window.

 
 

-If this policy is disabled or not configured, the &quot;Import data from another browser&quot; option is available.</string>
+If this policy is disabled or not configured, the "Import data from another browser" option is available.</string>

       <string id="DisableProfileRefresh">Disable Profile Refresh</string>
       <string id="DisableProfileRefresh">Disable Profile Refresh</string>

-      <string id="DisableProfileRefresh_Explain">If this policy is enabled, the &quot;Refresh Firefox&quot; button is not available on the about:support page or on support.mozilla.org.
+      <string id="DisableProfileRefresh_Explain">If this policy is enabled, the "Refresh Firefox" button is not available on the about:support page or on support.mozilla.org.

 
 

-If this policy is disabled or not configured, the &quot;Refresh Firefox&quot; button is available.</string>
+If this policy is disabled or not configured, the "Refresh Firefox" button is available.</string>

       <string id="DisableSafeMode">Disable Safe Mode</string>
       <string id="DisableSafeMode_Explain">If this policy is enabled, the user cannot restart the browser into safe mode.
 
 If this policy is disabled or not configured, safe mode is allowed.</string>
       <string id="DisableSecurityBypass_InvalidCertificate">Prevent overriding certificate errors</string>
       <string id="DisableSafeMode">Disable Safe Mode</string>
       <string id="DisableSafeMode_Explain">If this policy is enabled, the user cannot restart the browser into safe mode.
 
 If this policy is disabled or not configured, safe mode is allowed.</string>
       <string id="DisableSecurityBypass_InvalidCertificate">Prevent overriding certificate errors</string>

-      <string id="DisableSecurityBypass_InvalidCertificate_Explain">If this policy is enabled, the &quot;Add Exception&quot; button is not available when a certificate is invalid. This prevents the user from overriding the certificate error.
+      <string id="DisableSecurityBypass_InvalidCertificate_Explain">If this policy is enabled, the "Add Exception" button is not available when a certificate is invalid. This prevents the user from overriding the certificate error.

 
 If this policy is disabled or not configured, certificate errors can be overridden.</string>
       <string id="DisableSecurityBypass_SafeBrowsing">Prevent overriding safe browsing errors</string>
 
 If this policy is disabled or not configured, certificate errors can be overridden.</string>
       <string id="DisableSecurityBypass_SafeBrowsing">Prevent overriding safe browsing errors</string>