From f1ee660e8b90ec8ecdec468b600ec248198314c9 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 29 Aug 2023 12:40:38 -0400
Subject: [PATCH] Add JSON one line policies for compatibility with new
 Microsoft ADMX work

---
 windows/de-DE/firefox.adml | 14 +++++++++
 windows/en-US/firefox.adml | 14 +++++++++
 windows/es-ES/firefox.adml | 14 +++++++++
 windows/firefox.admx       | 63 ++++++++++++++++++++++++++++++++++++++
 windows/fr-FR/firefox.adml | 14 +++++++++
 windows/it-IT/firefox.adml | 14 +++++++++
 windows/ru-RU/firefox.adml | 14 +++++++++
 windows/zh-CN/firefox.adml | 14 +++++++++
 windows/zh-TW/firefox.adml | 14 +++++++++
 9 files changed, 175 insertions(+)
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 006fffe..102ba7a 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -330,6 +330,7 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werde
       <string id="ExtensionUpdate_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, werden Add-ons nicht automatisch aktualisiert.
 
 Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden Add-ons automatisch aktualisiert.</string>
+      <string id="ExtensionSettingsOneLine">Erweiterungen mit JSON verwalten (JSON on one line)</string>
       <string id="ExtensionSettings">Erweiterungen mit JSON verwalten</string>
       <string id="ExtensionSettings_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, werden die Einstellungen zu Erweiterungen mit einer JSON-Datei verwaltet.
 
@@ -607,6 +608,7 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werde
       <string id="WebsiteFilter_Exceptions_Explain">Wenn Sie die Richtlinieneinstellung aktivieren und der Webseiten-Filter aktiviert ist, kÃ¶nnen Sie Ãbereinstimmungsmuster fÃ¼r Webseiten angeben, die nicht blockiert werden sollen. Die Ãbereinstimmungsmuster sind unter https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns dokumentiert. Es gibt eine BeschrÃ¤nkung von 1000 EintrÃ¤gen.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, gibt es keine Ausnahmen fÃ¼r den Webseiten-Filter.</string>
+      <string id="WebsiteFilterOneLine">Webseiten-Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Webseiten-Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie blockierte Webseiten und Ausnahmen Ã¼ber JSON angeben.
 
@@ -903,6 +905,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, kÃ¶nn
 Wenn diese Richtlinieneinstellung deaktiviert ist, ist das Setzen eines Masterpasswortes nicht mÃ¶glich.
 
 Wenn diese Richtlinieneinstellung nicht konfiguriert ist, kÃ¶nnen Nutzer ein Masterpasswort setzen, dies ist aber nicht erforderlich.</string>
+      <string id="HandlersOneLine">Handlers (JSON on one line)</string>
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie das Anwendungsverhalten (beim Anklicken eines Links oder beim Download) mittels JSON beschreiben.
 
@@ -910,6 +913,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde
 
 FÃ¼r eine Beschreibung der Einstellung, siehe:
 https://github.com/mozilla/policy-templates/blob/master/README.md#handlers (Englisch)</string>
+      <string id="PreferencesOneLine">Einstellungen (JSON on one line)</string>
       <string id="Preferences">Einstellungen</string>
       <string id="Preferences_Explain">Hinweis: Um diese Richtlinieneinstellungen nutzen zu kÃ¶nnen, mÃ¼ssen Sie zunÃ¤chst alle Einstellungen im Abschnitt Einstellungen (Veraltet) lÃ¶schen.
 
@@ -919,6 +923,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde
 
 FÃ¼r eine Beschreibung der Einstellung, siehe:
 https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (Englisch)</string>
+      <string id="BookmarksOneLine">Lesezeichen (JSON on one line)</string>
       <string id="Bookmarks">Lesezeichen (JSON)</string>
       <string id="Bookmarks_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie Lesezeichen mit JSON konfigurieren. Mit [] kÃ¶nnen Sie alle Lesezeichen lÃ¶schen.
 
@@ -930,6 +935,7 @@ Diese Richtlinieneinstellung wirkt sich nicht auf verwaltete Lesezeichen aus.
 
 FÃ¼r Informationen Ã¼ber die JSON-Struktur, siehe:
 https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks (Englisch)</string>
+      <string id="ManagedBookmarksOneLine">Verwaltete Lesezeichen (JSON on one line)</string>
       <string id="ManagedBookmarks">Verwaltete Lesezeichen</string>
       <string id="ManagedBookmarks_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie verwaltete Lesezeichen mit Hilfe einer JSON-Datei konfigurieren.
 
@@ -945,6 +951,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, kÃ¶nn
       <string id="BackgroundAppUpdate_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird die Anwendung keine Updates im Hintergrund installieren, wenn sie geschlossen ist.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, kÃ¶nnen Updates ohne Genehmigung durch den Anwender im Hintergrund installiert werden, selbst wenn die Anwendung nicht gestartet ist. Das Betriebssystem kann jedoch den Anwender um Genehmigung fragen.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Externe Protokolle automatisch ausfÃ¼hren (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Externe Protokolle automatisch ausfÃ¼hren</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">Wenn diese Richtlinieneinstellung aktiviert, kÃ¶nnen Sie eine Liste von externen Protokollen definieren, die bei bestimmten URLs ohne Nachfrage beim Benutzer automatisch ausgefÃ¼hrt werden.
 
