Merge branch 'master' into DLP_Templates

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 67c9ac41e7d40c94f443079a47719922c1c49298..e1a1523800402cd90a87e42474175b2747607f39 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="6.0" schemaVersion="1.0">
+<policyDefinitionResources revision="6.5" schemaVersion="1.0">

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


@@ -73,6 +73,8 @@
       <string id="SUPPORTED_FF128">Firefox 128 or later, Firefox 115.13 ESR or later</string>
       <string id="SUPPORTED_FF129">Firefox 129 or later, Firefox 115.14 ESR or later</string>
       <string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 115.15 ESR or later</string>
       <string id="SUPPORTED_FF128">Firefox 128 or later, Firefox 115.13 ESR or later</string>
       <string id="SUPPORTED_FF129">Firefox 129 or later, Firefox 115.14 ESR or later</string>
       <string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 115.15 ESR or later</string>

+      <string id="SUPPORTED_FF130_ONLY">Firefox 130 or later</string>
+      <string id="SUPPORTED_FF131">Firefox 131 or later, Firefox 115.16 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>


@@ -100,7 +102,7 @@
       <string id="ProxySettings_group">Proxy Settings</string>
       <string id="SecurityDevices_group">Security Devices</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (US only)</string>
       <string id="ProxySettings_group">Proxy Settings</string>
       <string id="SecurityDevices_group">Security Devices</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (US only)</string>

-      <string id="ContentAnalysis_group">Content Analysis</string>
+      <string id="ContentAnalysis_group">Content Analysis (DLP)</string>

       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>


@@ -609,7 +611,7 @@ If this policy is disabled or not configured, sessions not cleared when the brow
       <string id="SanitizeOnShutdown_SiteSettings_Explain">If the policy is enabled, site preferences are cleared when the browser is closed.
 
 If this policy is disabled or not configured, site preferences are not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_SiteSettings_Explain">If the policy is enabled, site preferences are cleared when the browser is closed.
 
 If this policy is disabled or not configured, site preferences are not cleared when the browser is closed.</string>

-      <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data</string>
+      <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data (Deprecated)</string>

       <string id="SanitizeOnShutdown_OfflineApps_Explain">If the policy is enabled, offline application storage is cleared when the browser is closed.
 
 If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_OfflineApps_Explain">If the policy is enabled, offline application storage is cleared when the browser is closed.
 
 If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.</string>


@@ -868,6 +870,10 @@ If this policy is disabled or not configured, onboarding messages will be shown
       <string id="UserMessaging_MoreFromMozilla_Explain">If this policy is disabled, the More from Mozilla section will not be shown in preferences.
 
 If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences.</string>
       <string id="UserMessaging_MoreFromMozilla_Explain">If this policy is disabled, the More from Mozilla section will not be shown in preferences.
 
 If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences.</string>

+      <string id="UserMessaging_FirefoxLabs">Firefox Labs</string>
+      <string id="UserMessaging_FirefoxLabs_Explain">If this policy is disabled, the Firefox Labs section will not be shown in preferences.
+
+If this policy is enabled or not configured, the Firefox Labs section will be shown in preferences.</string>

       <string id="UserMessaging_Locked">Do not allow user messaging preferences to be changed</string>
       <string id="UserMessaging_Locked_Explain">If this policy is disabled, user messaging preferences can be changed by the user.
 
       <string id="UserMessaging_Locked">Do not allow user messaging preferences to be changed</string>
       <string id="UserMessaging_Locked_Explain">If this policy is disabled, user messaging preferences can be changed by the user.
 


@@ -1036,10 +1042,12 @@ If this policy is disabled or not configured, Firefox does not bypass the proxy.
       <string id="Proxy_AutoLogin_Explain">If this policy is enabled, Firefox will not prompt for proxy authentication when a password is saved.
 
 If this policy is disabled or not configured, Firefox will always prompt for proxy authentication.</string>
       <string id="Proxy_AutoLogin_Explain">If this policy is enabled, Firefox will not prompt for proxy authentication when a password is saved.
 
 If this policy is disabled or not configured, Firefox will always prompt for proxy authentication.</string>

-      <string id="Proxy_UseProxyForDNS">Proxy DNS when using SOCKS v5</string>
-      <string id="Proxy_UseProxyForDNS_Explain">If this policy is enabled, DNS is proxied when using SOCKS v5.
+      <string id="Proxy_UseProxyForDNS">Proxy DNS when using SOCKS</string>
+      <string id="Proxy_UseProxyForDNS_Explain">If this policy is enabled, DNS is proxied when using SOCKS.
+
+If this policy is disabled, DNS is not proxied when using SOCKS.

 
 

-If this policy is disabled or not configured, DNS is not proxied when using SOCKS v5.</string>
+If this policy not configured, DNS is not proxied when using SOCKS v4, but proxied when using SOCKS v5.</string>

       <string id="DisableThirdPartyModuleBlocking">Disable Third Party Module Blocking</string>
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
       <string id="DisableThirdPartyModuleBlocking">Disable Third Party Module Blocking</string>
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 


@@ -1115,14 +1123,25 @@ If this policy is disabled or not configured, HTTPS-Only Mode is not enabled.</s
       <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="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">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="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="PrivateBrowsingModeAvailability">Private Browsing Mode Availability</string>
+      <string id="PrivateBrowsingModeAvailability_Explain">If this policy is enabled, you can set the availability of Private Browsing Mode.
+
+If this policy is disabled or not configured, Private Browsing Mode is available.</string>
+      <string id="PrivateBrowsingModeAvailability_0">Allow Private Browsing Mode</string>
+      <string id="PrivateBrowsingModeAvailability_1">Disable Private Browsing Mode</string>
+      <string id="PrivateBrowsingModeAvailability_2">Force Private Browsing Mode</string>
+      <string id="ContentAnalysis_AgentName">Agent Name</string>
+      <string id="ContentAnalysis_AgentName_Explain">If this policy is enabled, you can specify the name of the DLP agent, used in dialogs and notifications about DLP operations.
+
+If this policy is disabled or not configured, the agent name "A DLP Agent" is used.</string>

       <string id="ContentAnalysis_AgentTimeout">Agent Timeout</string>
       <string id="ContentAnalysis_AgentTimeout">Agent Timeout</string>

-      <string id="ContentAnalysis_AgentTimeout_Explain">If this policy is enabled, you can specify a space-separated list of regular expressions that indicates URLs for which DLP operations will always be allowed without consulting the agent. The default is "^about:(?!blank|srcdoc).*", meaning that any pages that start with "about:" will be exempt from DLP except for "about:blank" and "about:srcdoc", as these can be controlled by web content.
+      <string id="ContentAnalysis_AgentTimeout_Explain">If this policy is enabled, you can specify the timeout in number of seconds after a DLP request is sent to the agent. After this timeout, the request will be denied unless 'Default Result' is set to 1 or 2.

 
 

-If this policy is disabled or not configured, the DLP agent will always be consulted.</string>
+If this policy is disabled or not configured, the timeout is 30 seconds.</string>

       <string id="ContentAnalysis_AllowUrlRegexList">Allow Url Regex List</string>
       <string id="ContentAnalysis_AllowUrlRegexList_Explain">If this policy is enabled, you can specify a space-separated list of regular expressions that indicates URLs for which DLP operations will always be allowed without consulting the agent. The default is "^about:(?!blank|srcdoc).*", meaning that any pages that start with "about:" will be exempt from DLP except for "about:blank" and "about:srcdoc", as these can be controlled by web content.
 
       <string id="ContentAnalysis_AllowUrlRegexList">Allow Url Regex List</string>
       <string id="ContentAnalysis_AllowUrlRegexList_Explain">If this policy is enabled, you can specify a space-separated list of regular expressions that indicates URLs for which DLP operations will always be allowed without consulting the agent. The default is "^about:(?!blank|srcdoc).*", meaning that any pages that start with "about:" will be exempt from DLP except for "about:blank" and "about:srcdoc", as these can be controlled by web content.
 


@@ -1130,7 +1149,7 @@ If this policy is disabled or not configured, the DLP agent will always be consu
       <string id="ContentAnalysis_BypassForSameTabOperations">Bypass For Same Tab Operations</string>
       <string id="ContentAnalysis_BypassForSameTabOperations_Explain">If this policy is enabled, Firefox will automatically allow DLP requests whose data comes from the same tab and frame - for example, if data is copied to the clipboard and then pasted on the same page.
 
       <string id="ContentAnalysis_BypassForSameTabOperations">Bypass For Same Tab Operations</string>
       <string id="ContentAnalysis_BypassForSameTabOperations_Explain">If this policy is enabled, Firefox will automatically allow DLP requests whose data comes from the same tab and frame - for example, if data is copied to the clipboard and then pasted on the same page.
 

-If this policy is disabled or not configured, Firefox will not automatically allow DLP requests whose data comes from the same tab and frame.</string>
+If this policy is disabled or not configured, Firefox  Firefox will not pass DLP requests whose data comes from the same tab and frame to the DLP agent as normal.</string>

       <string id="ContentAnalysis_ClientSignature">Client Signature</string>
       <string id="ContentAnalysis_ClientSignature_Explain">If this policy is enabled, you can set the required signature of the DLP agent connected to the pipe. If this is a non-empty string and the DLP agent does not have a signature with a Subject Name that exactly matches this value, Firefox will not connect to the pipe.
 
       <string id="ContentAnalysis_ClientSignature">Client Signature</string>
       <string id="ContentAnalysis_ClientSignature_Explain">If this policy is enabled, you can set the required signature of the DLP agent connected to the pipe. If this is a non-empty string and the DLP agent does not have a signature with a Subject Name that exactly matches this value, Firefox will not connect to the pipe.
 


@@ -1159,7 +1178,7 @@ If this policy is enabled or not configured, the pipe the DLP agent creates is p
       <string id="ContentAnalysis_PipePathName">Pipe Path Name</string>
       <string id="ContentAnalysis_PipePathName_Explain">If this policy is enabled, you can change the name of the pipe for the DLP agent.
 
       <string id="ContentAnalysis_PipePathName">Pipe Path Name</string>
       <string id="ContentAnalysis_PipePathName_Explain">If this policy is enabled, you can change the name of the pipe for the DLP agent.
 

-If this policy is disabled or not configured, the default pipe name of 'path_user'is used.</string>
+If this policy is disabled or not configured, the default pipe name of 'path_user' is used.</string>

       <string id="ContentAnalysis_ShowBlockedResult">Show Blocked Result</string>
       <string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
 
       <string id="ContentAnalysis_ShowBlockedResult">Show Blocked Result</string>
       <string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
 


@@ -1533,12 +1552,15 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="HttpsOnlyMode">
         <dropdownList refId="HttpsOnlyMode"/>
       </presentation>
       <presentation id="HttpsOnlyMode">
         <dropdownList refId="HttpsOnlyMode"/>
       </presentation>

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

       <presentation id="ContentAnalysis_DefaultResult">
         <dropdownList refId="ContentAnalysis_DefaultResult"/>
       </presentation>
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>
       <presentation id="ContentAnalysis_DefaultResult">
         <dropdownList refId="ContentAnalysis_DefaultResult"/>
       </presentation>
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>

-    </presentationTable>
+   </presentationTable>

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