From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 3 Mar 2020 22:58:55 +0000 (-0800)
Subject: Merge pull request #545 from mozilla/SanitizeOnShutdown_Updates
X-Git-Tag: v1.14~5
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9942e60a4a77fb714c1aab6b751b0d3f79c5afdd?hp=e529c897e63902ab79619e28519bd897f9494d06
Merge pull request #545 from mozilla/SanitizeOnShutdown_Updates
Sanitize on shutdown updates
---
diff --git a/README.md b/README.md
index 0cbc396..efbbd13 100644
--- a/README.md
+++ b/README.md
@@ -2544,7 +2544,9 @@ or
 ### SanitizeOnShutdown (Selective)
 Clear data on shutdown. Choose from Cache, Cookies, Download History, Form & Search History, Browsing History, Active Logins, Site Preferences and Offline Website Data.
 
-**Compatibility:** Firefox 68, Firefox ESR 68\
+Previously, these values were always locked. Starting with Firefox 74 and Firefox ESR 68.6, you can use the `Locked` option to either keep the values unlocked (set it to false), or lock only the values you set (set it to true). If you want the old behavior of locking everything, do not set `Locked` at all.
+
+**Compatibility:** Firefox 68, Firefox ESR 68 (Locked added in 74/68.6)\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `privacy.sanitize.sanitizeOnShutdown`,`privacy.clearOnShutdown.cache`,`privacy.clearOnShutdown.cookies`,`privacy.clearOnShutdown.downloads`,`privacy.clearOnShutdown.formdata`,`privacy.clearOnShutdown.history`,`privacy.clearOnShutdown.sessions`,`privacy.clearOnShutdown.siteSettings`,`privacy.clearOnShutdown.offlineApps`
 #### Windows (GPO)
@@ -2557,6 +2559,7 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\History = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Sessions = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\SiteSettings = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Locked = 0x1 | 0x0
 ```
 #### macOS
 ```
@@ -2579,6 +2582,8 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
      | 
     OfflineApps
      | 
