Merge pull request #225 from mozilla/1467062_PermissionsPolicy

Bug 1467062 - Document new permissions policy

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 7d14ff3a222c9caa376a1b6ef3fbd6f8880d38d3..1007e3e8f15d1a72111ddc6d7bfc02f76d58c907 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -26,6 +26,10 @@
       <string id="Search_group">Suche</string>
       <string id="Allow">Erlaubte Seiten</string>
       <string id="Block">Gesperrte Seiten</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="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, dürfen Webseiten die SPNEGO-Authentifizierung verwenden. Erlaubte Formate für die Einträge in der Liste sind mydomain.com oder https://myotherdomain.com.
 
@@ -415,6 +419,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>
+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f6e6722dbdede0a6abac47a65dd7ac48832c2c97..4806946df9b4f365aff2e763593e0fe95d6dc42c 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -26,6 +26,10 @@
       <string id="Search_group">Search</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</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">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.
 
@@ -415,6 +419,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>
+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 74be8cd328c90b1efcb3b61d19811feb2c327fa7..c5ad0b051cf43c3bb6add85b4a92825a3774a244 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1142,5 +1142,12 @@
         <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>

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 156ccab6bbac0212ccfd39b05b6537d280b20f58..1777df61560d006b2e09eb5f1ec52b0e3f3cfc82 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -26,6 +26,10 @@
       <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.
 
@@ -415,6 +419,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>
+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>
       <presentation id="Authentication">
         <listBox refId="Authentication"/>
       </presentation>