@@ -960,6 +967,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, mÃ¼ss
       <string id="UseSystemPrintDialog_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, verwendet Firefox den Druckdialog des Betriebssystems, anstatt vorher eine Druckvorschau anzuzeigen.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, zeigt Firefox vor dem Drucken eine Druckvorschau an.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Deaktivieren von Warnungen auf der Grundlage von Dateierweiterungen fÃ¼r bestimmte Dateitypen in DomÃ¤nen (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Deaktivieren von Warnungen auf der Grundlage von Dateierweiterungen fÃ¼r bestimmte Dateitypen in DomÃ¤nen</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie eine Liste von DomÃ¤nen und Dateierweiterungen definieren, die von Warnungen ausgenommen sind.
 
@@ -1022,6 +1030,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird
       <string id="DisableThirdPartyModuleBlocking_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, dÃ¼rfen Benutzer keine Module von Drittanbietern auf der Seite about:third-party blockieren.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, dÃ¼rfen Benutzer Module von Drittanbietern auf der Seite about:third-party blockieren.</string>
+      <string id="ContainersOneLine">Container (JSON on one line)</string>
       <string id="Containers">Container</string>
       <string id="Containers_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, kÃ¶nnen Sie JSON verwenden, um die Standardcontainer zu konfigurieren.
 
@@ -1352,6 +1361,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index e035553..b7e4152 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -336,6 +336,7 @@ If this policy is enabled or not configured, extensions will be updated automati
 If this policy is disabled or not configured, extensions will not be managed.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
+      <string id="ExtensionSettingsOneLine">Extension Management (JSON on one line)</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration is disabled and cannot be enabled.
 
@@ -607,6 +608,7 @@ If this policy is disabled or not configured, no websites are blocked.</string>
       <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. There is a 1000 entry limit.
 
 If this policy is disabled or not configured, there are no exceptions to the website filter.</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -903,12 +905,14 @@ If this policy is disabled or not configured,Picture-in-Picture settings can be
 If this policy is disabled, users cannot create a primary password.
 
 If this policy is not configured, users can choose to create a primary password.</string>
+      <string id="HandlersOneLine">Handlers (JSON on one line)</string>
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="PreferencesOneLine">Preferences (JSON on one line)</string>
       <string id="Preferences">Preferences</string>
       <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
 
@@ -917,6 +921,7 @@ If this policy is enabled, you can use JSON to configure preferences.
 If this policy is disabled or not configured, preferences are not modified.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="BookmarksOneLine">Bookmarks (JSON on one line)</string>
       <string id="Bookmarks">Bookmarks (JSON)</string>
       <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
 
@@ -927,6 +932,7 @@ If this policy is enabled along with individual bookmarks, those bookmarks will
 This policy has no effect on Managed Bookmarks.
 
 For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">Managed Bookmarks (JSON on one line)</string>
       <string id="ManagedBookmarks">Managed Bookmarks</string>
       <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
 
@@ -941,6 +947,7 @@ If this policy is disabled or not configured, users can access any account on Go
       <string id="BackgroundAppUpdate_Explain">If this policy disabled, the application will not try to install updates when the application is not running.
 
 If this policy is enabled or not configured, application updates may be installed (without user approval) in the background, even when the application is not running. The operating system might still require approval.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Auto Launch Protocols From Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Auto Launch Protocols From Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">If this policy is enabled, you can define a list of external protocols that can be used from listed origins without prompting the user.
 
@@ -955,6 +962,7 @@ If this policy is disabled or not configured, credentials must be entered manual
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1017,6 +1025,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1350,6 +1359,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 3908e83..4877c44 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -330,6 +330,7 @@ Si esta polÃ­tica estÃ¡ deshabilitada o no estÃ¡ configurada, no se bloquearÃ¡n
       <string id="ExtensionUpdate_Explain">Si esta polÃ­tica estÃ¡ deshabilitada, las extensiones no se actualizarÃ¡n automÃ¡ticamente.
 
 Si esta polÃ­tica estÃ¡ habilitada o no estÃ¡ configurada, las extensiones se actualizarÃ¡n automÃ¡ticamente.</string>
+      <string id="ExtensionSettingsOneLine">GestiÃ³n de extensiones (JSON on one line)</string>
       <string id="ExtensionSettings">GestiÃ³n de extensiones</string>
       <string id="ExtensionSettings_Explain">Si esta polÃ­tica estÃ¡ habilitada, podrÃ¡ utilizar JSON para describir la polÃ­tica de gestiÃ³n de extensiones.
 
