From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Fri, 12 Dec 2025 17:50:45 +0000 (-0500)
Subject: Merge branch 'master' into Backup
X-Git-Tag: v7.6~4^2~2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/51eb66e2be5d4858cce50e3169466edb91adaf70?hp=64bb954590726fb4077511256d06c060948f3692

Merge branch 'master' into Backup
---

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4de0846..4aac162 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -82,6 +82,7 @@
       <string id="SUPPORTED_FF144">Firefox 144 or later, Firefox 140.4 ESR or later</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 or later</string>
       <string id="SUPPORTED_FF145_ONLY">Firefox 145 or later</string>
+      <string id="SUPPORTED_FF146_ONLY">Firefox 146 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
@@ -116,6 +117,7 @@
       <string id="InterceptionPoints_DragAndDrop_group">Drag And Drop</string>
       <string id="FirefoxHome_group">Firefox Home</string>
       <string id="GenerativeAI_group">Generative AI</string>
+      <string id="BrowserDataBackup_group">Browser Data Backup</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>
@@ -1321,6 +1323,14 @@ If this policy is enabled or not configured, AI is used to suggest names and tab
       <string id="GenerativeAI_Locked_Explain">If this policy is enabled, the user cannot change generative AI preferences.
 
 If this policy is disabled or not configured, the user can change generative AI preferences.</string>
+      <string id="BrowserDataBackup_AllowBackup">Allow Backup</string>
+      <string id="BrowserDataBackup_AllowBackup_Explain">If this policy is disabled, backup is disabled.
+
+If this policy is enabled or not configured, backup is enabled.</string>
+      <string id="BrowserDataBackup_AllowRestore">Allow Restore</string>
+      <string id="BrowserDataBackup_AllowRestore_Explain">If this policy is disabled, restore is disabled.
+
+If this policy is enabled or not configured, restore is enabled.</string>
       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
 
 For a description of the preference, see:
diff --git a/windows/firefox.admx b/windows/firefox.admx
index ec13a33..4749c53 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -84,6 +84,7 @@
       <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)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -198,6 +199,9 @@
     <category displayName="$(string.GenerativeAI_group)" name="GenerativeAI">
       <parentCategory ref="firefox"/>
     </category>
+    <category displayName="$(string.BrowserDataBackup_group)" name="BrowserDataBackup">
+      <parentCategory ref="firefox"/>
+    </category>
   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
@@ -4782,5 +4786,25 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <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>
   </policies>
 </policyDefinitions>