Merge pull request #1049 from mozilla/JSONOneLine

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 40c4aa56a29ce9a1fb96a4186ff9212a860b31c3..f015ce21af8bed3a6b0ce095ffad012b728e49d7 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitions revision="3.8" schemaVersion="1.0">
+<policyDefinitions revision="5.1" schemaVersion="1.0">

   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>

-  <resources minRequiredRevision="3.8"/>
+  <resources minRequiredRevision="5.1"/>

   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>


@@ -50,6 +50,18 @@
       <definition name="SUPPORTED_FF98_ONLY" displayName="$(string.SUPPORTED_FF98_ONLY)"/>
       <definition name="SUPPORTED_FF99" displayName="$(string.SUPPORTED_FF99)"/>
       <definition name="SUPPORTED_FF100" displayName="$(string.SUPPORTED_FF100)"/>
       <definition name="SUPPORTED_FF98_ONLY" displayName="$(string.SUPPORTED_FF98_ONLY)"/>
       <definition name="SUPPORTED_FF99" displayName="$(string.SUPPORTED_FF99)"/>
       <definition name="SUPPORTED_FF100" displayName="$(string.SUPPORTED_FF100)"/>

+      <definition name="SUPPORTED_FF101" displayName="$(string.SUPPORTED_FF101)"/>
+      <definition name="SUPPORTED_FF102" displayName="$(string.SUPPORTED_FF102)"/>
+      <definition name="SUPPORTED_FF104" displayName="$(string.SUPPORTED_FF104)"/>
+      <definition name="SUPPORTED_FF105" displayName="$(string.SUPPORTED_FF105)"/>
+      <definition name="SUPPORTED_FF106" displayName="$(string.SUPPORTED_FF106)"/>
+      <definition name="SUPPORTED_FF107" displayName="$(string.SUPPORTED_FF107)"/>
+      <definition name="SUPPORTED_FF108" displayName="$(string.SUPPORTED_FF108)"/>
+      <definition name="SUPPORTED_FF109" displayName="$(string.SUPPORTED_FF109)"/>
+      <definition name="SUPPORTED_FF110" displayName="$(string.SUPPORTED_FF110)"/>
+      <definition name="SUPPORTED_FF112_ONLY" displayName="$(string.SUPPORTED_FF112_ONLY)"/>
+      <definition name="SUPPORTED_FF113_ONLY" displayName="$(string.SUPPORTED_FF113_ONLY)"/>
+      <definition name="SUPPORTED_FF114" displayName="$(string.SUPPORTED_FF114)"/>

     </definitions>
   </supportedOn>
   <categories>
     </definitions>
   </supportedOn>
   <categories>


@@ -134,6 +146,12 @@
     <category displayName="$(string.PictureInPicture_group)" name="PictureInPicture">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.PictureInPicture_group)" name="PictureInPicture">
       <parentCategory ref="firefox"/>
     </category>

+    <category displayName="$(string.ProxySettings_group)" name="ProxySettings">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.SecurityDevices_group)" name="SecurityDevices">
+      <parentCategory ref="firefox"/>
+    </category>

   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">


@@ -723,29 +741,6 @@
         <list id="List" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains" valuePrefix=""/>
       </elements>
     </policy>
         <list id="List" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains" valuePrefix=""/>
       </elements>
     </policy>

-    <policy name="DNSOverHTTPS" class="Both" displayName="$(string.DNSOverHTTPS)" explainText="$(string.DNSOverHTTPS_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.DNSOverHTTPS)" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_FF63ESR" />
-      <elements>
-        <text id="ProviderURL" valueName="ProviderURL" />
-        <boolean id="DNSOverHTTPSEnabled" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Enabled">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="DNSOverHTTPSLocked" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-      </elements>
-    </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_FF60"/>
     <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_FF60"/>


@@ -966,6 +961,29 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="DisplayBookmarksToolbar_Enum" class="Both" displayName="$(string.DisplayBookmarksToolbar_Enum)" explainText="$(string.DisplayBookmarksToolbar_Enum_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.DisplayBookmarksToolbar)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF109"/>
+        <elements>
+        <enum id="DisplayBookmarksToolbar" valueName="DisplayBookmarksToolbar">
+          <item displayName="$(string.DisplayBookmarksToolbar_Always)">
+            <value>
+              <string>always</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_Never)">
+            <value>
+              <string>never</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_NewTab)">
+            <value>
+              <string>newtab</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>

     <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
     <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>


@@ -1032,6 +1050,13 @@
         <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="16384"/>
       </elements>
     </policy>
         <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="16384"/>
       </elements>
     </policy>

