Fix issues with custom update URL

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index e50b130d38585e515da9c3b17868eb2e22628d0d..6fec4043636d18e90115a83620e89b804a27ffa5 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -22,7 +22,7 @@
       <string id="Search_group">Suche</string>
       <string id="Allow">Erlaubte Seiten</string>
       <string id="Block">Gesperrte Seiten</string>
       <string id="Search_group">Suche</string>
       <string id="Allow">Erlaubte Seiten</string>
       <string id="Block">Gesperrte Seiten</string>

-      <string id="AppUpdateURL">URL für Firefox Updates</string>
+      <string id="AppUpdateURL">Benutzerdefinierte Update-URL</string>

       <string id="AppUpdateURL_Explain">Wenn diese Policy aktiviert ist, dann können Sie eine URL zu einem Update-Server setzen, die eine andere ist, als die standardmäßige. Dies kann hilfreich sein, in dem Fall, wenn Sie einen eigenen Update-Server in Ihrem Netzwerk betreiben.
 
 Wenn diese Policy deaktiviert oder nicht konfiguriert ist, dann wird die Standard-URL verwendet.</string>
       <string id="AppUpdateURL_Explain">Wenn diese Policy aktiviert ist, dann können Sie eine URL zu einem Update-Server setzen, die eine andere ist, als die standardmäßige. Dies kann hilfreich sein, in dem Fall, wenn Sie einen eigenen Update-Server in Ihrem Netzwerk betreiben.
 
 Wenn diese Policy deaktiviert oder nicht konfiguriert ist, dann wird die Standard-URL verwendet.</string>


@@ -359,6 +359,11 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Suchmaschinen hinzugefügt werden.</string>
     </stringTable>
     <presentationTable>
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Suchmaschinen hinzugefügt werden.</string>
     </stringTable>
     <presentationTable>

+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>

       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index cb8e411eeef45d73c7a78179328e651dca8615a3..14cb47d1afcbb3938009fc8ed4b5c62d90cd4177 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -22,11 +22,11 @@
       <string id="Search_group">Search</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="Search_group">Search</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>

-      <string id="Authentication_SPNEGO">SPNEGO</string>
-      <string id="AppUpdateURL">URL for Firefox Updates</string>
+      <string id="AppUpdateURL">Custom Update URL</string>

       <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an update server other than the default. This could be helpful if you run your own update server on your network.
 
 If this policy is disabled or not configured, the default update URL is used.</string>
       <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an update server other than the default. This could be helpful if you run your own update server on your network.
 
 If this policy is disabled or not configured, the default update URL is used.</string>

+      <string id="Authentication_SPNEGO">SPNEGO</string>

       <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
 If this policy is disabled or not configured, no websites are permitted to engage in SPNEGO authentication with the browser.
       <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
 
 If this policy is disabled or not configured, no websites are permitted to engage in SPNEGO authentication with the browser.


@@ -359,6 +359,11 @@ If this policy is disabled or not configured, the Firefox default engine is used
 If this policy is disabled or not configured, search engines can be installed from web pages.</string>
     </stringTable>
     <presentationTable>
 If this policy is disabled or not configured, search engines can be installed from web pages.</string>
     </stringTable>
     <presentationTable>

+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>

       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5e389749a6c36149be4ccb9880109f4929ca066f..c4064401fe6d838c68d803d4715b45b02f3de5fc 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -49,14 +49,6 @@
     </category>
   </categories>
   <policies>
     </category>
   </categories>
   <policies>

-    <policies>
-      <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>

     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
       <parentCategory ref="Authentication"/>
       <supportedOn ref="SUPPORTED_FF60ESR"/>
     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
       <parentCategory ref="Authentication"/>
       <supportedOn ref="SUPPORTED_FF60ESR"/>


@@ -999,5 +991,12 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </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>
   </policies>
 </policyDefinitions>

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 7e9a5b9cfb0329756560d59bd20d07779c23826d..5f6c39ebbffbaa7615a5d62ff9d49dfa9a07f069 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -22,6 +22,10 @@
       <string id="Search_group">Ricerca</string>
       <string id="Allow">Siti consentiti</string>
       <string id="Block">Siti bloccati</string>
       <string id="Search_group">Ricerca</string>
       <string id="Allow">Siti consentiti</string>
       <string id="Block">Siti bloccati</string>

+      <string id="AppUpdateURL">Custom Update URL</string>
+      <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an update server other than the default. This could be helpful if you run your own update server on your network.
+
+If this policy is disabled or not configured, the default update URL is used.</string>

       <string id="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO_Explain">Se questo criterio è abilitato, i siti Web specificati possono utilizzare l'autenticazione SPNEGO nel browser. Le voci dell'elenco devono essere nel formato mydomain.com o https://myotherdomain.com.
 
       <string id="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO_Explain">Se questo criterio è abilitato, i siti Web specificati possono utilizzare l'autenticazione SPNEGO nel browser. Le voci dell'elenco devono essere nel formato mydomain.com o https://myotherdomain.com.
 


@@ -355,6 +359,11 @@ Se questo criterio è disabilitato o non configurato, verrà utilizzato il motor
 Se questo criterio è disabilitato o non configurato, i motori di ricerca potranno essere installati dalle pagine Web.</string>
     </stringTable>
     <presentationTable>
 Se questo criterio è disabilitato o non configurato, i motori di ricerca potranno essere installati dalle pagine Web.</string>
     </stringTable>
     <presentationTable>

+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>

       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>