+    Locked
+     | 
   
 
 ```
@@ -2594,7 +2599,8 @@ Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\OfflineApps = 0x1 | 0x0
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
-      "OfflineApps": true | false
+      "OfflineApps": true | false,
+      "Locked": true | false
     }
   }
 }
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 99fb24f..553da85 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 oder höher, Firefox 68.3 ESR oder höher
       Firefox 72 oder höher, Firefox 68.4 ESR oder höher
       Firefox 73 oder höher, Firefox 68.5 ESR oder höher
+      Firefox 74 oder höher, Firefox 68.6 ESR oder höher
       Firefox
       Berechtigungen
       Kamera
@@ -411,6 +412,46 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren wird e
       Wenn Sie die Richtlinieneinstellung aktivieren, werden alle Daten der Chronik gelöscht, wenn Firefox geschlossen wird. Dies beinhaltet Browsing & Download Verlauf, Cookies, Aktive Logins, Cache, Form & Suchverlauf, Website-Einstellungen und Offline-Website-Daten.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die keine Daten der Chronik gelöscht.
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       Gesperrte Webseites
       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. 
 
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 1fcae1a..11cdfec 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 or later, Firefox 68.3 ESR or later
       Firefox 72 or later, Firefox 68.4 ESR or later
       Firefox 73 or later, Firefox 68.5 ESR or later
+      Firefox 74 or later, Firefox 68.6 ESR or later
       Firefox
       Permissions
       Camera
@@ -407,10 +408,50 @@ If this policy is disabled or not configured, the first run page is displayed.
       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.
-      Clear data when browser is closed
+      Clear data when browser is closed (Moved)
       If this policy is enabled, you can choose data to be cleared when Firefox is closed.
 
 If this policy is disabled or not configured, data is not cleared when the browser is closed.
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       Blocked websites
       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.
 
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 282e0a0..83c4ff2 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 o posterior, Firefox 68.3 ESR o posterior
       Firefox 72 o posterior, Firefox 68.4 ESR o posterior
       Firefox 73 o posterior, Firefox 68.5 ESR o posterior
+      Firefox 74 o posterior, Firefox 68.6 ESR o posterior
       Firefox
       Permisos
       Camera
@@ -411,6 +412,46 @@ Si esta polÃtica está deshabilitada o no está configurada, se mostrará la ac
       Si esta polÃtica está habilitada, podrá elegir que los datos se borren cuando Firefox esté cerrado.
 
 Si esta polÃtica está deshabilitada o no está configurada, los datos no se borrarán cuando se cierra el navegador.
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       Sitios web bloqueados
       Si esta polÃtica está habilitada, puede especificar patrones de coincidencia que indiquen que sitios se bloquearán. Los patrones de coincidencia están documentados en https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Solo las direcciones http/https son compatibles en este momento. Hay un lÃmite de 1000 entradas.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 6867ab3..335aa4c 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -22,6 +22,7 @@
       
       
       
+      
       
     
   
@@ -77,6 +78,9 @@
     
       
     
+    
+      
+    
   
   
     
@@ -3132,5 +3136,95 @@
         
       
     
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
+    
+      
+      
+      
+        
+      
+      
+        
+      
+    
   
 
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 4dcbf5d..a0f6887 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 ou supérieur, Firefox 68.3 ESR ou supérieur
       Firefox 72 ou supérieur, Firefox 68.4 ESR ou supérieur
       Firefox 73 ou supérieur, Firefox 68.5 ESR ou supérieur
+      Firefox 74 ou supérieur, Firefox 68.6 ESR ou supérieur
       Firefox
       Permissions
       Caméra
@@ -411,6 +412,46 @@ Si cette stratégie est désactivée ou non configurée, la mise à niveau est a
       Si cette stratégie est activée, toutes les données sont effacées à la fermeture de Firefox. Cela inclut la navigation, Historique de téléchargement, cookies, connexions actives, cache, formulaire et Historique de recherche, préférences de site et données de site Web hors ligne.
 
 Si cette stratégie est désactivée ou non configurée, les données ne sont pas effacées à la fermeture du navigateur.
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       Sites Web bloqués
       Si cette stratégie est activée, vous pouvez spécifier des modèles de correspondance indiquant que les sites doivent être bloqués. Les modèles de correspondance sont documentés à l'adresse https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Seules les adresses http / https sont prises en charge pour le moment. Il y a une limite de 1000 entrées.
 
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 294ab5a..c15ecd3 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 o versione successiva, Firefox 68.3 ESR o versione successiva
       Firefox 72 o versione successiva, Firefox 68.4 ESR o versione successiva
       Firefox 73 o versione successiva, Firefox 68.5 ESR o versione successiva
+      Firefox 74 o versione successiva, Firefox 68.6 ESR o versione successiva
       Firefox
       Permessi
       Fotocamera
@@ -411,6 +412,46 @@ Se questo criterio è disabilitato o non configurato, dopo ogni aggiornamento ve
       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.
 
 Se questo criterio è disabilitato o non configurato, i dati non sono cancellati alla chiusura del browser.
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       Siti Web bloccati
       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.
 
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index b59444e..1e557c7 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -21,6 +21,7 @@
       Firefox 71 ææ´æ°çæ¬ãFirefox 68.3 ESR ææ´æ°çæ¬
       Firefox 72 ææ´æ°çæ¬ãFirefox 68.4 ESR ææ´æ°çæ¬
       Firefox 73 ææ´æ°çæ¬ãFirefox 68.5 ESR ææ´æ°çæ¬
+      Firefox 74 ææ´æ°çæ¬ãFirefox 68.6 ESR ææ´æ°çæ¬
       Firefox
       æ¬é
       æå½±æ©
@@ -409,6 +410,46 @@ If this policy is disabled or not configured, the menu bar is not displayed by d
       è¥åç¨æ¤ååï¼å°å¯ä»¥é¸æè¦å¨éé Firefox ææ¸
çåªäºè³æã
 
 è¥åç¨æä¸è¨å®æ¤ååï¼å䏿å¨éé Firefox ææ¸
çä»»ä½è³æã
+      Clear data when browser is closed
+
+      Cache
+      If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.
+      Cookies
+      If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.
+      Download History
+      If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.
+      Form & Search History
+      If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.
+      Browsing History
+      If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.
+      Active Logins
+      If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.
+      Site Preferences
+      If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.
+      Offline Website Data
+      If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.
+      Locked
+      If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).
       è¦å°éçç¶²ç«
       è¥åç¨æ¤ååï¼å°å¯ä»¥æå®è¦å°éçç¶²ç«ç¶²åè¦åãè¦åæ ¼å¼æä»¶ä½æ¼ https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patternsãç®åå
æ¯æ´ http/https ç¶²åï¼æå¤ 1000 çé 
ç®ã