Merge branch 'master' into 1466484_SearchEngines_Remove

diff --git a/README.md b/README.md
index c0d658fe33773a99dde512dabe44ff52b92d1d96..ead3f02b074746d6411c786f8a65e195582d7226 100644 (file)
--- a/README.md
+++ b/README.md
@@ -504,7 +504,7 @@ This policy blocks websites from being visited. The parameters take an array of
 }
 ```
 ### Search Engines (This policy is only available on the ESR.)
-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": {
@@ -521,7 +521,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 fb1b05709b24c36e0ba299942a6a6138b194392a..2475f62ba04f615bb37054110b89daea2f54708f 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -421,6 +421,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="AppUpdateURL">
@@ -514,6 +518,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 96f575ff98bcd6cac33ea20aa9aa197c7e5e6585..8ff464a1f228b7af200c8e6e5d61c9841fd1ffb2 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -421,6 +421,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="AppUpdateURL">
@@ -514,6 +518,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 ce8e5b875aa07cf69e97004c13574522e637403e..c206dc55114d43442ee756b37a7b6b1ac265e24d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1152,6 +1152,13 @@
         <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_FF60ESR" />
+      <elements >
+        <list id="SearchEngines_Remove" key="Software\Policies\Mozilla\Firefox\SearchEngines\Remove" valuePrefix=""/>
+      </elements>
+    </policy>
     <policy name="AppUpdateURL" class="Both" displayName="$(string.AppUpdateURL)" explainText="$(string.AppUpdateURL_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.AppUpdateURL)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF62" />

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 99cb79398ad5ffebbd5af03510e762d7b22fa18b..cef81c3f588f862dd092c8509a9b42ae6853184e 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -421,6 +421,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="AppUpdateURL">
@@ -514,6 +518,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>