From: Michael Kaply <consulting@kaply.com>
Date: Wed, 5 Sep 2018 20:00:12 +0000 (-0700)
Subject: Merge pull request #225 from mozilla/1467062_PermissionsPolicy
X-Git-Tag: v1.2~11
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/4d58316a143e1e75b5bc85cd72f4ff4840f5cfba?ds=inline;hp=-c

Merge pull request #225 from mozilla/1467062_PermissionsPolicy

Bug 1467062 - Document new permissions policy
---

4d58316a143e1e75b5bc85cd72f4ff4840f5cfba
diff --combined windows/de-DE/firefox.adml
index 6fec404,7d14ff3..1007e3e
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@@ -10,6 -10,10 +10,10 @@@
        <string id="SUPPORTED_FF60ESR">Firefox 60 ESR oder höher</string>
        <string id="firefox">Firefox</string>
        <string id="Permissions_group">Berechtigungen</string>
+       <string id="Camera_group">Camera</string>
+       <string id="Microphone_group">Microphone</string>
+       <string id="Location_group">Location</string>
+       <string id="Notifications_group">Notifications</string>
        <string id="Authentication_group">Authentifizierung</string>
        <string id="Bookmarks_group">Lesezeichen</string>
        <string id="Certificates_group">Zertifikate</string>
@@@ -22,10 -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.
  
@@@ -237,6 -237,62 +241,62 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="Cookies_Locked_Explain">Wenn Sie die Richtlinieneinstellung aktivieren können Benutzer die Cookie-Einstellungen nicht ändern.
  
  Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Benutzer die Cookie-Einstellungen ändern.</string>
+       <string id="Camera_Allow_Explain">If this policy is enabled, access to the camera is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default camera policy is followed.</string>
+       <string id="Camera_Block_Explain">If this policy is enabled, access to the camera is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the camera is not blocked by default.</string>
+       <string id="Camera_BlockNewRequests">Block new requests asking to access the camera</string>
+       <string id="Camera_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the camera.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the camera.</string>
+       <string id="Camera_Locked">Do not allow preferences to be changed</string>
+       <string id="Camera_Locked_Explain">If this policy is enabled, camera preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Microphone_Allow_Explain">If this policy is enabled, access to the microphone is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default microphone policy is followed.</string>
+       <string id="Microphone_Block_Explain">If this policy is enabled, access to the microphone is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the microphone is not blocked by default.</string>
+       <string id="Microphone_BlockNewRequests">Block new requests asking to access the microphone</string>
+       <string id="Microphone_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the microphone.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the microphone.</string>
+       <string id="Microphone_Locked">Do not allow preferences to be changed</string>
+       <string id="Microphone_Locked_Explain">If this policy is enabled, microphone preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Location_Allow_Explain">If this policy is enabled, access to location is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default location policy is followed.</string>
+       <string id="Location_Block_Explain">If this policy is enabled, access to location is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to location is not blocked by default.</string>
+       <string id="Location_BlockNewRequests">Block new requests asking to access location</string>
+       <string id="Location_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access location.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access location.</string>
+       <string id="Location_Locked">Do not allow preferences to be changed</string>
+       <string id="Location_Locked_Explain">If this policy is enabled, location preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change location preferences.</string>
+       <string id="Notifications_Allow_Explain">If this policy is enabled, notifications can always be sent for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default nofication policy is followed.</string>
+       <string id="Notifications_Block_Explain">If this policy is enabled, notifications are always blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, notifications are not blocked by default.</string>
+       <string id="Notifications_BlockNewRequests">Block new requests asking to send notifications</string>
+       <string id="Notifications_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to send notifications.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to send notifications.</string>
+       <string id="Notifications_Locked">Do not allow preferences to be changed</string>
+       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their notification preferences.</string>
        <string id="FlashPlugin_Allow_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, ist Flash standardmäßig für die angegebenen URLs aktiviert, es sei denn, Flash ist vollständig deaktiviert. Wenn eine Top-Level-Domäne angegeben ist (http://example.org), ist Flash auch für alle Sub-Domains zulässig.
  
  Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Standard Flash Richtlinie verwendet.</string>
@@@ -359,11 -415,6 +419,11 @@@ Wenn Sie die Richtlinieneinstellung dea
  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 --combined windows/en-US/firefox.adml
index 14cb47d,f6e6722..4806946
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -10,6 -10,10 +10,10 @@@
        <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
        <string id="firefox">Firefox</string>
        <string id="Permissions_group">Permissions</string>
+       <string id="Camera_group">Camera</string>
+       <string id="Microphone_group">Microphone</string>
+       <string id="Location_group">Location</string>
+       <string id="Notifications_group">Notifications</string>
        <string id="Authentication_group">Authentication</string>
        <string id="Bookmarks_group">Bookmarks</string>
        <string id="Certificates_group">Certificates</string>
@@@ -22,10 -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.
  
@@@ -237,6 -237,62 +241,62 @@@ This setting is ignored if this policy 
        <string id="Cookies_Locked_Explain">If this policy is enabled, cookie preferences cannot be changed by the user.
  
  If this policy is disabled or not configured, the user can change their cookie preferences.</string>
