Merge branch 'master' into ExemptDomainFileTypePairsFromFileTypeDownloadWarnings

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 205c9cc2bf6adc31dc826163e9bcadca8afb3ed4..37e748e0b9cc361eb6c3d582b85d1cd9ddf043b4 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="3.9" schemaVersion="1.0" >
+<policyDefinitionResources revision="3.10" schemaVersion="1.0" >

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


@@ -49,7 +49,7 @@
       <string id="SUPPORTED_FF99">Firefox 99 or later, Firefox 91.8 ESR or later</string>
       <string id="SUPPORTED_FF100">Firefox 100 or later, Firefox 91.9 ESR or later</string>
       <string id="SUPPORTED_FF101">Firefox 101 or later, Firefox 91.10 ESR or later</string>
       <string id="SUPPORTED_FF99">Firefox 99 or later, Firefox 91.8 ESR or later</string>
       <string id="SUPPORTED_FF100">Firefox 100 or later, Firefox 91.9 ESR or later</string>
       <string id="SUPPORTED_FF101">Firefox 101 or later, Firefox 91.10 ESR or later</string>

-      <string id="SUPPORTED_FF102">Firefox 102 or later, Firefox 91.11 ESR or later</string>
+      <string id="SUPPORTED_FF102">Firefox 102 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>


@@ -915,6 +915,16 @@ For detailed information on creating the policy, see https://github.com/mozilla/
       <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="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="UseSystemPrintDialog">Use System Print Dialog</string>
+      <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
+
+If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
+
+If this policy is disabled or not configured, warnings are shown for all executable file types.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#exemptdomainfiletypepairsfromfiletypedownloadwarnings.</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: