Address review comments and bump version of DLP to 131

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 499bf594cf803c9cd7e2d06e05abab2a959ac6a0..67ee968f28f502e9c2690b2d3673f85914c46b7a 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -73,6 +73,7 @@
       <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_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 +101,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>


@@ -1124,7 +1125,7 @@ If this policy is disabled or not configured, all origins are upgraded to HTTPS
 
 If this policy is disabled or not configured, the agent name "A DLP Agent" is used.</string>
       <string id="ContentAnalysis_AgentTimeout">Agent Timeout</string>
 
 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_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 `DefaultResult` is set to 1 or 2.
+      <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 timeout is 30 seconds.</string>
       <string id="ContentAnalysis_AllowUrlRegexList">Allow Url Regex List</string>
 
 If this policy is disabled or not configured, the timeout is 30 seconds.</string>
       <string id="ContentAnalysis_AllowUrlRegexList">Allow Url Regex List</string>


@@ -1134,7 +1135,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.
 


@@ -1163,7 +1164,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.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 7dc7b0bdfc667c1bee1932b767e81c8043f34c0c..14e9916fbde1e386ffc3f81501b585ddc817f9ae 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -75,6 +75,7 @@
       <definition name="SUPPORTED_FF128" displayName="$(string.SUPPORTED_FF128)"/>
       <definition name="SUPPORTED_FF129" displayName="$(string.SUPPORTED_FF129)"/>
       <definition name="SUPPORTED_FF130" displayName="$(string.SUPPORTED_FF130)"/>
       <definition name="SUPPORTED_FF128" displayName="$(string.SUPPORTED_FF128)"/>
       <definition name="SUPPORTED_FF129" displayName="$(string.SUPPORTED_FF129)"/>
       <definition name="SUPPORTED_FF130" displayName="$(string.SUPPORTED_FF130)"/>

+      <definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>

     </definitions>
   </supportedOn>
   <categories>
     </definitions>
   </supportedOn>
   <categories>


@@ -4275,28 +4276,28 @@
     </policy>
     <policy name="ContentAnalysis_AgentName" class="Both" displayName="$(string.ContentAnalysis_AgentName)" explainText="$(string.ContentAnalysis_AgentName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
     </policy>
     <policy name="ContentAnalysis_AgentName" class="Both" displayName="$(string.ContentAnalysis_AgentName)" explainText="$(string.ContentAnalysis_AgentName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <text id="String" valueName="AgentName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AgentTimeout" class="Both" displayName="$(string.ContentAnalysis_AgentTimeout)" explainText="$(string.ContentAnalysis_AgentTimeout_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.Number)">
       <parentCategory ref="ContentAnalysis"/>
       <elements>
         <text id="String" valueName="AgentName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AgentTimeout" class="Both" displayName="$(string.ContentAnalysis_AgentTimeout)" explainText="$(string.ContentAnalysis_AgentTimeout_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.Number)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <decimal id="Number" valueName="AgentTimeout"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AllowUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_AllowUrlRegexList)" explainText="$(string.ContentAnalysis_AllowUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
       <elements>
         <decimal id="Number" valueName="AgentTimeout"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AllowUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_AllowUrlRegexList)" explainText="$(string.ContentAnalysis_AllowUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <text id="String" valueName="AllowUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_BypassForSameTabOperations" class="Both" displayName="$(string.ContentAnalysis_BypassForSameTabOperations)" explainText="$(string.ContentAnalysis_BypassForSameTabOperations_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="BypassForSameTabOperations">
       <parentCategory ref="ContentAnalysis"/>
       <elements>
         <text id="String" valueName="AllowUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_BypassForSameTabOperations" class="Both" displayName="$(string.ContentAnalysis_BypassForSameTabOperations)" explainText="$(string.ContentAnalysis_BypassForSameTabOperations_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="BypassForSameTabOperations">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>


@@ -4306,7 +4307,7 @@
     </policy>
     <policy name="ContentAnalysis_ClientSignature" class="Both" displayName="$(string.ContentAnalysis_ClientSignature)" explainText="$(string.ContentAnalysis_ClientSignature_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
     </policy>
     <policy name="ContentAnalysis_ClientSignature" class="Both" displayName="$(string.ContentAnalysis_ClientSignature)" explainText="$(string.ContentAnalysis_ClientSignature_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <text id="String" valueName="ClientSignature"/>
       </elements>
       <elements>
         <text id="String" valueName="ClientSignature"/>
       </elements>


@@ -4336,14 +4337,14 @@
     </policy>
     <policy name="ContentAnalysis_DenyUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_DenyUrlRegexList)" explainText="$(string.ContentAnalysis_DenyUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
     </policy>
     <policy name="ContentAnalysis_DenyUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_DenyUrlRegexList)" explainText="$(string.ContentAnalysis_DenyUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <text id="String" valueName="DenyUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_Enabled" class="Both" displayName="$(string.ContentAnalysis_Enabled)" explainText="$(string.ContentAnalysis_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="Enabled">
       <parentCategory ref="ContentAnalysis"/>
       <elements>
         <text id="String" valueName="DenyUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_Enabled" class="Both" displayName="$(string.ContentAnalysis_Enabled)" explainText="$(string.ContentAnalysis_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="Enabled">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>


@@ -4353,7 +4354,7 @@
     </policy>
     <policy name="ContentAnalysis_IsPerUser" class="Both" displayName="$(string.ContentAnalysis_IsPerUser)" explainText="$(string.ContentAnalysis_IsPerUser_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="IsPerUser">
       <parentCategory ref="ContentAnalysis"/>
     </policy>
     <policy name="ContentAnalysis_IsPerUser" class="Both" displayName="$(string.ContentAnalysis_IsPerUser)" explainText="$(string.ContentAnalysis_IsPerUser_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="IsPerUser">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>


@@ -4363,14 +4364,14 @@
     </policy>
     <policy name="ContentAnalysis_PipePathName" class="Both" displayName="$(string.ContentAnalysis_PipePathName)" explainText="$(string.ContentAnalysis_PipePathName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
     </policy>
     <policy name="ContentAnalysis_PipePathName" class="Both" displayName="$(string.ContentAnalysis_PipePathName)" explainText="$(string.ContentAnalysis_PipePathName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <elements>
         <text id="String" valueName="PipePathName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_ShowBlockedResult" class="Both" displayName="$(string.ContentAnalysis_ShowBlockedResult)" explainText="$(string.ContentAnalysis_ShowBlockedResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="ShowBlockedResult">
       <parentCategory ref="ContentAnalysis"/>
       <elements>
         <text id="String" valueName="PipePathName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_ShowBlockedResult" class="Both" displayName="$(string.ContentAnalysis_ShowBlockedResult)" explainText="$(string.ContentAnalysis_ShowBlockedResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="ShowBlockedResult">
       <parentCategory ref="ContentAnalysis"/>

-      <supportedOn ref="SUPPORTED_FF130"/>
+      <supportedOn ref="SUPPORTED_FF131"/>

       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>