+    <policy name="ExtensionSettingsOneLine" class="Both" displayName="$(string.ExtensionSettingsOneLine)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="Extensions"/>
+      <supportedOn ref="SUPPORTED_FF69"/>
+      <elements>
+        <text id="JSONOneLine" valueName="ExtensionSettings" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>


@@ -1330,83 +1355,6 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </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" presentation="$(presentation.SanitizeOnShutdown)" >
-      <parentCategory ref="firefox"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
-      <enabledValue>
-        <decimal value="1"/>
-      </enabledValue>
-      <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" />
       <supportedOn ref="SUPPORTED_FF60" />
     <policy name="HomepageURL" class="Both" displayName="$(string.HomepageURL)" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_FF60" />


@@ -1467,6 +1415,13 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="A_BookmarksOneLine" class="Both" displayName="$(string.BookmarksOneLine)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Bookmarks_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="Bookmarks"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <text id="JSONOneLine" valueName="Bookmarks" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="A_Bookmarks" class="Both" displayName="$(string.Bookmarks)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Bookmarks_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="Bookmarks"/>
       <supportedOn ref="SUPPORTED_FF95"/>
     <policy name="A_Bookmarks" class="Both" displayName="$(string.Bookmarks)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Bookmarks_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="Bookmarks"/>
       <supportedOn ref="SUPPORTED_FF95"/>


@@ -2584,19 +2539,28 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-    <policy name="Proxy" class="Both" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy)" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_FF60" />
+    <policy name="PasswordManagerExceptions" class="Both" displayName="$(string.PasswordManagerExceptions)" explainText="$(string.PasswordManagerExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" presentation="$(presentation.List)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF101"/>

       <elements>
       <elements>

-        <boolean id="ProxyLocked" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <enum id="ConnectionType" valueName="Mode">
+        <list id="List" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy name="Proxy_Locked" class="Both" displayName="$(string.Proxy_Locked)" explainText="$(string.Proxy_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Proxy_ConnectionType" class="Both" displayName="$(string.Proxy_ConnectionType)" explainText="$(string.Proxy_ConnectionType_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_ConnectionType)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <enum id="Proxy_ConnectionType" valueName="Mode">

           <item displayName="$(string.NoProxy)">
             <value>
               <string>none</string>
           <item displayName="$(string.NoProxy)">
             <value>
               <string>none</string>


@@ -2623,19 +2587,38 @@
             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>

-        <text id="HTTPProxy" valueName="HTTPProxy"/>
-        <boolean id="UseHTTPProxyForAllProtocols" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseHTTPProxyForAllProtocols">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <text id="SSLProxy" valueName="SSLProxy"/>
-        <text id="FTPProxy" valueName="FTPProxy"/>
-        <text id="SOCKSProxy" valueName="SOCKSProxy"/>
-        <enum id="SOCKSVersion" valueName="SOCKSVersion">
+      </elements>
+    </policy>
+    <policy name="Proxy_HTTPProxy" class="Both" displayName="$(string.Proxy_HTTPProxy)" explainText="$(string.Proxy_HTTPProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_HTTPProxy)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <text id="Proxy_HTTPProxy" valueName="HTTPProxy"/>
+      </elements>
+    </policy>
+    <policy name="Proxy_UseHTTPProxyForAllProtocols" class="Both" displayName="$(string.Proxy_UseHTTPProxyForAllProtocols)" explainText="$(string.Proxy_UseHTTPProxyForAllProtocols_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseHTTPProxyForAllProtocols">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Proxy_SSLProxy" class="Both" displayName="$(string.Proxy_SSLProxy)" explainText="$(string.Proxy_SSLProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_SSLProxy)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <text id="Proxy_SSLProxy" valueName="SSLProxy"/>
+      </elements>
+    </policy>
+    <policy name="Proxy_SOCKSProxy" class="Both" displayName="$(string.Proxy_SOCKSProxy)" explainText="$(string.Proxy_SOCKSProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_SOCKSProxy)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <text id="Proxy_SOCKSProxy" valueName="SOCKSProxy"/>
+        <enum id="Proxy_SOCKSVersion" valueName="SOCKSVersion">

           <item displayName="$(string.SOCKSVersion4)">
             <value>
               <decimal value="4"/>
           <item displayName="$(string.SOCKSVersion4)">
             <value>
               <decimal value="4"/>


@@ -2647,26 +2630,42 @@
             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>

