Bug 1466484 - Add support for removing search engines

diff --git a/README.md b/README.md
index 9e54f1439c440638784f8d9f8fa71faef2e71f2f..fd61719def768ec6b8d66b73aaecaac73f5f7452 100644 (file)
--- a/README.md
+++ b/README.md
@@ -495,7 +495,7 @@ This policy blocks websites from being visited. The parameters take an array of
 }
 ```
 ### Search Engines (Machine only)
-This policy allows you to add new search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
+This policy allows you to add new search engines, remove or hide search engines, as well as set the default and prevent the install of search engines from web pages. Only Name and URLTemplate is required.
 ```
 {
   "policies": {
@@ -512,7 +512,8 @@ This policy allows you to add new search engines, as well as set the default and
         }
       ],
       "Default": "Name of engine",
-      "PreventInstalls": [true|false]
+      "PreventInstalls": [true|false],
+      "Remove": ["Twitter", "Wikipedia (en)"]
     }
   }
 }

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 08b42f18f56fdd7e2e9655027468ab9e0f0d6d99..8b4d574f05c2160f30eee68e574bee4916f9a1d3 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -329,6 +329,10 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird
       <string id="SearchEngines_PreventInstalls_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Benutzer keine Suchmaschinen hinzufügen.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Suchmaschinen hinzugefügt werden.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, könn
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Ändern der Proxy-Einstellungen nicht erlauben</checkBox>
         <text>Verbindungs-Einstellungen</text>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 18b353c23c86217cdb21b9e049c2443760449657..795287655a0330d91fc6eba2e7595f9c069dc8cc 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -329,6 +329,10 @@ If this policy is disabled or not configured, the Firefox default engine is used
       <string id="SearchEngines_PreventInstalls_Explain">If this policy is enabled, the user cannot install search engines from web page.
 
 If this policy is disabled or not configured, search engines can be installed from web pages.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ If this policy is disabled or not configured, search engines can be installed fr
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1be3b6e7cd37af8c70e4e11e5d1262e0720f7dd0..4ce9e4011089b5e61214e465959b0238c9ce5a71 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -991,5 +991,12 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="SearchEngines_Remove" class="Both" displayName="$(string.SearchEngines_Remove)" explainText="$(string.SearchEngines_Remove_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" presentation="$(presentation.SearchEngines_Remove)" >
+      <parentCategory ref="Search" />
+      <supportedOn ref="SUPPORTED_FF62ESR" />
+      <elements >
+        <list id="SearchEngines_Remove" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" valuePrefix=""/>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index f7e383455a04e4db139d43fd29fcaee8ce035fae..9e019118862e8a7f4f8e2dd924eeb8e484449595 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -329,6 +329,10 @@ Se questo criterio è disabilitato o non configurato, verrà utilizzato il motor
       <string id="SearchEngines_PreventInstalls_Explain">Se questo criterio è abilitato, l'utente non potrà installare motori di ricerca dalle pagine Web.
 
 Se questo criterio è disabilitato o non configurato, i motori di ricerca potranno essere installati dalle pagine Web.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -417,6 +421,9 @@ Se questo criterio è disabilitato o non configurato, i motori di ricerca potran
           <label/>
         </textBox>
       </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Non consentire la modifica delle impostazioni del proxy.</checkBox>
         <text>Tipo connessione:</text>