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?ds=sidebyside;hp=-c

Merge branch 'master' into Backup
---

51eb66e2be5d4858cce50e3169466edb91adaf70
diff --combined windows/en-US/firefox.adml
index aeecff8,4de0846..4aac162
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -82,7 -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>
@@@ -117,7 -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>
@@@ -292,9 -290,9 +292,9 @@@ If this policy is disabled or not confi
  
  If this policy is disabled or not configured, private browsing is allowed.</string>
        <string id="DisableProfileImport">Disable Profile Import</string>
-       <string id="DisableProfileImport_Explain">If this policy is enabled, the "Import data from another browser" option is not available in the bookmarks window.
+       <string id="DisableProfileImport_Explain">If this policy is enabled, you cannot import data from other browsers.
  
- If this policy is disabled or not configured, the "Import data from another browser" option is available.</string>
+ If this policy is disabled or not configured, you can import data from other browsers.</string>
        <string id="DisableProfileRefresh">Disable Profile Refresh</string>
        <string id="DisableProfileRefresh_Explain">If this policy is enabled, the "Refresh Firefox" button is not available on the about:support page or on support.mozilla.org.
  
@@@ -1323,14 -1321,6 +1323,14 @@@ If this policy is enabled or not config
        <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: