X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/946ae5c5685718148178cf51298f6f141eee9888..e8be393ab947f003668fd9f1aa00ec71ebd428bd:/windows/firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 419a253..158a5c4 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="7.2" schemaVersion="1.0">
+<policyDefinitions revision="7.10" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="7.2"/>
+  <resources minRequiredRevision="7.10"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -83,6 +83,12 @@
       <definition name="SUPPORTED_FF142" displayName="$(string.SUPPORTED_FF142)"/>
       <definition name="SUPPORTED_FF144" displayName="$(string.SUPPORTED_FF144)"/>
       <definition name="SUPPORTED_FF144_ONLY" displayName="$(string.SUPPORTED_FF144_ONLY)"/>
+      <definition name="SUPPORTED_FF145_ONLY" displayName="$(string.SUPPORTED_FF145_ONLY)"/>
+      <definition name="SUPPORTED_FF146_ONLY" displayName="$(string.SUPPORTED_FF146_ONLY)"/>
+      <definition name="SUPPORTED_FF148_ONLY" displayName="$(string.SUPPORTED_FF148_ONLY)"/>
+      <definition name="SUPPORTED_FF14902_ONLY" displayName="$(string.SUPPORTED_FF14902_ONLY)"/>
+      <definition name="SUPPORTED_FF150_ONLY" displayName="$(string.SUPPORTED_FF150_ONLY)"/>
+      <definition name="SUPPORTED_FF151_ONLY" displayName="$(string.SUPPORTED_FF151_ONLY)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -191,13 +197,40 @@
     <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>
+    <category displayName="$(string.GenerativeAI_group)" name="GenerativeAI">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.BrowserDataBackup_group)" name="BrowserDataBackup">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.AIControls_group)" name="AIControls">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.AIControls_Default_group)" name="Default">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_Translations_group)" name="Translations">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_PDFAltText_group)" name="PDFAltText">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_SmartTabGroups_group)" name="SmartTabGroups">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_LinkPreviewKeyPoints_group)" name="LinkPreviewKeyPoints">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_SidebarChatbot_group)" name="SidebarChatbot">
+      <parentCategory ref="AIControls"/>
+    </category>
+    <category displayName="$(string.AIControls_SmartWindow_group)" name="SmartWindow">
+      <parentCategory ref="AIControls"/>
+    </category>
+
   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
