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?hp=-c

Merge branch 'master' into 1466484_SearchEngines_Remove
---

802305e192fe57b0446fdea9ce8f38a3d3eef6ea
diff --combined README.md
index fd61719,c0d658f..ead3f02
--- a/README.md
+++ b/README.md
@@@ -17,7 -17,7 +17,7 @@@ Policies are documented below
  
  Some of the policies were originally only available on the ESR for security reasons. As of Firefox 62, these policies are available outside of the ESR, but only via JSON file or a Local Machine-based Group Policy. User-based Group Policies are not allowed to set values for these policies. The descriptions below mark such policies as "Machine only".
  
- ### Authentication (Machine only)
+ ### Authentication
  This policy is for configuring sites that support integrated authentication. See https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication for more information.
  ```
  {
@@@ -330,6 -330,15 +330,15 @@@ For Uninstall and Locked, you specify e
      }
  }
  ```
+ ### HardwareAcceleration
+ This policy disables hardware acceleration by locking the preference layers.acceleration.disabled to true.
+ ```
+ {
+   "policies": {
+     "HardwareAcceleration": false
+   }
+ }
+ ```
  ### NoDefaultBookmarks
  This policy prevents the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags) from being created. Note: this policy is only effective if used before the first run of the profile.
  ```
@@@ -473,7 -482,7 +482,7 @@@ If this policy is set to true,  all dat
    }
  }
  ```
- ### SearchBar (Machine only)
+ ### SearchBar
  This policy can be used to determine if the search bar is separate or combined with the URL bar.
  ```
  {
@@@ -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": {
@@@ -512,9 -521,42 +521,43 @@@
          }
        ],
        "Default": "Name of engine",
 -      "PreventInstalls": [true|false]
 +      "PreventInstalls": [true|false],
 +      "Remove": ["Twitter", "Wikipedia (en)"]
      }
    }
  }
  ```
+ ### Permissions
+ This policy allows you to change the permissions associated with camera, microphone, location, and notifications
+ ```
+ {
+   "policies": {
+     "Permissions": {
+       "Camera": {
+         "Allow": ["http://example.org/"], /* Origins where camera access is allowed by default */
+         "Block": ["http://example.org/"], /* Origins where camera access is blocked by default */
+         "BlockNewRequests": [true|false], /* Block new requests to access the camera */
+         "Locked": [true|false] /* Don't allow the user to change the camera preferences */
+       },
+       "Microphone": {
+         "Allow": ["http://example.org/"], /* Origins where microphone access is allowed by default */
+         "Block": ["http://example.org/"], /* Origins where microphone access  is blocked by default */
+         "BlockNewRequests": [true|false], /* Block new requests to access the microphone */
+         "Locked": [true|false] /* Don't allow the user to change the microphone preferences */
+       },
+       "Location": {
+         "Allow": ["http://example.org/"], /* Origins where location access is allowed by default */
+         "Block": ["http://example.org/"], /* Origins where location access is blocked by default */
+         "BlockNewRequests": [true|false], /* Block new requests to access location */
+         "Locked": [true|false] /* Don't allow the user to change the location preferences */
+       },
+       "Notifications": {
+         "Allow": ["http://example.org/"], /* Origins where sending notifications is allowed by default */
+         "Block": ["http://example.org/"], /* Origins where sending notifications is blocked by default */
+         "BlockNewRequests": [true|false], /* Block new requests to send notifications */
+         "Locked": [true|false] /* Don't allow the user to change the notification preferences */
+       }
+     }
+   }
+ }
+ ```
diff --combined windows/de-DE/firefox.adml
index 8b4d574,fb1b057..2475f62
--- 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,6 -26,10 +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.
  
@@@ -75,7 -83,9 +83,9 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="DisableAppUpdate">Update deaktivieren</string>
        <string id="DisableAppUpdate_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, wird nicht nach Updates gesucht.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden Updates automatisch installiert.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden Updates automatisch installiert.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableBuiltinPDFViewer">PDF-Ansicht (PDF.js) deaktivieren</string>
        <string id="DisableBuiltinPDFViewer_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, werden PDF-Dateien nicht in Firefox angezeigt.
  
@@@ -141,13 -151,17 +151,17 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="DisableSystemAddonUpdate">System Addon Updates deaktivieren</string>
        <string id="DisableSystemAddonUpdate_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, werden neue System-Add-ons nicht installiert und installierte Add-ons werden nicht mit Updates versorgt.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden System Add-ons installiert und mit Updates versorgt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden System Add-ons installiert und mit Updates versorgt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableTelemetry">Telemetry deaktivieren</string>
        <string id="DisableTelemetry_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, werden keine Telemetriedaten versendet.
  
  Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden Telemetriedaten versendet.
  