@@ -609,6 +610,7 @@ Si esta polÃ­tica estÃ¡ deshabilitada o no estÃ¡ configurada, no se bloquearÃ¡n
       <string id="WebsiteFilter_Exceptions_Explain">Si esta polÃ­tica estÃ¡ habilitada y el filtro del sitio web estÃ¡ habilitado, podrÃ¡ especificar patrones de coincidencia para los sitios que no desea bloquear. Los patrones de coincidencia estÃ¡n documentados en https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Hay un lÃ­mite de 1000 entradas.
 
 Si esta polÃ­tica estÃ¡ deshabilitada o no estÃ¡ configurada, no hay excepciones para el filtro de sitios web.</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -905,12 +907,14 @@ If this policy is disabled or not configured,Picture-in-Picture settings can be
 If this policy is disabled, users cannot create a primary password.
 
 If this policy is not configured, users can choose to create a primary password.</string>
+      <string id="HandlersOneLine">Handlers (JSON on one line)</string>
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="PreferencesOneLine">Preferencias (JSON on one line)</string>
       <string id="Preferences">Preferencias</string>
       <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
 
@@ -919,6 +923,7 @@ If this policy is enabled, you can use JSON to configure preferences.
 If this policy is disabled or not configured, preferences are not modified.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="BookmarksOneLine">Bookmarks (JSON on one line)</string>
       <string id="Bookmarks">Bookmarks (JSON)</string>
       <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
 
@@ -929,6 +934,7 @@ If this policy is enabled along with individual bookmarks, those bookmarks will
 This policy has no effect on Managed Bookmarks.
 
 For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">Managed Bookmarks (JSON on one line)</string>
       <string id="ManagedBookmarks">Managed Bookmarks</string>
       <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
 
@@ -943,6 +949,7 @@ If this policy is disabled or not configured, users can access any account on Go
       <string id="BackgroundAppUpdate_Explain">If this policy disabled, the application will not try to install updates when the application is not running.
 
 If this policy is enabled or not configured, application updates may be installed (without user approval) in the background, even when the application is not running. The operating system might still require approval.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Auto Launch Protocols From Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Auto Launch Protocols From Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">If this policy is enabled, you can define a list of external protocols that can be used from listed origins without prompting the user.
 
@@ -957,6 +964,7 @@ If this policy is disabled or not configured, credentials must be entered manual
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1019,6 +1027,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1352,6 +1361,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index e9d2eb8..f015ce2 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1050,6 +1050,13 @@
         <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"/>
@@ -1408,6 +1415,13 @@
         <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"/>
@@ -2696,6 +2710,13 @@
         <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"/>
@@ -3896,6 +3917,13 @@
         <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"/>
@@ -3903,6 +3931,13 @@
         <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"/>
@@ -3910,6 +3945,13 @@
         <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"/>
@@ -3934,6 +3976,13 @@
         <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"/>
@@ -3961,6 +4010,13 @@
         <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"/>
@@ -4005,6 +4061,13 @@
         <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"/>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 08f0809..16944c3 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -330,6 +330,7 @@ Si cette stratÃ©gie est dÃ©sactivÃ©e ou non configurÃ©e, aucune extension n'est
       <string id="ExtensionUpdate_Explain">Si cette stratÃ©gie est dÃ©sactivÃ©e, les extensions ne seront pas mise Ã  jour automatiquement.
 
 Si cette stratÃ©gie est activÃ©e ou non configurÃ©e, les extensions seront mise Ã  jour automatiquement.</string>
+      <string id="ExtensionSettingsOneLine">Gestion des extensions (JSON on one line)</string>
       <string id="ExtensionSettings">Gestion des extensions</string>
       <string id="ExtensionSettings_Explain">Si cette stratÃ©gie est activÃ©e, vous pouvez utiliser JSON pour dÃ©finir la stratÃ©gie de gestion des extensions.
 
@@ -608,6 +609,7 @@ Si cette stratÃ©gie est dÃ©sactivÃ©e ou non configurÃ©e, aucun site Web n'est bl
       <string id="WebsiteFilter_Exceptions_Explain">Si cette stratÃ©gie est activÃ©e et que le filtre de site Web est activÃ©, vous pouvez spÃ©cifier des modÃ¨les de correspondance pour les sites que vous ne souhaitez pas bloquer. Les modÃ¨les de correspondance sont documentÃ©s sur https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Il y a une limite de 1000 entrÃ©es.
 
 Si cette stratÃ©gie est dÃ©sactivÃ©e ou non configurÃ©e, il n'y a pas d'exception au filtre de site Web..</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -904,12 +906,14 @@ If this policy is disabled or not configured,Picture-in-Picture settings can be
 If this policy is disabled, users cannot create a primary password.
 
 If this policy is not configured, users can choose to create a primary password.</string>
+      <string id="HandlersOneLine">Handlers (JSON on one line)</string>
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="PreferencesOneLine">PrÃ©fÃ©rences (JSON on one line)</string>
       <string id="Preferences">PrÃ©fÃ©rences</string>
       <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
 
@@ -918,6 +922,7 @@ If this policy is enabled, you can use JSON to configure preferences.
 If this policy is disabled or not configured, preferences are not modified.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="BookmarksOneLine">Bookmarks (JSON on one line)</string>
       <string id="Bookmarks">Bookmarks (JSON)</string>
       <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
 
@@ -928,6 +933,7 @@ If this policy is enabled along with individual bookmarks, those bookmarks will
 This policy has no effect on Managed Bookmarks.
 
 For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">Managed Bookmarks (JSON on one line)</string>
       <string id="ManagedBookmarks">Managed Bookmarks</string>
       <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
 
