Merge pull request #1271 from mozilla/Backup

Initial checkin of backup ADMX

diff --git a/docs/index.md b/docs/index.md
index 5ca4ddc654999677a5834eec555864b60365aec4..f609f822d43a8bcdb063da94193532d30ac8ffa3 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -1022,8 +1022,8 @@ Software\Policies\Mozilla\Firefox\BrowserDataBackup\AllowRestore = 0x1 | 0x0
 #### Windows (Intune)
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Backup/BrowserDataBackup_AllowBackup
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Backup/BrowserDataBackup_AllowRestore
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~BrowserDataBackup/BrowserDataBackup_AllowBackup
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~BrowserDataBackup/BrowserDataBackup_AllowRestore
 ```
 Value (string):
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4de08465b91a339ec608a27916689bf8a1f647f2..182ff808bbd4c07bc18ce15f005d30c0d8d5a342 100644 (file)
--- 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,22 @@ 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 enabled, browser profile data can be backed up when backup is supported on the platform.
+
+If this policy is disabled, browser profile data cannot be backed up.
+
+If this policy is not configured, backup availability follows the platform default.
+
+This policy cannot be used to enable backup on platforms or in configurations where backup is not otherwise supported.</string>
+      <string id="BrowserDataBackup_AllowRestore">Allow Restore</string>
+      <string id="BrowserDataBackup_AllowRestore_Explain">If this policy is enabled, browser profile data can be restored from backups when restore is supported on the platform.
+
+If this policy is disabled, browser profile data cannot be restored from backups.
+
+If this policy is not configured, restore availability follows the platform default.
+
+This policy cannot be used to enable restore on platforms or in configurations where restore is not otherwise supported.</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 ec13a33e0da2e0f07b949368baef372468ee8d32..4749c539d91c3f68ffebc6876a0656e07606b898 100644 (file)
--- 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>