- Mozilla empfiehlt, die Telemetrie nicht zu deaktivieren. Durch Telemetrie gesammelte Informationen helfen uns, ein besseres Produkt für Unternehmen wie Ihres zu erstellen.</string>
+ Mozilla empfiehlt, die Telemetrie nicht zu deaktivieren. Durch Telemetrie gesammelte Informationen helfen uns, ein besseres Produkt für Unternehmen wie Ihres zu erstellen.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisplayBookmarksToolbar">Lesezeichenleiste anzeigen</string>
        <string id="DisplayBookmarksToolbar_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, wird die Lesezeichenleiste standardmäßig in der Menüleiste angezeigt, der Benutzer kann diese wieder ausblenden.
  
@@@ -164,16 -178,26 +178,26 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="Extensions_Install_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine Liste mit Erweiterungs-URLs oder -pfaden angeben, die beim Start von Firefox installiert werden.
  Jedes Mal, wenn diese Liste geändert wird, werden die Erweiterungen erneut installiert.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen installiert.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen installiert.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Uninstall">Erweiterungen deinstallieren</string>
        <string id="Extensions_Uninstall_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine Liste mit Erweiterungs-IDs angeben, die beim Start deinstalliert werden.
  Jedes Mal, wenn diese Liste geändert wird, werden die Erweiterungen deinstalliert.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen deinstalliert.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen deinstalliert.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Locked">Erweiterungen deaktivieren und löschen verhindern</string>
        <string id="Extensions_Locked_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine Liste mit Erweiterungs-IDs angeben, die den Benutzer hindert die angegebenen Erweiterungen zu deinstallieren oder zu deaktivieren.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen gesperrt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Erweiterungen gesperrt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
+       <string id="HardwareAcceleration">Hardware Acceleration</string>
+       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
+ 
+ If this policy is enabled or not configured, hardware acceleration is enabled.</string>
        <string id="OfferToSaveLogins">Zugangsdaten und Passwörter für Webseiten speichen</string>
        <string id="OfferToSaveLogins_Explain">Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, fordert Firefox zum speichern von Logindaten und Passwörtern auf.
  
@@@ -221,6 -245,62 +245,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>
@@@ -240,11 -320,15 +320,15 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="OverrideFirstRunPage">Willkommen Seite ändern</string>
        <string id="OverrideFirstRunPage_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine URL angeben, die als Willkommensseite beim ersten Start von Firefox verwendet werden soll. Wenn Sie die URL leer lassen, wird keine Willkommensseite angezeigt.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Standard Willkommensseite angezeigt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Standard Willkommensseite angezeigt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="OverridePostUpdatePage">Upgrade Seite ändern</string>
        <string id="OverridePostUpdatePage_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine URL angeben, die nach der Aktualisierung von Firefox angezeigt wird. Wenn Sie die URL leer lassen, wird keine Upgrade-Seite angezeigt.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren wird eine Upgrade Seite angezeigt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren wird eine Upgrade Seite angezeigt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="SanitizeOnShutdown">Die Chronik löschen, wenn Firefox geschlossen wird</string>
        <string id="SanitizeOnShutdown_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, werden alle Daten der Chronik gelöscht, wenn Firefox geschlossen wird. Dies beinhaltet Browsing &amp; Download Verlauf, Cookies, Aktive Logins, Cache, Form &amp; Suchverlauf, Website-Einstellungen und Offline-Website-Daten.
  
@@@ -252,11 -336,15 +336,15 @@@ Wenn Sie die Richtlinieneinstellung dea
        <string id="WebsiteFilter_Block">Gesperrte Webseites</string>
        <string id="WebsiteFilter_Block_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie die Übereinstimmungsmuster für zu blockierende Webseiten angeben. Die Übereinstimmungsmuster sind unter https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns dokumentiert. Derzeit werden nur http / https-Zugriffe unterstützt. Es gibt eine Beschränkung von 1000 Einträgen. 
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Webseiten gesperrt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Webseiten gesperrt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="WebsiteFilter_Exceptions">Ausnahmen zu gesperrten Webseiten</string>
        <string id="WebsiteFilter_Exceptions_Explain">Wenn Sie die Richtlinieneinstellung aktivieren und der Webseiten-Filter aktiviert ist, können Sie Übereinstimmungsmuster für Webseiten angeben, die nicht blockiert werden sollen. Die Übereinstimmungsmuster sind unter https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns dokumentiert. Derzeit werden nur http / https-Zugriffe unterstützt. Es gibt eine Beschränkung von 1000 Einträgen.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, gibt es keine Ausnahmen für den Webseiten-Filter.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, gibt es keine Ausnahmen für den Webseiten-Filter.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Bookmark1">Lesezeichen 1</string>
        <string id="Bookmark2">Lesezeichen 2</string>
        <string id="Bookmark3">Lesezeichen 3</string>
