From: Michael Kaply <consulting@kaply.com>
Date: Wed, 5 Sep 2018 20:12:31 +0000 (-0500)
Subject: Merge branch 'master' into 1452740_HardwareAcceleration
X-Git-Tag: v1.2~10^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/c3d8459fa24896557bdfa3ee312dd2d91452ec9b?hp=4d58316a143e1e75b5bc85cd72f4ff4840f5cfba

Merge branch 'master' into 1452740_HardwareAcceleration
---

diff --git a/README.md b/README.md
index f505eba..c0d658f 100644
--- a/README.md
+++ b/README.md
@@ -330,6 +330,15 @@ For Uninstall and Locked, you specify extension IDs.
     }
 }
 ```
+### 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.
 ```
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 1007e3e..fb1b057 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -194,6 +194,10 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 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.
 
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4806946..96f575f 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -194,6 +194,10 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 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.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index c5ad0b0..ce8e5b8 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -450,6 +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"/>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 1777df6..99cb793 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -194,6 +194,10 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 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.