From: Michael Kaply <consulting@kaply.com>
Date: Wed, 5 Sep 2018 20:17:31 +0000 (-0500)
Subject: Merge branch 'master' into 1466484_SearchEngines_Remove
X-Git-Tag: v1.2~9^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/802305e192fe57b0446fdea9ce8f38a3d3eef6ea?ds=inline;hp=--cc

Merge branch 'master' into 1466484_SearchEngines_Remove
---

802305e192fe57b0446fdea9ce8f38a3d3eef6ea
diff --cc README.md
index fd61719,c0d658f..ead3f02
--- a/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 8b4d574,fb1b057..2475f62
--- a/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 7952876,96f575f..8ff464a
--- a/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 4ce9e40,ce8e5b8..c206dc5
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -991,12 -1152,12 +1152,19 @@@
          <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" />
++      <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 9e01911,99cb793..cef81c3
--- a/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>