@@@ -276,11 -364,15 +364,15 @@@ Hinweis: Diese Richtlinie ist nur wirks
        <string id="HomepageURL">Startseite</string>
        <string id="HomepageURL_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine Startseite festlegen. Sie können die Startseite auch sperren.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Benutzer eine Startseite festlegen.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Benutzer eine Startseite festlegen.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="HomepageAdditional">Zusätzliche Startseiten</string>
        <string id="HomepageAdditional_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie zusätzliche Startseiten festlegen. Diese werden in mehreren Registerkarten geöffnet.
  
- Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird nur eine Startseite angezeigt.</string>
+ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird nur eine Startseite angezeigt.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Proxy">Proxy Einstellungen</string>
        <string id="Proxy_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie die Netzwerkeinstellungen ändern und sperren.
  
@@@ -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>
@@@ -421,9 -514,6 +518,9 @@@
            <label/>
          </textBox>
        </presentation>
 +      <presentation id="SearchEngines_Remove">
 +        <listBox refId="SearchEngines_Remove"/>
 +      </presentation>
        <presentation id="Proxy">
          <checkBox refId="ProxyLocked">Ändern der Proxy-Einstellungen nicht erlauben</checkBox>
          <text>Verbindungs-Einstellungen</text>
diff --combined windows/en-US/firefox.adml
index 7952876,96f575f..8ff464a
--- 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,6 -26,10 +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.
  
@@@ -75,7 -83,9 +83,9 @@@ If this policy is disabled or not confi
        <string id="DisableAppUpdate">Disable Update</string>
        <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive udpates.
  
- If this policy is disabled or not configured, the browser receives updates.</string>
+ If this policy is disabled or not configured, the browser receives updates.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableBuiltinPDFViewer">Disable Built-in PDF Viewer (PDF.js)</string>
        <string id="DisableBuiltinPDFViewer_Explain">If this policy is enabled, PDF files are not viewed within Firefox.
  
@@@ -141,13 -151,17 +151,17 @@@ If this policy is disabled or not confi
        <string id="DisableSystemAddonUpdate">Disable System Addon Updates</string>
        <string id="DisableSystemAddonUpdate_Explain">If this policy is enabled, new system add-ons will not be installed and existing system add-ons will not be updated.
  
- If this policy is disabled or not configured, system add-ons are installed and updated.</string>
+ If this policy is disabled or not configured, system add-ons are installed and updated.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableTelemetry">Disable Telemetry</string>
        <string id="DisableTelemetry_Explain">If this policy is enabled, telemetry is not uploaded.
  
  If this policy is disabled or not configured, telemetry is collected and uploaded.
  
- Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours.</string>
+ Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
        <string id="DisplayBookmarksToolbar_Explain">If this policy is enabled, the bookmarks toolbar is displayed by default. The user can still hide it.
  
@@@ -164,16 -178,26 +178,26 @@@ If this policy is disabled or not confi
        <string id="Extensions_Install_Explain">If this policy is enabled, you can specify a list of extension URLs or paths that will be installed when Firefox is started.
  Anytime this list is changed, the extensions will be reinstalled.
  
- If this policy is disabled or not configured, no extensions are installed.</string>
+ If this policy is disabled or not configured, no extensions are installed.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Uninstall">Extensions to Uninstall</string>
        <string id="Extensions_Uninstall_Explain">If this policy is enabled, you can specify a list of extension IDs that will be uninstalled.
  Anytime this list is changed, the extensions will be uninstalled.
  
- If this policy is disabled or not configured, no extensions are uninstalled.</string>
+ If this policy is disabled or not configured, no extensions are uninstalled.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Locked">Prevent extensions from being disabled or removed</string>
        <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
  
