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?ds=sidebyside

Merge branch 'master' into 1452740_HardwareAcceleration
---

c3d8459fa24896557bdfa3ee312dd2d91452ec9b
diff --cc windows/de-DE/firefox.adml
index 8026a6e,1007e3e..fb1b057
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@@ -173,11 -191,9 +191,13 @@@ Starting with Firefox 62, this policy w
        <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.
  
diff --cc windows/en-US/firefox.adml
index 237f47b,4806946..96f575f
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -173,11 -191,9 +191,13 @@@ Starting with Firefox 62, this policy w
        <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.
  
diff --cc windows/it-IT/firefox.adml
index 9955c71,1777df6..99cb793
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@@ -173,11 -191,9 +191,13 @@@ Starting with Firefox 62, this policy w
        <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.