+       <string id="Camera_Allow_Explain">If this policy is enabled, access to the camera is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default camera policy is followed.</string>
+       <string id="Camera_Block_Explain">If this policy is enabled, access to the camera is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the camera is not blocked by default.</string>
+       <string id="Camera_BlockNewRequests">Block new requests asking to access the camera</string>
+       <string id="Camera_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the camera.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the camera.</string>
+       <string id="Camera_Locked">Do not allow preferences to be changed</string>
+       <string id="Camera_Locked_Explain">If this policy is enabled, camera preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Microphone_Allow_Explain">If this policy is enabled, access to the microphone is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default microphone policy is followed.</string>
+       <string id="Microphone_Block_Explain">If this policy is enabled, access to the microphone is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the microphone is not blocked by default.</string>
+       <string id="Microphone_BlockNewRequests">Block new requests asking to access the microphone</string>
+       <string id="Microphone_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the microphone.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the microphone.</string>
+       <string id="Microphone_Locked">Do not allow preferences to be changed</string>
+       <string id="Microphone_Locked_Explain">If this policy is enabled, microphone preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Location_Allow_Explain">If this policy is enabled, access to location is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default location policy is followed.</string>
+       <string id="Location_Block_Explain">If this policy is enabled, access to location is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to location is not blocked by default.</string>
+       <string id="Location_BlockNewRequests">Block new requests asking to access location</string>
+       <string id="Location_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access location.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access location.</string>
+       <string id="Location_Locked">Do not allow preferences to be changed</string>
+       <string id="Location_Locked_Explain">If this policy is enabled, location preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change location preferences.</string>
+       <string id="Notifications_Allow_Explain">If this policy is enabled, notifications can always be sent for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default nofication policy is followed.</string>
+       <string id="Notifications_Block_Explain">If this policy is enabled, notifications are always blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, notifications are not blocked by default.</string>
+       <string id="Notifications_BlockNewRequests">Block new requests asking to send notifications</string>
+       <string id="Notifications_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to send notifications.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to send notifications.</string>
+       <string id="Notifications_Locked">Do not allow preferences to be changed</string>
+       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their notification preferences.</string>
        <string id="FlashPlugin_Allow_Explain">If this policy is enabled, Flash is activated by default for the origins indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well.
  
  If this policy is disabled or not configured, the default Flash policy is followed.</string>
@@@ -359,11 -415,6 +419,11 @@@ If this policy is disabled or not confi
  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 --combined windows/firefox.admx
index c406440,74be8cd..c5ad0b0
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@@ -47,6 -47,21 +47,21 @@@
      <category displayName="$(string.Search_group)" name="Search">
        <parentCategory ref="firefox"/>
      </category>
+     <category displayName="$(string.Permissions_group)" name="Permissions">
+       <parentCategory ref="firefox"/>
+     </category>
+     <category displayName="$(string.Camera_group)" name="Camera">
+       <parentCategory ref="Permissions"/>
+     </category>
+     <category displayName="$(string.Microphone_group)" name="Microphone">
+       <parentCategory ref="Permissions"/>
+     </category>
+     <category displayName="$(string.Location_group)" name="Location">
+       <parentCategory ref="Permissions"/>
+     </category>
+     <category displayName="$(string.Notifications_group)" name="Notifications">
+       <parentCategory ref="Permissions"/>
+     </category>
    </categories>
    <policies>
      <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)">
