Add global Enabled to GenerativeAI policy

diff --git a/docs/index.md b/docs/index.md
index 9d40284c8734ccfc74034d5848beb7ad95ccf872..82bc71b2373de7d8061a1fb9172f5ab3826a0977 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -3632,20 +3632,23 @@ Value (string):
 
 Configure generative AI features.
 
-`Chatbot` If false, AI chatbots are not available in the sidebar.
+`Enabled` Controls whether generative AI features are enabled by default. If false, all generative AI features are disabled by default. Individual generative AI policies can override this setting.
 
-`LinkPreviews` If false, AI is not used to generate link previews (Firefox 144).
+`Chatbot` Controls access to AI chatbots in the sidebar. If false, AI chatbots are not available in the sidebar.
 
-`TabGroups` If false,  AI is not used to suggest names and tabs for tab groups (Firefox 144).
+`LinkPreviews` (Firefox 144+) Controls whether AI is used to generate link previews. If false, AI is not used to generate link previews.
 
-`Locked` prevents the user from changing generative AI preferences.
+`TabGroups` (Firefox 144+) Controls whether AI is used to suggest names and tabs for tab groups. If false, AI is not used to suggest names or tabs for tab groups.
+
+`Locked` Prevents the user from changing generative AI preferences.
 
 **Compatibility:** Firefox 144, Firefox ESR 140.4\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.ml.chat.enabled`, `browser.ml.linkPreview.optin`, `browser.tabs.groups.smart.userEnabled`
+**Preferences Affected:** `browser.ml.chat.enabled`, `browser.ml.chat.page`, `browser.ml.linkPreview.optin`, `browser.tabs.groups.smart.userEnabled`
 
 #### Windows (GPO)
 ```
+Software\Policies\Mozilla\Firefox\GenerativeAI\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\Chatbot = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\LinkPreviews = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\GenerativeAI\TabGroups = 0x1 | 0x0
@@ -3654,6 +3657,7 @@ Software\Policies\Mozilla\Firefox\GenerativeAI\Locked = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_Enabled
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_Chatbot
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_LinkPreviews
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~GenerativeAI/GenerativeAI_TabGroups
@@ -3668,6 +3672,8 @@ Value (string):
 <dict>
   <key>GenerativeAI</key>
   <dict>
+    <key>Enabled</key>
+    <true/> | <false/>
     <key>Chatbot</key>
     <true/> | <false/>
     <key>LinkPreviews</key>
@@ -3684,6 +3690,7 @@ Value (string):
 {
   "policies": {
     "GenerativeAI": {
+      "Enabled": true | false,
       "Chatbot": true | false,
       "LinkPreviews": true | false,
       "TabGroups": true | false,

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index c766e4f2c55c90201916d9d392d50e0986578530..4d7dc7c1ff02f94c0b51dc6f13b45571a83bd607 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1313,6 +1313,10 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, kann
       <string id="VisualSearchEnabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird die visuelle Suche deaktiviert.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird die visuelle Suche aktiviert.</string>
+      <string id="GenerativeAI_Enabled">Aktiviert</string>
+      <string id="GenerativeAI_Enabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, sind alle generativen KI-Funktionen standardmäßig deaktiviert. Einzelne Richtlinieneinstellungen für generative KI können diese Einstellung außer Kraft setzen.
+
+Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, sind generative KI-Funktionen standardmäßig aktiviert, sofern sie nicht durch einzelne Richtlinieneinstellungen für generative KI außer Kraft gesetzt werden.</string>
       <string id="GenerativeAI_Chatbot">Chatbot</string>
       <string id="GenerativeAI_Chatbot_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, sind KI-Chatbots in der Seitenleiste nicht verfügbar.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index fdd1fd2d95f2f668a644eb632725ea3d06a05bdd..c2adf860954c321210613ea8ec362d648219da92 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1301,6 +1301,10 @@ If this policy is disabled or not configured, the user can change their Firefox
       <string id="VisualSearchEnabled_Explain">If this policy is disabled, visual search is disabled.
 
 If this policy is enabled or not configured, visual search is enabled.</string>
+      <string id="GenerativeAI_Enabled">Enabled</string>
+      <string id="GenerativeAI_Enabled_Explain">If this policy is disabled, all generative AI features are disabled by default. Individual generative AI policies can override this setting.
+
+If this policy is enabled or not configured, generative AI features are enabled by default, unless overridden by individual generative AI policies.</string>
       <string id="GenerativeAI_Chatbot">Chatbot</string>
       <string id="GenerativeAI_Chatbot_Explain">If this policy is disabled, AI chatbots are not available in the sidebar.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index e70f5086f8a15932fbf803c5d008a663c1445dc5..821d5007b6c1294759afcfeaebbeec6135f05dbd 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -4732,6 +4732,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <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"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 7ce0c29989e2c9498130dc280c3d72ea8789a56c..45baf9209d5c2ceba4061f48d8588996055cecd5 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1308,6 +1308,10 @@ Si cette stratégie est désactivée ou non configurée, l’utilisateur peut mo
       <string id="VisualSearchEnabled_Explain">Si cette stratégie est désactivée, la recherche visuelle est désactivée.
 
 Si cette stratégie est activée ou non configurée, la recherche visuelle est activée.</string>
+      <string id="GenerativeAI_Enabled">Activé</string>
+      <string id="GenerativeAI_Enabled_Explain">Si cette stratégie est désactivée, toutes les fonctionnalités d’IA générative sont désactivées par défaut. Les stratégies individuelles d’IA générative peuvent remplacer ce paramètre.
+
+Si cette stratégie est activée ou non configurée, les fonctionnalités d’IA générative sont activées par défaut, sauf si elles sont remplacées par des stratégies individuelles d’IA générative.</string>
       <string id="GenerativeAI_Chatbot">Chatbot</string>
       <string id="GenerativeAI_Chatbot_Explain">Si cette stratégie est désactivée, les chatbots IA ne sont pas disponibles dans la barre latérale.
 

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 9c4d8d7d6f7958959eaa01730e93338c16253367..47524edbdf516f8211e210376dc6dcc465d76643 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1303,6 +1303,10 @@ Mozilla рекомендует не отключать телеметрию. И
       <string id="VisualSearchEnabled_Explain">Если эта политика отключена, визуальный поиск отключается.
 
 Если эта политика включена или не настроена, визуальный поиск включается.</string>
+      <string id="GenerativeAI_Enabled">Включено</string>
+      <string id="GenerativeAI_Enabled_Explain">Если эта политика отключена, все функции генеративного ИИ по умолчанию отключены. Отдельные политики генеративного ИИ могут переопределять этот параметр.
+
+Если эта политика включена или не настроена, функции генеративного ИИ по умолчанию включены, если только они не переопределены отдельными политиками генеративного ИИ.</string>
       <string id="GenerativeAI_Chatbot">Чат-бот</string>
       <string id="GenerativeAI_Chatbot_Explain">Если эта политика отключена, чат-боты с ИИ недоступны на боковой панели.