Merge pull request #64 from mozilla/DisableProfileImport

DisableProfileImport policy

diff --git a/README.md b/README.md
index 77fdbdea0a0dcee13d64dfca19ad35066801bb29..fc7813afacbbdd1919cdf5964901e203ff56fb19 100644 (file)
--- a/README.md
+++ b/README.md
@@ -201,6 +201,15 @@ This policy removes access to private browsing
   }
 }
 ```
+### DisableProfileImport
+This policy disables the"Import data from another browser" option in the bookmarks window.
+```
+{
+  "policies": {
+    "DisableProfileImport": true
+  }
+}
+```
 ### DisableProfileRefresh
 This policy disables the Refresh Firefox button on about:support and support.mozilla.org.
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index d046e3fd7a85467e9ae20cbbdaa539f352001982..107f64e9fbb1c520180369635bfe5a4f0b02e6f6 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -69,6 +69,10 @@ If this policy is disabled or not configured, the "Forget" button is a
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisableProfileImport">Disable Profile Import</string>
+      <string id="DisableProfileImport_Explain">If this policy is enabled, the &quot;Import data from another browser&quot; option is not available in the bookmarks window.
+
+If this policy is disabled or not configured, the &quot;Import data from another browser&quot; option is available.</string>
       <string id="DisableProfileRefresh">Disable Profile Refresh</string>
       <string id="DisableProfileRefresh_Explain">If this policy is enabled, the &quot;Refresh Firefox&quot; button is not available on the about:support page or on support.mozilla.org.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5e153a1880fc360800311a01363cd04254f4b76e..371d07af62d4aec366ca4bd0ac47a60ea834fd5b 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -318,6 +318,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisableProfileImport" class="Both" displayName="$(string.DisableProfileImport)" explainText="$(string.DisableProfileImport_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableProfileImport">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="DisableProfileRefresh" class="Both" displayName="$(string.DisableProfileRefresh)" explainText="$(string.DisableProfileRefresh_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableProfileRefresh">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>