-        <text id="AutoConfigURL" valueName="AutoConfigURL"/>
-        <text id="Passthrough" valueName="Passthrough"/>
-        <boolean id="AutoLogin" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="AutoLogin">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="UseProxyForDNS" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseProxyForDNS">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>

       </elements>
     </policy>
       </elements>
     </policy>

+    <policy name="Proxy_AutoConfigURL" class="Both" displayName="$(string.Proxy_AutoConfigURL)" explainText="$(string.Proxy_AutoConfigURL_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_AutoConfigURL)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <text id="Proxy_AutoConfigURL" valueName="AutoConfigURL"/>
+      </elements>
+    </policy>
+    <policy name="Proxy_Passthrough" class="Both" displayName="$(string.Proxy_Passthrough)" explainText="$(string.Proxy_Passthrough_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy_Passthrough)">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <elements>
+        <text id="Proxy_Passthrough" valueName="Passthrough"/>
+      </elements>
+    </policy>
+    <policy name="Proxy_AutoLogin" class="Both" displayName="$(string.Proxy_AutoLogin)" explainText="$(string.Proxy_AutoLogin_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="AutoLogin">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Proxy_UseProxyForDNS" class="Both" displayName="$(string.Proxy_UseProxyForDNS)" explainText="$(string.Proxy_UseProxyForDNS_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseProxyForDNS">
+      <parentCategory ref="ProxySettings"/>
+      <supportedOn ref="SUPPORTED_FF60"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

     <policy name="SearchBar" class="Both" displayName="$(string.SearchBar)" explainText="$(string.SearchBar_Explain)" key="Software\Policies\Mozilla\Firefox"  presentation="$(presentation.SearchBar)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
     <policy name="SearchBar" class="Both" displayName="$(string.SearchBar)" explainText="$(string.SearchBar_Explain)" key="Software\Policies\Mozilla\Firefox"  presentation="$(presentation.SearchBar)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>


@@ -2695,43 +2694,6 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-    <policy name="TrackingProtection" class="Both" displayName="$(string.TrackingProtection)" explainText="$(string.TrackingProtection_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Value" presentation="$(presentation.TrackingProtection)">
-      <parentCategory ref="firefox"/>
-      <supportedOn ref="SUPPORTED_FF60"/>
-      <enabledValue>
-        <decimal value="1"/>
-      </enabledValue>
-      <disabledValue>
-        <decimal value="0"/>
-      </disabledValue>
-      <elements>
-        <boolean id="TrackingProtectionLocked" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Locked">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="Cryptomining" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Cryptomining">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <boolean id="Fingerprinting" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="Fingerprinting">
-          <trueValue>
-            <decimal value="1"/>
-          </trueValue>
-          <falseValue>
-            <decimal value="0"/>
-          </falseValue>
-        </boolean>
-        <list id="TrackingProtection_Exceptions" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection\Exceptions" valuePrefix=""/>
-      </elements>
-    </policy>

     <!-- Alphabetization is based on name, so had to add B -->
     <policy name="B_WebsiteFilter_Block" class="Both" displayName="$(string.WebsiteFilter_Block)" explainText="$(string.WebsiteFilter_Block_Explain)" key="Software\Policies\Mozilla\WebsiteFilter\Block" presentation="$(presentation.WebsiteFilter)">
       <parentCategory ref="firefox"/>
     <!-- Alphabetization is based on name, so had to add B -->
     <policy name="B_WebsiteFilter_Block" class="Both" displayName="$(string.WebsiteFilter_Block)" explainText="$(string.WebsiteFilter_Block_Explain)" key="Software\Policies\Mozilla\WebsiteFilter\Block" presentation="$(presentation.WebsiteFilter)">
       <parentCategory ref="firefox"/>


@@ -2748,6 +2710,20 @@
         <list id="WebsiteFilter" key="Software\Policies\Mozilla\Firefox\WebsiteFilter\Exceptions" valuePrefix=""/>
       </elements>
     </policy>
         <list id="WebsiteFilter" key="Software\Policies\Mozilla\Firefox\WebsiteFilter\Exceptions" valuePrefix=""/>
       </elements>
     </policy>

+    <policy name="WebsiteFilterOneLine" class="Both" displayName="$(string.WebsiteFilterOneLine)" explainText="$(string.WebsiteFilter_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF114"/>
+      <elements>
+        <text id="JSONOneLine" valueName="WebsiteFilter" maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="WebsiteFilter" class="Both" displayName="$(string.WebsiteFilter)" explainText="$(string.WebsiteFilter_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.JSON)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF114"/>
+      <elements>
+        <multiText id="JSON" valueName="WebsiteFilter"  maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="SearchEngines_1" class="Both" displayName="$(string.SearchEngines_1)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\1" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />
     <policy name="SearchEngines_1" class="Both" displayName="$(string.SearchEngines_1)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\1" presentation="$(presentation.SearchEngine)" >
       <parentCategory ref="Search" />
       <supportedOn ref="SUPPORTED_FF60ESR" />


