Merge branch 'master' into 1466484_SearchEngines_Remove

diff --cc README.md
index fd61719def768ec6b8d66b73aaecaac73f5f7452,c0d658fe33773a99dde512dabe44ff52b92d1d96..ead3f02b074746d6411c786f8a65e195582d7226
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -494,8 -503,8 +503,8 @@@ This policy blocks websites from being 
    }
  }
  ```
- ### Search Engines (Machine only)
+ ### 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": {

diff --cc windows/de-DE/firefox.adml
index 8b4d574f05c2160f30eee68e574bee4916f9a1d3,fb1b05709b24c36e0ba299942a6a6138b194392a..2475f62ba04f615bb37054110b89daea2f54708f
--- 1/windows/de-DE/firefox.adml
--- 2/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@@ -329,12 -421,13 +421,17 @@@ Wenn Sie die Richtlinieneinstellung dea
        <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">
+         <textBox refId="AppUpdateURL">
+           <label>URL:</label>
+         </textBox>
+       </presentation>
        <presentation id="Authentication">
          <listBox refId="Authentication"/>
        </presentation>

diff --cc windows/en-US/firefox.adml
index 795287655a0330d91fc6eba2e7595f9c069dc8cc,96f575ff98bcd6cac33ea20aa9aa197c7e5e6585..8ff464a1f228b7af200c8e6e5d61c9841fd1ffb2
--- 1/windows/en-US/firefox.adml
--- 2/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -329,12 -421,13 +421,17 @@@ If this policy is disabled or not confi
        <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">
+         <textBox refId="AppUpdateURL">
+           <label>URL:</label>
+         </textBox>
+       </presentation>
        <presentation id="Authentication">
          <listBox refId="Authentication"/>
        </presentation>

diff --cc windows/firefox.admx
index 4ce9e4011089b5e61214e465959b0238c9ce5a71,ce8e5b875aa07cf69e97004c13574522e637403e..c206dc55114d43442ee756b37a7b6b1ac265e24d
--- 1/windows/firefox.admx
--- 2/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -991,12 -1152,12 +1152,19 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
-       <supportedOn ref="SUPPORTED_FF62ESR" />
 +    <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" />
+       <elements >
+         <text id="AppUpdateURL" valueName="URL" required="true" />
+       </elements>
+     </policy>
    </policies>
  </policyDefinitions>

diff --cc windows/it-IT/firefox.adml
index 9e019118862e8a7f4f8e2dd924eeb8e484449595,99cb79398ad5ffebbd5af03510e762d7b22fa18b..cef81c3f588f862dd092c8509a9b42ae6853184e
--- 1/windows/it-IT/firefox.adml
--- 2/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@@ -329,12 -421,13 +421,17 @@@ Se questo criterio è disabilitato o no
        <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">
+         <textBox refId="AppUpdateURL">
+           <label>URL:</label>
+         </textBox>
+       </presentation>
        <presentation id="Authentication">
          <listBox refId="Authentication"/>
        </presentation>