@@ -3724,6 +3757,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="I_TrackingProtection_BaselineExceptions" class="Both" displayName="$(string.TrackingProtection_BaselineExceptions)" explainText="$(string.TrackingProtection_BaselineExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="BaselineExceptions">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="J_TrackingProtection_ConvenienceExceptions" class="Both" displayName="$(string.TrackingProtection_ConvenienceExceptions)" explainText="$(string.TrackingProtection_ConvenienceExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="ConvenienceExceptions">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="UserMessaging_WhatsNew" class="Both" displayName="$(string.UserMessaging_WhatsNew)" explainText="$(string.UserMessaging_WhatsNew_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="WhatsNew">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75_ONLY"/>
@@ -4442,7 +4495,7 @@
       <parentCategory ref="ContentAnalysis"/>
       <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
-        <text id="String" valueName="AllowUrlRegexList"/>
+        <text id="String" valueName="AllowUrlRegexList" maxLength="16384"/>
       </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">
@@ -4489,7 +4542,7 @@
       <parentCategory ref="ContentAnalysis"/>
       <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
-        <text id="String" valueName="DenyUrlRegexList"/>
+        <text id="String" valueName="DenyUrlRegexList" maxLength="16384"/>
       </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">
@@ -4632,15 +4685,9 @@
         <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>
@@ -4648,8 +4695,6 @@
         <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"/>
@@ -4720,7 +4765,36 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-<<<<<<< HEAD
+    <policy name="GenerativeAI_Enabled" class="Both" displayName="$(string.GenerativeAI_Enabled)" explainText="$(string.GenerativeAI_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\GenerativeAI" valueName="Enabled">
+      <parentCategory ref="GenerativeAI"/>
+      <supportedOn ref="SUPPORTED_FF144"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <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"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <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"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <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"/>
@@ -4741,7 +4815,251 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-=======
->>>>>>> master
+    <policy name="BrowserDataBackup_AllowBackup" class="Both" displayName="$(string.BrowserDataBackup_AllowBackup)" explainText="$(string.BrowserDataBackup_AllowBackup_Explain)" key="Software\Policies\Mozilla\Firefox\BrowserDataBackup" valueName="AllowBackup">
+      <parentCategory ref="BrowserDataBackup"/>
+      <supportedOn ref="SUPPORTED_FF146"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="BrowserDataBackup_AllowRestore" class="Both" displayName="$(string.BrowserDataBackup_AllowRestore)" explainText="$(string.BrowserDataBackup_AllowRestore_Explain)" key="Software\Policies\Mozilla\Firefox\BrowserDataBackup" valueName="AllowRestore">
+      <parentCategory ref="BrowserDataBackup"/>
+      <supportedOn ref="SUPPORTED_FF146"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisableRemoteImprovements" class="Both" displayName="$(string.DisableRemoteImprovements)" explainText="$(string.DisableRemoteImprovements_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableRemoteImprovements">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF148"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="IPProtectionAvailable" class="Both" displayName="$(string.IPProtectionAvailable)" explainText="$(string.IPProtectionAvailable_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="IPProtectionAvailable">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Default_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_Default_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\Default" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="Default"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="Default_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_Default_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\Default" valueName="Locked">
+      <parentCategory ref="Default"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Translations_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_Translations_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\Translations" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="Translations"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="Translations_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_Translations_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\Translations" valueName="Locked">
+      <parentCategory ref="Translations"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="PDFAltText_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_PDFAltText_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\PDFAltText" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="PDFAltText"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="PDFAltText_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_PDFAltText_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\PDFAltText" valueName="Locked">
+      <parentCategory ref="PDFAltText"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="SmartTabGroups_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_SmartTabGroups_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SmartTabGroups" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="SmartTabGroups"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="SmartTabGroups_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_SmartTabGroups_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SmartTabGroups" valueName="Locked">
+      <parentCategory ref="SmartTabGroups"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="LinkPreviewKeyPoints_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_LinkPreviewKeyPoints_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\LinkPreviewKeyPoints" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="LinkPreviewKeyPoints"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="LinkPreviewKeyPoints_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_LinkPreviewKeyPoints_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\LinkPreviewKeyPoints" valueName="Locked">
+      <parentCategory ref="LinkPreviewKeyPoints"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="SidebarChatbot_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_SidebarChatbot_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SidebarChatbot" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="SidebarChatbot"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="SidebarChatbot_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_SidebarChatbot_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SidebarChatbot" valueName="Locked">
+      <parentCategory ref="SidebarChatbot"/>
+      <supportedOn ref="SUPPORTED_FF14902_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="SmartWindow_Value" class="Both" displayName="$(string.Value)" explainText="$(string.AIControls_SmartWindow_Value_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SmartWindow" presentation="$(presentation.AIControls_Value)">
+      <parentCategory ref="SmartWindow"/>
+      <supportedOn ref="SUPPORTED_FF150_ONLY"/>
+      <elements>
+        <enum id="AIControls_Value" valueName="Value">
+          <item displayName="$(string.AIControls_Value_available)">
+            <value>
+              <string>available</string>
+            </value>
+          </item>
+          <item displayName="$(string.AIControls_Value_blocked)">
+            <value>
+              <string>blocked</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="SmartWindow_Locked" class="Both" displayName="$(string.Locked)" explainText="$(string.AIControls_SmartWindow_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\AIControls\SmartWindow" valueName="Locked">
+      <parentCategory ref="SmartWindow"/>
+      <supportedOn ref="SUPPORTED_FF150_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="XSLTEnabled" class="Both" displayName="$(string.XSLTEnabled)" explainText="$(string.XSLTEnabled_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="XSLTEnabled">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF151_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
   </policies>
 </policyDefinitions>