@@ -2930,7 +2906,7 @@
         <text id="Preferences_String" valueName="RequestedLocales"/>
       </elements>
     </policy>
         <text id="Preferences_String" valueName="RequestedLocales"/>
       </elements>
     </policy>

-    <policy name="SSLVersionMin" class="Both" displayName="$(string.SSLVersionMin)" explainText="$(string.SSLVersionMin_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersion)" >
+    <policy name="SSLVersionMin" class="Both" displayName="$(string.SSLVersionMin)" explainText="$(string.SSLVersionMin_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersionMin)" >

       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
       <elements>
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
       <elements>


@@ -2958,7 +2934,7 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

-    <policy name="SSLVersionMax" class="Both" displayName="$(string.SSLVersionMax)" explainText="$(string.SSLVersionMax_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersion)" >
+    <policy name="SSLVersionMax" class="Both" displayName="$(string.SSLVersionMax)" explainText="$(string.SSLVersionMax_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SSLVersionMax)" >

       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
       <elements>
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF66" />
       <elements>


@@ -3621,6 +3597,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="F_TrackingProtection_EmailTracking" class="Both" displayName="$(string.TrackingProtection_EmailTracking)" explainText="$(string.TrackingProtection_EmailTracking_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="EmailTracking">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF112"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

     <policy name="UserMessaging_WhatsNew" class="Both" displayName="$(string.UserMessaging_WhatsNew)" explainText="$(string.UserMessaging_WhatsNew_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="WhatsNew">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75_ONLY"/>
     <policy name="UserMessaging_WhatsNew" class="Both" displayName="$(string.UserMessaging_WhatsNew)" explainText="$(string.UserMessaging_WhatsNew_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="WhatsNew">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75_ONLY"/>


@@ -3681,6 +3667,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="UserMessaging_Locked" class="Both" displayName="$(string.UserMessaging_Locked)" explainText="$(string.UserMessaging_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="Locked">
+      <parentCategory ref="UserMessaging"/>
+      <supportedOn ref="SUPPORTED_FF75"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

     <policy name="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_DHE_RSA_WITH_AES_128_CBC_SHA">
       <parentCategory ref="DisabledCiphers"/>
       <supportedOn ref="SUPPORTED_FF76_ONLY"/>
     <policy name="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA" class="Both" displayName="$(string.DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_DHE_RSA_WITH_AES_128_CBC_SHA">
       <parentCategory ref="DisabledCiphers"/>
       <supportedOn ref="SUPPORTED_FF76_ONLY"/>


@@ -3921,6 +3917,13 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="HandlersOneLine" class="Both" displayName="$(string.HandlersOneLine)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF78"/>
+      <elements>
+        <text id="JSONOneLine" valueName="Handlers" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="Handlers" class="Both" displayName="$(string.Handlers)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)" presentation="$(presentation.Handlers)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
     <policy name="Handlers" class="Both" displayName="$(string.Handlers)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)" presentation="$(presentation.Handlers)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>


@@ -3928,6 +3931,13 @@
         <multiText id="Handlers" valueName="Handlers"  maxLength="16384"/>
       </elements>
     </policy>
         <multiText id="Handlers" valueName="Handlers"  maxLength="16384"/>
       </elements>
     </policy>

+    <policy name="PreferencesOneLine" class="Both" displayName="$(string.PreferencesOneLine)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF81"/>
+      <elements>
+        <text id="JSONOneLine" valueName="Preferences" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="Preferences" class="Both" displayName="$(string.Preferences)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF81"/>
     <policy name="Preferences" class="Both" displayName="$(string.Preferences)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF81"/>


@@ -3935,6 +3945,13 @@
         <multiText id="JSON" valueName="Preferences"  maxLength="16384"/>
       </elements>
     </policy>
         <multiText id="JSON" valueName="Preferences"  maxLength="16384"/>
       </elements>
     </policy>

+    <policy name="ManagedBookmarksOneLine" class="Both" displayName="$(string.ManagedBookmarksOneLine)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF83"/>
+      <elements>
+        <text id="JSONOneLine" valueName="ManagedBookmarks" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="ManagedBookmarks" class="Both" displayName="$(string.ManagedBookmarks)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF83"/>
     <policy name="ManagedBookmarks" class="Both" displayName="$(string.ManagedBookmarks)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ManagedBookmarks_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF83"/>