- If this policy is disabled or not configured, no extensions are locked.</string>
+ If this policy is disabled or not configured, no extensions are locked
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
+       <string id="HardwareAcceleration">Hardware Acceleration</string>
+       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
+ 
+ If this policy is enabled or not configured, hardware acceleration is enabled.</string>
        <string id="OfferToSaveLogins">Offer to save logins</string>
        <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
  
@@@ -221,6 -245,62 +245,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>
@@@ -240,11 -320,15 +320,15 @@@ If this policy is disabled or not confi
        <string id="OverrideFirstRunPage">Override the first run page</string>
        <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
  
- If this policy is disabled or not configured, the first run page is displayed.</string>
+ If this policy is disabled or not configured, the first run page is displayed.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="OverridePostUpdatePage">Override the upgrade page</string>
        <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
  
- If this policy is disabled or not configured, the upgrade is displayed.</string>
+ If this policy is disabled or not configured, the upgrade is displayed.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="SanitizeOnShutdown">Clear all data when browser is closed</string>
        <string id="SanitizeOnShutdown_Explain">If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing &amp; Download History, Cookies, Active Logins, Cache, Form &amp; Search History, Site Preferences and Offline Website Data.
  
@@@ -252,11 -336,15 +336,15 @@@ If this policy is disabled or not confi
        <string id="WebsiteFilter_Block">Blocked websites</string>
        <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
  
- If this policy is disabled or not configured, no websites are blocked.</string>
+ If this policy is disabled or not configured, no websites are blocked.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>
        <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
  
- If this policy is disabled or not configured, there are no exceptions to the website filter.</string>
+ If this policy is disabled or not configured, there are no exceptions to the website filter.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Bookmark1">Bookmark One</string>
        <string id="Bookmark2">Bookmark Two</string>
        <string id="Bookmark3">Bookmark Three</string>
@@@ -276,11 -364,15 +364,15 @@@ Note: this policy is only effective if 
        <string id="HomepageURL">URL for Home page</string>
        <string id="HomepageURL_Explain">If this policy is enabled, you can set a default home page. You can also lock the home page.
  
- If this policy is disabled or not configured, the user can set and change the home page.</string>
+ If this policy is disabled or not configured, the user can set and change the home page.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="HomepageAdditional">Additional Homepages</string>
        <string id="HomepageAdditional_Explain">If this policy is enabled, you can have additional home pages. They are opened in multiple tabs.
  
- If this policy is disabled or not configured, there is only one home page.</string>
+ If this policy is disabled or not configured, there is only one home page.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Proxy">Proxy Settings</string>
        <string id="Proxy_Explain">If this policy is enabled, you can configure and lock network settings.
  
@@@ -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>
@@@ -421,9 -514,6 +518,9 @@@
            <label/>
          </textBox>
        </presentation>
 +      <presentation id="SearchEngines_Remove">
 +        <listBox refId="SearchEngines_Remove"/>
 +      </presentation>
        <presentation id="Proxy">
          <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
          <text>Connection Type:</text>
diff --combined windows/firefox.admx
index 4ce9e40,ce8e5b8..c206dc5
--- 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"/>
@@@ -299,6 -450,16 +450,16 @@@
          <decimal value="0"/>
        </disabledValue>
      </policy>
+     <policy name="HardwareAcceleration" class="Both" displayName="$(string.HardwareAcceleration)" explainText="$(string.HardwareAcceleration_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="HardwareAcceleration">
+       <parentCategory ref="firefox"/>
+       <supportedOn ref="SUPPORTED_FF62"/>
+       <enabledValue>
+         <decimal value="1"/>
+       </enabledValue>
+       <disabledValue>
+         <decimal value="0"/>
+       </disabledValue>
+     </policy>
      <policy name="DisableMasterPasswordCreation" class="Both" displayName="$(string.DisableMasterPasswordCreation)" explainText="$(string.DisableMasterPasswordCreation_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableMasterPasswordCreation">
        <parentCategory ref="firefox"/>
        <supportedOn ref="SUPPORTED_FF60"/>
@@@ -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 --combined windows/it-IT/firefox.adml
index 9e01911,99cb793..cef81c3
--- 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,6 -26,10 +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.
  
@@@ -75,7 -83,9 +83,9 @@@ Se questo criterio è disabilitato o no
        <string id="DisableAppUpdate">Disabilita aggiornamenti</string>
        <string id="DisableAppUpdate_Explain">Se questo criterio è abilitato, il browser non riceverà aggiornamenti.
  