@@ -942,6 +948,7 @@ If this policy is disabled or not configured, users can access any account on Go
       <string id="BackgroundAppUpdate_Explain">If this policy disabled, the application will not try to install updates when the application is not running.
 
 If this policy is enabled or not configured, application updates may be installed (without user approval) in the background, even when the application is not running. The operating system might still require approval.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Auto Launch Protocols From Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Auto Launch Protocols From Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">If this policy is enabled, you can define a list of external protocols that can be used from listed origins without prompting the user.
 
@@ -956,6 +963,7 @@ If this policy is disabled or not configured, credentials must be entered manual
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1018,6 +1026,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1351,6 +1360,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 0d475eb..546f8c1 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -330,6 +330,7 @@ Se questo criterio Ã¨ disabilitato o non configurato, non sarÃ  bloccata nessuna
       <string id="ExtensionUpdate_Explain">Se questo criterio Ã¨ disabilitato, le estensioni non saranno aggiornate automaticamente.
 
 Se questo criterio Ã¨ abilitato o non configurato, le estensioni saranno aggiornate automaticamente.</string>
+      <string id="ExtensionSettingsOneLine">Gestione estensioni (JSON on one line)</string>
       <string id="ExtensionSettings">Gestione estensioni</string>
       <string id="ExtensionSettings_Explain">Se questo criterio Ã¨ abilitato, Ã¨ possibile utilizzare JSON per descrivere la politica di gestione delle estensioni.
 
@@ -609,6 +610,7 @@ Se questo criterio Ã¨ disabilitato o non configurato, non sarÃ  bloccato nessun
       <string id="WebsiteFilter_Exceptions_Explain">Se questo criterio Ã¨ abilitato e il sito filtri Web Ã¨ abilitato, Ã¨ possibile utilizzare dei pattern per specificare i siti da non bloccare. I pattern sono documentati alla pagina https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. C'Ã¨ un limite di 1000 voci.
 
 Se questo criterio Ã¨ disabilitato o non configurato, non ci sono eccezioni al sito filtri Web.</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -906,12 +908,14 @@ Se questo criterio Ã¨ disabilitato o non configurato, le impostazioni Picture-in
 Se questo criterio Ã¨ disabilitato, gli utenti non possono creare una password principale.
 
 Se questo criterio Ã¨ non configurato, gli utenti possono scegliere di creare una password principale.</string>
+      <string id="HandlersOneLine">Gestori (JSON on one line)</string>
       <string id="Handlers">Gestori</string>
       <string id="Handlers_Explain">Se questo criterio Ã¨ abilitato, Ã¨ possibile utilizzare JSON per configurare i gestori applicazione predefiniti.
 
 Se questo criterio Ã¨ disabilitato o non configurato, vengono utilizzati i criteri predefiniti di Firefox.
 
 Per informazioni dettagliate sulla creazione del criterio, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="PreferencesOneLine">Preferenze (JSON on one line)</string>
       <string id="Preferences">Preferenze</string>
       <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
 
@@ -920,6 +924,7 @@ If this policy is enabled, you can use JSON to configure preferences.
 If this policy is disabled or not configured, preferences are not modified.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="BookmarksOneLine">Bookmarks (JSON on one line)</string>
       <string id="Bookmarks">Bookmarks (JSON)</string>
       <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
 
@@ -930,6 +935,7 @@ If this policy is enabled along with individual bookmarks, those bookmarks will
 This policy has no effect on Managed Bookmarks.
 
 For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">Managed Bookmarks (JSON on one line)</string>
       <string id="ManagedBookmarks">Managed Bookmarks</string>
       <string id="ManagedBookmarks_Explain">If this policy is enabled, you can use JSON to configure managed bookmarks.
 
@@ -944,6 +950,7 @@ If this policy is disabled or not configured, users can access any account on Go
       <string id="BackgroundAppUpdate_Explain">If this policy disabled, the application will not try to install updates when the application is not running.
 
 If this policy is enabled or not configured, application updates may be installed (without user approval) in the background, even when the application is not running. The operating system might still require approval.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Auto Launch Protocols From Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Auto Launch Protocols From Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">If this policy is enabled, you can define a list of external protocols that can be used from listed origins without prompting the user.
 
@@ -958,6 +965,7 @@ If this policy is disabled or not configured, credentials must be entered manual
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1020,6 +1028,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1353,6 +1362,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 6b6fc11..93d66ac 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -330,6 +330,7 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
       <string id="ExtensionUpdate_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð°, ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ Ð½Ðµ Ð±ÑÐ´ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ Ð±ÑÐ´ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÑÑÑÑÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸.</string>
+      <string id="ExtensionSettingsOneLine">Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÑÐ¼Ð¸ (JSON on one line)</string>
       <string id="ExtensionSettings">Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÑÐ¼Ð¸</string>
       <string id="ExtensionSettings_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ JSON Ð´Ð»Ñ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ñ Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸ÑÐ¼Ð¸.
 