@@ -3959,6 +3976,13 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="AutoLaunchProtocolsFromOriginsOneLine" class="Both" displayName="$(string.AutoLaunchProtocolsFromOriginsOneLine)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.AutoLaunchProtocolsFromOrigins_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF81"/>
+      <elements>
+        <text id="JSONOneLine" valueName="AutoLaunchProtocolsFromOrigins" maxLength="16384"/>
+      </elements>
+    </policy>

     <policy name="AutoLaunchProtocolsFromOrigins" class="Both" displayName="$(string.AutoLaunchProtocolsFromOrigins)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.AutoLaunchProtocolsFromOrigins_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF81"/>
     <policy name="AutoLaunchProtocolsFromOrigins" class="Both" displayName="$(string.AutoLaunchProtocolsFromOrigins)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.AutoLaunchProtocolsFromOrigins_Explain)" presentation="$(presentation.JSON)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF81"/>


@@ -3976,5 +4000,94 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="UseSystemPrintDialog" class="Both" displayName="$(string.UseSystemPrintDialog)" explainText="$(string.UseSystemPrintDialog_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="UseSystemPrintDialog">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine" class="Both" displayName="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <elements>
+        <text id="JSONOneLine" valueName="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings" maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings" class="Both" displayName="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarnings)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain)" presentation="$(presentation.JSON)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <elements>
+        <multiText id="JSON" valueName="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings"  maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="StartDownloadsInTempDirectory" class="Both" displayName="$(string.StartDownloadsInTempDirectory)" explainText="$(string.StartDownloadsInTempDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="StartDownloadsInTempDirectory">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF102"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="GoToIntranetSiteForSingleWordEntryInAddressBar" class="Both" displayName="$(string.GoToIntranetSiteForSingleWordEntryInAddressBar)" explainText="$(string.GoToIntranetSiteForSingleWordEntryInAddressBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="GoToIntranetSiteForSingleWordEntryInAddressBar">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF104"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="AppUpdatePin" class="Both" displayName="$(string.AppUpdatePin)" explainText="$(string.AppUpdatePin_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.String)">
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_FF102" />
+      <elements>
+        <text id="String" valueName="AppUpdatePin" required="true" />
+      </elements>
+    </policy>
+    <policy name="DisableThirdPartyModuleBlocking" class="Both" displayName="$(string.DisableThirdPartyModuleBlocking)" explainText="$(string.DisableThirdPartyModuleBlocking_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableThirdPartyModuleBlocking">
+      <parentCategory ref="firefox" />
+      <supportedOn ref="SUPPORTED_FF110"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="ContainersOneLine" class="Both" displayName="$(string.ContainersOneLine)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Containers_Explain)" presentation="$(presentation.JSONOneLine)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF113"/>
+      <elements>
+        <text id="JSONOneLine" valueName="Containers" maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="Containers" class="Both" displayName="$(string.Containers)" key="Software\Policies\Mozilla\Firefox" explainText="$(string.Containers_Explain)" presentation="$(presentation.JSON)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF113"/>
+      <elements>
+        <multiText id="JSON" valueName="Containers"  maxLength="16384"/>
+      </elements>
+    </policy>
+    <policy name="SecurityDevices_Add" class="Both" displayName="$(string.SecurityDevices_Add)" explainText="$(string.SecurityDevices_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SecurityDevices)" >
+      <parentCategory ref="SecurityDevices"/>
+      <supportedOn ref="SUPPORTED_FF114"/>
+      <elements>
+        <list id="SecurityDevices" key="Software\Policies\Mozilla\Firefox\SecurityDevices\Add" valuePrefix="" explicitValue="true" expandable="true"/>
+      </elements>
+    </policy>
+    <policy name="SecurityDevices_Delete" class="Both" displayName="$(string.SecurityDevices_Delete)" explainText="$(string.SecurityDevices_Delete_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.SecurityDevices)" >
+      <parentCategory ref="SecurityDevices"/>
+      <supportedOn ref="SUPPORTED_FF114"/>
+      <elements>
+        <list id="SecurityDevices" key="Software\Policies\Mozilla\Firefox\SecurityDevices\Delete" valuePrefix=""/>
+      </elements>
+    </policy>

   </policies>
 </policyDefinitions>
   </policies>
 </policyDefinitions>