- Se questo criterio è disabilitato o non configurato, il browser riceverà aggiornamenti.</string>
+ Se questo criterio è disabilitato o non configurato, il browser riceverà aggiornamenti.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableBuiltinPDFViewer">Disabilita visualizzatore PDF integrato (PDF.js)</string>
        <string id="DisableBuiltinPDFViewer_Explain">Se questo criterio è abilitato, i file PDF non sono visualizzati all'interno di Firefox.
  
@@@ -141,13 -151,17 +151,17 @@@ Se questo criterio è disabilitato o no
        <string id="DisableSystemAddonUpdate">Disabilita aggiornamenti componenti aggiuntivi di sistema</string>
        <string id="DisableSystemAddonUpdate_Explain">Se questo criterio è abilitato, non saranno installati nuovi componenti aggiuntivi di sistema e i componenti aggiuntivi di sistema esistenti non saranno aggiornati.
  
- Se questo criterio è disabilitato o non configurato, i componenti aggiuntivi di sistema saranno installati e aggiornati.</string>
+ Se questo criterio è disabilitato o non configurato, i componenti aggiuntivi di sistema saranno installati e aggiornati.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisableTelemetry">Disabilita telemetria</string>
        <string id="DisableTelemetry_Explain">Se questo criterio è abilitato, la telemetria non è caricata.
  
  Se questo criterio è disabilitato o non configurato, la telemetria è raccolta e caricata.
  
- Mozilla consiglia di non disabilitare la telemetria. Le informazioni raccolte tramite la telemetria ci consentono di realizzare un prodotto migliore per le aziende come la tua.</string>
+ Mozilla consiglia di non disabilitare la telemetria. Le informazioni raccolte tramite la telemetria ci consentono di realizzare un prodotto migliore per le aziende come la tua.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="DisplayBookmarksToolbar">Visualizza barra degli strumenti Segnalibri</string>
        <string id="DisplayBookmarksToolbar_Explain">Se questo criterio è abilitato, la barra degli strumenti Segnalibri è visualizzata per impostazione predefinita. L'utente può sempre nasconderla.
  
@@@ -164,16 -178,26 +178,26 @@@ Se questo criterio è disabilitato o no
        <string id="Extensions_Install_Explain">Se questo criterio è abilitato, è possibile specificare un elenco di URL o percorsi a estensioni che saranno installate all'avvio di Firefox.
  Le estensioni saranno reinstallate a ogni modifica dell'elenco.
  
- Se questo criterio è disabilitato o non configurato, non sarà installata alcuna estensione.</string>
+ Se questo criterio è disabilitato o non configurato, non sarà installata alcuna estensione.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Uninstall">Estensioni da disinstallare</string>
        <string id="Extensions_Uninstall_Explain">Se questo criterio è abilitato, è possibile specificare un elenco di ID di estensioni da disinstallare.
  Le estensioni saranno disinstallate a ogni modifica dell'elenco.
  
- Se questo criterio è disabilitato o non configurato, non sarà disinstallata alcuna estensione.</string>
+ Se questo criterio è disabilitato o non configurato, non sarà disinstallata alcuna estensione.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Extensions_Locked">Impedisci la disabilitazione o la rimozione delle estensioni</string>
        <string id="Extensions_Locked_Explain">Se questo criterio è abilitato, è possibile specificare un elenco di ID delle estensioni che l'utente non sarà in grado di disinstallare o disabilitare.
  
- Se questo criterio è disabilitato o non configurato, non sarà bloccata nessuna estensione.</string>
+ Se questo criterio è disabilitato o non configurato, non sarà bloccata nessuna estensione.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
+       <string id="HardwareAcceleration">Hardware Acceleration</string>
+       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
+ 
+ If this policy is enabled or not configured, hardware acceleration is enabled.</string>
        <string id="OfferToSaveLogins">Offri di salvare le credenziali di accesso</string>
        <string id="OfferToSaveLogins_Explain">Se questo criterio è abilitato o non configurato, Firefox si offrirà di salvare i nomi utente e le password di accesso ai siti.
  
@@@ -221,6 -245,62 +245,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>
@@@ -240,11 -320,15 +320,15 @@@ Se questo criterio è disabilitato o no
        <string id="OverrideFirstRunPage">Esegui l'override della pagina visualizzata al primo avvio</string>
        <string id="OverrideFirstRunPage_Explain">Se questo criterio è abilitato, è possibile specificare l'indirizzo di una pagina da visualizzare al primo avvio del browser. Se il campo è lasciato vuoto, non verrà visualizzata alcuna pagina al primo avvio.
  