@@ -609,6 +610,7 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
        <string id="WebsiteFilter_Exceptions_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð° Ð¸ ÑÐ¸Ð»ÑÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¾Ð² Ð²ÐºÐ»ÑÑÐµÐ½, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐºÐ°Ð·Ð°ÑÑ ÑÐ°Ð±Ð»Ð¾Ð½Ñ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ñ Ð´Ð»Ñ ÑÐ°Ð¹ÑÐ¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ ÑÐ¾ÑÐ¸ÑÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ. Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ ÑÐ¾Ð¾ÑÐ²ÐµÑÑÑÐ²Ð¸Ñ Ð·Ð°Ð´Ð¾ÐºÑÐ¼ÐµÐ½ÑÐ¸ÑÐ¾Ð²Ð°Ð½Ñ Ð½Ð° https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. ÐÐ³ÑÐ°Ð½Ð¸ÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð²Ð²Ð¾Ð´ â 1000.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Ð´Ð»Ñ ÑÐ¸Ð»ÑÑÑÐ° Ð²ÐµÐ±-ÑÐ°Ð¹ÑÐ¾Ð² Ð½ÐµÑ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¸Ð¹.</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -905,12 +907,14 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð°, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸ Ð¼Ð¾Ð³ÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ.</string>
+      <string id="HandlersOneLine">ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¸ (JSON on one line)</string>
       <string id="Handlers">ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¸</string>
       <string id="Handlers_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ JSON Ð´Ð»Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÐ¾Ð² Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑÑÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Firefox Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ.
 
 ÐÐ»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ¸ ÑÐ¼. https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="PreferencesOneLine">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ (JSON on one line)</string>
       <string id="Preferences">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸</string>
       <string id="Preferences_Explain">ÐÑÐ¸Ð¼ÐµÑÐ°Ð½Ð¸Ðµ. Ð§ÑÐ¾Ð±Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÑÑ Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÑ, Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾ Ð¾ÑÐ¸ÑÑÐ¸ÑÑ Ð²ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð² ÑÑÐ°ÑÐ¾Ð¼ ÑÐ°Ð·Ð´ÐµÐ»Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐº (ÑÑÑÐ°ÑÐµÐ»Ð¾).
 
@@ -919,6 +923,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Ð¿ÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½ÑÑÑÑÑ.
 
 ÐÐ»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ð¸ Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ¸ ÑÐ¼. Https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="BookmarksOneLine">ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸ (JSON on one line)</string>
       <string id="Bookmarks">ÐÐ°ÐºÐ»Ð°Ð´ÐºÐ¸ (JSON)</string>
       <string id="Bookmarks_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ JSON Ð´Ð»Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº, Ð² ÑÐ¾Ð¼ ÑÐ¸ÑÐ»Ðµ [] Ð´Ð»Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð²ÑÐµÑ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº.
 
@@ -929,6 +934,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 Ð­ÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð½Ðµ Ð²Ð»Ð¸ÑÐµÑ Ð½Ð° ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐµ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸.
 
 ÐÐ»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸ Ð¾ JSON ÑÐ¼. https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">Ð£Ð¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐµ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸ (JSON on one line)</string>
       <string id="ManagedBookmarks">Ð£Ð¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÐµ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ¸</string>
       <string id="ManagedBookmarks_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ JSON Ð´Ð»Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¿ÑÐ°Ð²Ð»ÑÐµÐ¼ÑÑ Ð·Ð°ÐºÐ»Ð°Ð´Ð¾Ðº.
 
@@ -943,6 +949,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
       <string id="BackgroundAppUpdate_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð°, Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð±ÑÐ´ÐµÑ Ð¿ÑÑÐ°ÑÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, ÐºÐ¾Ð³Ð´Ð° Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ (Ð±ÐµÐ· Ð¾Ð´Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ) Ð² ÑÐ¾Ð½Ð¾Ð²Ð¾Ð¼ ÑÐµÐ¶Ð¸Ð¼Ðµ, Ð´Ð°Ð¶Ðµ ÐµÑÐ»Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð·Ð°Ð¿ÑÑÐµÐ½Ð¾. ÐÐ¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð°Ñ ÑÐ¸ÑÑÐµÐ¼Ð° Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾-Ð¿ÑÐµÐ¶Ð½ÐµÐ¼Ñ ÑÑÐµÐ±Ð¾Ð²Ð°ÑÑ Ð¾Ð´Ð¾Ð±ÑÐµÐ½Ð¸Ñ.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">ÐÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ Ð°Ð²ÑÐ¾Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ñ Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">ÐÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ñ Ð°Ð²ÑÐ¾Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ñ Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²Ð½ÐµÑÐ½Ð¸Ñ Ð¿ÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð¾Ð², ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð¸Ð· Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½Ð½ÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ¾Ð² Ð±ÐµÐ· Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ.
 
