Merge branch 'master' into GenerativeAI

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 22d2b35a9ffff32f1c1bf13f6afae5e04a7a2b95..419a2530e3c255249c2f8bd47bd3336673ff3141 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -81,7 +81,7 @@
       <definition name="SUPPORTED_FF137_ONLY" displayName="$(string.SUPPORTED_FF137_ONLY)"/>
       <definition name="SUPPORTED_FF138_ONLY" displayName="$(string.SUPPORTED_FF138_ONLY)"/>
       <definition name="SUPPORTED_FF142" displayName="$(string.SUPPORTED_FF142)"/>
-      <definition name="SUPPORTED_FF144" displayName="$(string.SUPPORTED_FF142)"/>
+      <definition name="SUPPORTED_FF144" displayName="$(string.SUPPORTED_FF144)"/>
       <definition name="SUPPORTED_FF144_ONLY" displayName="$(string.SUPPORTED_FF144_ONLY)"/>
     </definitions>
   </supportedOn>
@@ -191,7 +191,11 @@
     <category displayName="$(string.InterceptionPoints_DragAndDrop_group)" name="InterceptionPoints_DragAndDrop">
       <parentCategory ref="InterceptionPoints"/>
     </category>
+<<<<<<< HEAD
+    <category displayName="$(string.GenerativeAI_group)" name="GenerativeAI">
+=======
     <category displayName="$(string.FirefoxHome_group)" name="FirefoxHome">
+>>>>>>> master
       <parentCategory ref="firefox"/>
     </category>
   </categories>
@@ -4628,9 +4632,15 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+<<<<<<< HEAD
+    <policy name="GenerativeAI_Chatbot" class="Both" displayName="$(string.GenerativeAI_Chatbot)" explainText="$(string.GenerativeAI_Chatbot_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="Chatbot">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144"/>
+=======
     <policy name="FirefoxHome_Search" class="Both" displayName="$(string.FirefoxHome_Search)" explainText="$(string.FirefoxHome_Search_Explain)" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Search">
       <parentCategory ref="FirefoxHome"/>
       <supportedOn ref="SUPPORTED_FF68"/>
+>>>>>>> master
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -4638,6 +4648,8 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="GenerativeAI_LinkPreviews" class="Both" displayName="$(string.GenerativeAI_LinkPreviews)" explainText="$(string.GenerativeAI_LinkPreviews_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="LinkPreviews">
+      <parentCategory ref="GenerativeAI"/>
     <policy name="FirefoxHome_TopSites" class="Both" displayName="$(string.FirefoxHome_TopSites)" explainText="$(string.FirefoxHome_TopSites_Explain)" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="TopSites">
       <parentCategory ref="FirefoxHome"/>
       <supportedOn ref="SUPPORTED_FF68"/>
@@ -4708,5 +4720,28 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+<<<<<<< HEAD
+    <policy name="GenerativeAI_TabGroups" class="Both" displayName="$(string.GenerativeAI_TabGroups)" explainText="$(string.GenerativeAI_TabGroups_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="TabGroups">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="GenerativeAI_Locked" class="Both" displayName="$(string.GenerativeAI_Locked)" explainText="$(string.GenerativeAI_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="Locked">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+=======
+>>>>>>> master
   </policies>
 </policyDefinitions>