From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 8 Jul 2019 21:26:24 +0000 (-0500)
Subject: SanitizeOnShutdown admx
X-Git-Tag: v1.8~16^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/d143d27b264bfd2dd1377aad0ea5c3a51a7e2a99?ds=inline

SanitizeOnShutdown admx
---

diff --git a/README.md b/README.md
index 4a900c2..e97c9e4 100644
--- a/README.md
+++ b/README.md
@@ -2022,7 +2022,7 @@ Clear data on shutdown. Choose from Cache, Cookies, Download History, Form & Sea
 
 **Compatibility:** Firefox 68, Firefox ESR 68\
 **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`
+**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
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cache = 0x1 | 0x0
@@ -2080,7 +2080,7 @@ Clear all data on shutdown, including Browsing & Download History, Cookies, Acti
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **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`
+**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
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown = 0x1 | 0x0
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 5fc6cec..9fb1608 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -710,6 +710,16 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6ce3b79..4b90be6 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -351,8 +351,8 @@ If this policy is disabled or not configured, the first run page is displayed.</
       <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>
-      <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.
+      <string id="SanitizeOnShutdown">Clear data when browser is closed</string>
+      <string id="SanitizeOnShutdown_Explain">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.</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>
@@ -711,6 +711,16 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index fe29379..4df2ad7 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -709,6 +709,16 @@ Si esta política está deshabilitada o no está configurada, Firefox establece
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index e380579..8253f9d 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -831,7 +831,7 @@
       </disabledValue>
     </policy>
     <!-- Alphabetization is based on name, so had to add C -->
-    <policy name="C_SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown">
+    <policy name="C_SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown" presentation="$(presentation.SanitizeOnShutdown)" >
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
       <enabledValue>
@@ -840,6 +840,72 @@
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>
+      <elements >
+        <boolean id="SanitizeOnShutdown_Cache" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cache">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_Cookies" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cookies">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_Downloads" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Downloads">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_FormData" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="FormData">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_History" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="History">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_Sessions" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Sessions">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_SiteSettings" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="SiteSettings">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="SanitizeOnShutdown_OfflineApps" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="OfflineApps">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
     </policy>
     <policy name="HomepageURL" class="Both" displayName="$(string.HomepageURL)" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 2350aff..3dd138f 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -709,6 +709,16 @@ Si cette stratégie est désactivée ou non configurée, Firefox utilise par dé
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index ac1b68d..7255404 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -709,6 +709,16 @@ Se questo criterio è disabilitato o non configurato, per impostazione predefini
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
+        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>