@@ -957,6 +964,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
       <string id="UseSystemPrintDialog_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Firefox Ð±ÑÐ´ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐ¹ Ð´Ð¸Ð°Ð»Ð¾Ð³ Ð¿ÐµÑÐ°ÑÐ¸ Ð²Ð¼ÐµÑÑÐ¾ Ð¿ÑÐµÐ´Ð²Ð°ÑÐ¸ÑÐµÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ° Ð¿ÐµÑÐµÐ´ Ð¿ÐµÑÐ°ÑÑÑ.
 
 ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð° Ð¸Ð»Ð¸ Ð½Ðµ Ð½Ð°ÑÑÑÐ¾ÐµÐ½Ð°, Firefox Ð±ÑÐ´ÐµÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿ÑÐµÐ´Ð²Ð°ÑÐ¸ÑÐµÐ»ÑÐ½ÑÐ¹ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ Ð¿ÐµÑÐµÐ´ Ð¿ÐµÑÐ°ÑÑÑ.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÑ ÑÐ¸Ð¿Ð¾Ð² ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Ð´Ð¾Ð¼ÐµÐ½Ð°Ñ (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">ÐÑÐºÐ»ÑÑÐ¸ÑÑ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ðµ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÑ ÑÐ¸Ð¿Ð¾Ð² ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Ð´Ð¾Ð¼ÐµÐ½Ð°Ñ</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">ÐÑÐ»Ð¸ ÑÑÐ° Ð¿Ð¾Ð»Ð¸ÑÐ¸ÐºÐ° Ð²ÐºÐ»ÑÑÐµÐ½Ð°, Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»Ð¸ÑÑ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð² Ð¸ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ð¹ ÑÐ¸Ð¿Ð¾Ð² ÑÐ°Ð¹Ð»Ð¾Ð², Ð½Ð° ÐºÐ¾ÑÐ¾ÑÑÐµ Ð½Ðµ Ð±ÑÐ´ÑÑ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÑÑ Ð¿ÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ð± Ð¸ÑÐ¿Ð¾Ð»Ð½ÑÐµÐ¼ÑÑ ÑÐ°Ð¹Ð»Ð°Ñ.
 
@@ -1019,6 +1027,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1352,6 +1361,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 1c52320..dea2950 100644
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -330,6 +330,7 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
       <string id="ExtensionUpdate_Explain">è¥ç¦ç¨æ­¤ååï¼å°ä¸ä¼èªå¨æ´æ°æ©åå¥ä»¶ã
 
 è¥å¯ç¨æä¸è®¾å®æ­¤ååï¼å°èªå¨æ´æ°æ©åå¥ä»¶ã </string>
+      <string id="ExtensionSettingsOneLine">æ©å±å¥ä»¶ç®¡ç (JSON on one line)</string>
       <string id="ExtensionSettings">æ©å±å¥ä»¶ç®¡ç</string>
       <string id="ExtensionSettings_Explain">è¥å¯ç¨æ­¤ååï¼æ¨å¯ä»¥ç¨ JSON æä»¶æ¥æè¿°æ©å±å¥ä»¶ç®¡çç­ç¥ã
 
@@ -609,6 +610,7 @@ If this policy is not configured or disabled, in private browsing, cookies are r
       <string id="WebsiteFilter_Exceptions_Explain">è¥å¯ç¨æ­¤ååï¼ä¸å¯ç¨äºç½ç«å°éè§åï¼å°å¯ä»¥æå®è¦æé¤å°éçç½ç«ç½åè§åã è§åæ ¼å¼æä»¶ä½äºhttps://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patternsã ä»æ¯ææå¤1000ç¬é¡¹ç®ã
 
 è¥ç¦ç¨æä¸è®¾å®æ­¤ååï¼åä¸ä¼æ¾è¡ä»»ä½ä¾å¤ç½ç«ã</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -905,12 +907,14 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 è¥ç¦ç¨æ­¤ååï¼ç¨æ·å°æ æ³å»ºç«ä¸»æ§å¯ç ã
 
 è¥ä¸è®¾å®æ­¤ååï¼åä½¿ç¨èå¯èªè¡å³å®æ¯å¦è¦ä½¿ç¨ä¸»æ§å¯ç åè½ã</string>
+      <string id="HandlersOneLine">åºç¨ç¨åºå¤çæ¹å¼ (JSON on one line)</string>
       <string id="Handlers">åºç¨ç¨åºå¤çæ¹å¼</string>
       <string id="Handlers_Explain">è¥å¯ç¨æ­¤ååï¼æ¨å¯ä»¥ä½¿ç¨ JSON æä»¶æ¥è®¾å®é»è®¤åºç¨ç¨åºå¤çæ¹å¼ã
 
 è¥ç¦ç¨æä¸è®¾å®æ­¤ååï¼åä½¿ç¨ Firefox é»è®¤è®¾ç½®ã
 
 è¥éè¦å»ºç«ååçè¯¦ç»ä¿¡æ¯ï¼è¯·åè https://github.com/mozilla/policy-templates/blob/master/README.md#handlersã</string>
+      <string id="PreferencesOneLine">åå¥½è®¾å® (JSON on one line)</string>
       <string id="Preferences">åå¥½è®¾å®</string>
       <string id="Preferences_Explain">æ³¨ï¼è¥è¦ä½¿ç¨æ­¤ååï¼æ¨å¿é¡»åæ¸é¤ãåå¥½è®¾å®ï¼å·²å¼ç¨ï¼ãåºæ®µå½ä¸­çæ§è®¾å®ã
 
@@ -919,6 +923,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 è¥ç¦ç¨æä¸è®¾å®æ­¤ååï¼åä¸ä¿®æ¹åå¥½è®¾å®ã
 
 è¥éè¦å»ºç«ååçè¯¦ç»ä¿¡æ¯ï¼è¯·åè https://github.com/mozilla/policy-templates/blob/master/README.md#preferencesã</string>
+      <string id="BookmarksOneLine">Bookmarks (JSON on one line)</string>
       <string id="Bookmarks">Bookmarks (JSON)</string>
       <string id="Bookmarks_Explain">If this policy is enabled, you can use JSON to configure bookmarks, including [] to clear all bookmarks.
 
@@ -929,6 +934,7 @@ If this policy is enabled along with individual bookmarks, those bookmarks will
 This policy has no effect on Managed Bookmarks.
 
 For detailed information on the JSON, see https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarks.</string>
+      <string id="ManagedBookmarksOneLine">åç®¡ççä¹¦ç­¾ (JSON on one line)</string>
       <string id="ManagedBookmarks">åç®¡ççä¹¦ç­¾</string>
       <string id="ManagedBookmarks_Explain">è¥å¯ç¨æ­¤ååï¼æ¨å¯ä»¥ä½¿ç¨ JSON æä»¶æ¥æå®åç®¡ççä¹¦ç­¾ã
 
@@ -943,6 +949,7 @@ If this policy is disabled or not configured, users can access any account on Go
       <string id="BackgroundAppUpdate_Explain">If this policy disabled, the application will not try to install updates when the application is not running.
 
 If this policy is enabled or not configured, application updates may be installed (without user approval) in the background, even when the application is not running. The operating system might still require approval.</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">Auto Launch Protocols From Origins (JSON on one line)</string>
       <string id="AutoLaunchProtocolsFromOrigins">Auto Launch Protocols From Origins</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">If this policy is enabled, you can define a list of external protocols that can be used from listed origins without prompting the user.
 
@@ -957,6 +964,7 @@ If this policy is disabled or not configured, credentials must be entered manual
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1019,6 +1027,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1352,6 +1361,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferencesã
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 2867049..a56fc8c 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -330,6 +330,7 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
       <string id="ExtensionUpdate_Explain">è¥åç¨æ­¤ååï¼å°ä¸æèªåæ´æ°æ´åå¥ä»¶ã
 
 è¥åç¨æä¸è¨­å®æ­¤ååï¼å°èªåæ´æ°æ´åå¥ä»¶ã</string>
+      <string id="ExtensionSettingsOneLine">æ´åå¥ä»¶ç®¡çï¼JSON on one lineï¼</string>
       <string id="ExtensionSettings">æ´åå¥ä»¶ç®¡ç</string>
       <string id="ExtensionSettings_Explain">è¥åç¨æ­¤ååï¼æ¨å¯ä»¥ç¨ JSON æªæ¡ä¾æè¿°æ´åå¥ä»¶ç®¡çååã
 
@@ -607,6 +608,7 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
       <string id="WebsiteFilter_Exceptions_Explain">è¥åç¨æ­¤ååï¼ä¸åç¨äºç¶²ç«å°éè¦åï¼å°å¯ä»¥æå®è¦æé¤å°éçç¶²ç«ç¶²åè¦åãè¦åæ ¼å¼æä»¶ä½æ¼ https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patternsãåæ¯æ´æå¤ 1000 ç­é ç®ã
 
 è¥åç¨æä¸è¨­å®æ­¤ååï¼åä¸ææ¾è¡ä»»ä½ä¾å¤ç¶²ç«ã</string>
+      <string id="WebsiteFilterOneLine">Website Filter (JSON on one line)</string>
       <string id="WebsiteFilter">Website Filter (JSON)</string>
       <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
 
@@ -903,12 +905,14 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 è¥åç¨æ­¤ååï¼ä½¿ç¨èå°ç¡æ³å»ºç«ä¸»æ§å¯ç¢¼ã
 
 è¥ä¸è¨­å®æ­¤ååï¼åä½¿ç¨èå¯èªè¡æ±ºå®æ¯å¦è¦ä½¿ç¨ä¸»æ§å¯ç¢¼åè½ã</string>
+      <string id="HandlersOneLine">æç¨ç¨å¼èçæ¹å¼ï¼JSON on one lineï¼</string>
       <string id="Handlers">æç¨ç¨å¼èçæ¹å¼</string>
       <string id="Handlers_Explain">è¥åç¨æ­¤ååï¼æ¨å¯ä»¥ä½¿ç¨ JSON æªæ¡ä¾è¨­å®é è¨­æç¨ç¨å¼èçæ¹å¼ã
 
 è¥åç¨æä¸è¨­å®æ­¤ååï¼åä½¿ç¨ Firefox é è¨­è¨­å®ã
 
 è¥éè¦å»ºç«ååçè©³ç´°è³è¨ï¼è«åè https://github.com/mozilla/policy-templates/blob/master/README.md#handlersã</string>
+      <string id="PreferencesOneLine">åå¥½è¨­å®ï¼JSON on one lineï¼</string>
       <string id="Preferences">åå¥½è¨­å®</string>
       <string id="Preferences_Explain">è¨»ï¼è¥è¦ä½¿ç¨æ­¤ååï¼æ¨å¿é åæ¸é¤ãåå¥½è¨­å®ï¼å·²æ£ç¨ï¼ãåæ®µç¶ä¸­çèè¨­å®ã
 
@@ -917,6 +921,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 è¥åç¨æä¸è¨­å®æ­¤ååï¼åä¸ä¿®æ¹åå¥½è¨­å®ã
 
 è¥éè¦å»ºç«ååçè©³ç´°è³è¨ï¼è«åè https://github.com/mozilla/policy-templates/blob/master/README.md#preferencesã</string>
+      <string id="BookmarksOneLine">æ¸ç±¤ï¼JSON on one lineï¼</string>
       <string id="Bookmarks">æ¸ç±¤ï¼JSONï¼</string>
       <string id="Bookmarks_Explain">è¥åç¨æ­¤ååï¼æ¨å¯ä»¥ä½¿ç¨ JSON å­ä¸²ä¾è¨­å®æ¸ç±¤ï¼ä¹å¯ä»¥ä½¿ç¨ [] ä¾æ¸é¤æææ¸ç±¤ã
 
@@ -927,6 +932,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
 æ­¤ååä¸æå½±é¿ãåç®¡ççæ¸ç±¤ãååå§å®¹ã
 
 è¥éè¦ JSON æ¸ç±¤ååçè©³ç´°è³è¨ï¼è«åè https://github.com/mozilla/policy-templates/blob/master/README.md#bookmarksã</string>
+      <string id="ManagedBookmarksOneLine">åç®¡ççæ¸ç±¤ï¼JSON on one lineï¼</string>
       <string id="ManagedBookmarks">åç®¡ççæ¸ç±¤</string>
       <string id="ManagedBookmarks_Explain">è¥åç¨æ­¤ååï¼æ¨å¯ä»¥ä½¿ç¨ JSON æªæ¡ä¾æå®åç®¡ççæ¸ç±¤ã
 
@@ -941,6 +947,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
       <string id="BackgroundAppUpdate_Explain">è¥åç¨æ­¤ååï¼æç¨ç¨å¼å°ä¸æå¨æªå·è¡æåè©¦å®è£æ´æ°ã
 
 è¥åç¨æä¸è¨­å®æ­¤ååï¼æç¨ç¨å¼å°±ç®æªå·è¡ï¼ä¹å°ä¸ç¶éä½¿ç¨èåæï¼å°±å¨èæ¯å®è£æ´æ°ãä½æ¥­ç³»çµ±ä»å¯è½è¦æ±ä½¿ç¨èåææ­¤åä½ã</string>
+      <string id="AutoLaunchProtocolsFromOriginsOneLine">æ¼æå®ä¾æºç¶²åèªåååå¤é¨æç¨ç¨å¼ï¼JSON on one lineï¼</string>
       <string id="AutoLaunchProtocolsFromOrigins">æ¼æå®ä¾æºç¶²åèªåååå¤é¨æç¨ç¨å¼</string>
       <string id="AutoLaunchProtocolsFromOrigins_Explain">è¥åç¨æ­¤ååï¼å¯åèä¸çµå¤é¨éè¨åå®çæ¸å®èä¾æºç¶²åï¼å¯ä¸æç¤ºä½¿ç¨èå°±èªåååå¤é¨éè¨åå®ã
 
@@ -955,6 +962,7 @@ If this policy is enabled or not configured, user messaging preferences cannot b
       <string id="UseSystemPrintDialog_Explain">If this policy is enabled, Firefox will use the system print dialog instead of showing print preview before printing.
 
 If this policy is disabled or not configured, Firefox will show print preview before printing.</string>
+      <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine">Disable warnings based on file extension for specific file types on domains (JSON on one line)</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings">Disable warnings based on file extension for specific file types on domains</string>
       <string id="ExemptDomainFileTypePairsFromFileTypeDownloadWarnings_Explain">If this policy is enabled, you can define a list of domains and file type extensions that will be exempt from executable warnings.
 
@@ -1017,6 +1025,7 @@ If this policy is disabled or not configured, DNS is not proxied when using SOCK
       <string id="DisableThirdPartyModuleBlocking_Explain">If this policy is enabled, users are not allowed to block third-party modules from the about:third-party page.
 
 If this policy is disabled or not configured, users users are allowed to block third-party modules from the about:third-party page.</string>
+      <string id="ContainersOneLine">Containers (JSON on one line)</string>
       <string id="Containers">Containers</string>
       <string id="Containers_Explain">If this policy is enabled, you can use JSON to configure the default containers.
 
@@ -1350,6 +1359,11 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferencesã
       <presentation id="JSON">
         <multiTextBox refId="JSON"/>
       </presentation>
+      <presentation id="JSONOneLine">
+        <textBox refId="JSONOneLine">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy_ConnectionType">
         <dropdownList refId="Proxy_ConnectionType"/>
       </presentation>
-- 
2.34.1