@@@ -209,6 -224,142 +224,142 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="Camera_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Camera_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Camera"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Camera\Allow" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Camera_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Camera_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Camera"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Camera\Permissions\Block" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Camera_BlockNewRequests" class="Both" displayName="$(string.Camera_BlockNewRequests)" explainText="$(string.Camera_BlockNewRequests_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Camera" valueName="BlockNewRequests">
+       <parentCategory ref="Camera"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Camera_Locked" class="Both" displayName="$(string.Camera_Locked)" explainText="$(string.Camera_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Camera" valueName="Locked">
+       <parentCategory ref="Camera"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Microphone_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Microphone_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Microphone"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Microphone\Allow" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Microphone_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Microphone_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Microphone"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Microphone\Block" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Microphone_BlockNewRequests" class="Both" displayName="$(string.Microphone_BlockNewRequests)" explainText="$(string.Microphone_BlockNewRequests_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Microphone" valueName="BlockNewRequests">
+       <parentCategory ref="Microphone"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Microphone_Locked" class="Both" displayName="$(string.Microphone_Locked)" explainText="$(string.Microphone_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Microphone" valueName="Locked">
+       <parentCategory ref="Microphone"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Location_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Location_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Location"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Location\Allow" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Location_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Location_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Location"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Location\Block" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Location_BlockNewRequests" class="Both" displayName="$(string.Location_BlockNewRequests)" explainText="$(string.Location_BlockNewRequests_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Location" valueName="BlockNewRequests">
+       <parentCategory ref="Location"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Location_Locked" class="Both" displayName="$(string.Location_Locked)" explainText="$(string.Location_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Location" valueName="Locked">
+       <parentCategory ref="Location"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Notifications_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Notifications_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Notifications"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Notifications\Allow" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Notifications_Block" class="Both" displayName="$(string.Block)" explainText="$(string.Notifications_Block_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
+       <parentCategory ref="Notifications"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <elements>
+         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Notifications\Block" valuePrefix=""/>
+       </elements>
+     </policy>
+     <policy name="Notifications_BlockNewRequests" class="Both" displayName="$(string.Notifications_BlockNewRequests)" explainText="$(string.Notifications_BlockNewRequests_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Notifications" valueName="BlockNewRequests">
+       <parentCategory ref="Notifications"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
+     <policy name="Notifications_Locked" class="Both" displayName="$(string.Notifications_Locked)" explainText="$(string.Notifications_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Notifications" valueName="Locked">
+       <parentCategory ref="Notifications"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="DisableAppUpdate" class="Both" displayName="$(string.DisableAppUpdate)" explainText="$(string.DisableAppUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableAppUpdate">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_FF60ESR"/>
@@@ -991,12 -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 --combined windows/it-IT/firefox.adml
index 5f6c39e,156ccab..1777df6
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@@ -10,6 -10,10 +10,10 @@@
        <string id="SUPPORTED_FF60ESR">Firefox 60 ESR o versione successiva</string>
        <string id="firefox">Firefox</string>
        <string id="Permissions_group">Permessi</string>
+       <string id="Camera_group">Camera</string>
+       <string id="Microphone_group">Microphone</string>
+       <string id="Location_group">Location</string>
+       <string id="Notifications_group">Notifications</string>
        <string id="Authentication_group">Autenticazione</string>
        <string id="Bookmarks_group">Segnalibri</string>
        <string id="Certificates_group">Certificati</string>
@@@ -22,10 -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.
  
@@@ -237,6 -237,62 +241,62 @@@ Quest'impostazione è ignorata se quest
        <string id="Cookies_Locked_Explain">Se questo criterio è abilitato, le preferenze relative ai cookie non possono essere modificate dall'utente.
  
  Se questo criterio è disabilitato o non configurato, l'utente può modificare le preferenze relative ai cookie.</string>
+       <string id="Camera_Allow_Explain">If this policy is enabled, access to the camera is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default camera policy is followed.</string>
+       <string id="Camera_Block_Explain">If this policy is enabled, access to the camera is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the camera is not blocked by default.</string>
+       <string id="Camera_BlockNewRequests">Block new requests asking to access the camera</string>
+       <string id="Camera_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the camera.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the camera.</string>
+       <string id="Camera_Locked">Do not allow preferences to be changed</string>
+       <string id="Camera_Locked_Explain">If this policy is enabled, camera preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Microphone_Allow_Explain">If this policy is enabled, access to the microphone is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default microphone policy is followed.</string>
+       <string id="Microphone_Block_Explain">If this policy is enabled, access to the microphone is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to the microphone is not blocked by default.</string>
+       <string id="Microphone_BlockNewRequests">Block new requests asking to access the microphone</string>
+       <string id="Microphone_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the microphone.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the microphone.</string>
+       <string id="Microphone_Locked">Do not allow preferences to be changed</string>
+       <string id="Microphone_Locked_Explain">If this policy is enabled, microphone preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their camera preferences.</string>
+       <string id="Location_Allow_Explain">If this policy is enabled, access to location is always allowed for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default location policy is followed.</string>
+       <string id="Location_Block_Explain">If this policy is enabled, access to location is blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, access to location is not blocked by default.</string>
+       <string id="Location_BlockNewRequests">Block new requests asking to access location</string>
+       <string id="Location_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access location.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access location.</string>
+       <string id="Location_Locked">Do not allow preferences to be changed</string>
+       <string id="Location_Locked_Explain">If this policy is enabled, location preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change location preferences.</string>
+       <string id="Notifications_Allow_Explain">If this policy is enabled, notifications can always be sent for the origins indicated.
+ 
+ If this policy is disabled or not configured, the default nofication policy is followed.</string>
+       <string id="Notifications_Block_Explain">If this policy is enabled, notifications are always blocked for the origins indicated.
+ 
+ If this policy is disabled or not configured, notifications are not blocked by default.</string>
+       <string id="Notifications_BlockNewRequests">Block new requests asking to send notifications</string>
+       <string id="Notifications_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to send notifications.
+ 
+ If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to send notifications.</string>
+       <string id="Notifications_Locked">Do not allow preferences to be changed</string>
+       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
+ 
+ If this policy is disabled or not configured, the user can change their notification preferences.</string>
        <string id="FlashPlugin_Allow_Explain">Se questo criterio è abilitato, Flash è attivato per impostazione predefinita sui siti indicati a meno che non sia completamente disabilitato. Se è specificato un dominio di primo livello (http://example.org), Flash è consentito anche su tutti i sottodomini.
  
  Se questo criterio è disabilitato o non configurato, viene seguita la politica predefinita per Flash.</string>
@@@ -359,11 -415,6 +419,11 @@@ Se questo criterio è disabilitato o no
  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>