- Se questo criterio è disabilitato o non configurato, al primo avvio verrà visualizzata la pagina predefinita.</string>
+ Se questo criterio è disabilitato o non configurato, al primo avvio verrà visualizzata la pagina predefinita.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="OverridePostUpdatePage">Esegui l'override della pagina visualizzata dopo un aggiornamento</string>
        <string id="OverridePostUpdatePage_Explain">Se questo criterio è abilitato, è possibile specificare l'indirizzo di una pagina da visualizzare dopo l'aggiornamento di Firefox. Se il campo è lasciato vuoto, non verrà visualizzata alcuna pagina dopo l'aggiornamento.
  
- Se questo criterio è disabilitato o non configurato, dopo ogni aggiornamento verrà visualizzata la pagina predefinita.</string>
+ Se questo criterio è disabilitato o non configurato, dopo ogni aggiornamento verrà visualizzata la pagina predefinita.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="SanitizeOnShutdown">Cancella tutti i dati alla chiusura del browser</string>
        <string id="SanitizeOnShutdown_Explain">Se questo criterio è abilitato, tutti i dati saranno cancellati alla chiusura di Firefox. Ciò include la cronologia di navigazione e dei download, i cookie, gli accessi effettuati, la cache, la cronologia dei moduli e di ricerca, le preferenze e i dati non in linea dei siti Web.
  
@@@ -252,11 -336,15 +336,15 @@@ Se questo criterio è disabilitato o no
        <string id="WebsiteFilter_Block">Siti Web bloccati</string>
        <string id="WebsiteFilter_Block_Explain">Se questo criterio è abilitato, è possibile utilizzare dei pattern per specificare i siti da bloccare. I pattern sono documentati alla pagina https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Attualmente sono supportati solo i protocolli HTTP e HTTPS. C'è un limite di 1000 voci.
  
- Se questo criterio è disabilitato o non configurato, non sarà bloccato nessun sito.</string>
+ Se questo criterio è disabilitato o non configurato, non sarà bloccato nessun sito.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="WebsiteFilter_Exceptions">Eccezioni ai siti Web bloccati</string>
        <string id="WebsiteFilter_Exceptions_Explain">Se questo criterio è abilitato e il sito filtri Web è abilitato, è possibile utilizzare dei pattern per specificare i siti da non bloccare. I pattern sono documentati alla pagina https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Attualmente sono supportati solo i protocolli HTTP e HTTPS. C'è un limite di 1000 voci.
  
- Se questo criterio è disabilitato o non configurato, non ci sono eccezioni al sito filtri Web.</string>
+ Se questo criterio è disabilitato o non configurato, non ci sono eccezioni al sito filtri Web.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Bookmark1">Segnalibro 1</string>
        <string id="Bookmark2">Segnalibro 2</string>
        <string id="Bookmark3">Segnalibro 3</string>
@@@ -276,11 -364,15 +364,15 @@@ Nota: questo criterio ha efficacia sol
        <string id="HomepageURL">Indirizzo pagina iniziale</string>
        <string id="HomepageURL_Explain">Se questo criterio è abilitato, è possibile specificare una pagina iniziale predefinita. È anche possibile bloccare l'impostazione relativa alla pagina iniziale.
  
- Se questo criterio è disabilitato o non configurato, l'utente può impostare e modificare la pagina iniziale.</string>
+ Se questo criterio è disabilitato o non configurato, l'utente può impostare e modificare la pagina iniziale.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="HomepageAdditional">Pagine iniziali aggiuntive</string>
        <string id="HomepageAdditional_Explain">Se questo criterio è abilitato, è possibile avere pagine iniziali aggiuntive. Queste saranno aperte in schede multiple.
  
- Se questo criterio è disabilitato o non configurato, ci sarà una sola pagina iniziale.</string>
+ Se questo criterio è disabilitato o non configurato, ci sarà una sola pagina iniziale.
+ 
+ Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
        <string id="Proxy">Impostazioni proxy</string>
        <string id="Proxy_Explain">Se questo criterio è abilitato, è possibile configurare e bloccare le impostazioni di rete.
  
@@@ -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>
@@@ -421,9 -514,6 +518,9 @@@
            <label/>
          </textBox>
        </presentation>
 +      <presentation id="SearchEngines_Remove">
 +        <listBox refId="SearchEngines_Remove"/>
 +      </presentation>
        <presentation id="Proxy">
          <checkBox refId="ProxyLocked">Non consentire la modifica delle impostazioni del proxy.</checkBox>
          <text>Tipo connessione:</text>