Add policy for JSON WebsiteFilter

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 79de82bb4861df51c3030e4e86c0aff7a0b907c8..f4e0b373c6b74f4fc33239a6fd2a835a7ce06ca8 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -606,6 +606,10 @@ 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="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="WebsiteFilter">Website Filter (JSON)</string>
+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Lesezeichen 01</string>
       <string id="Bookmark02">Lesezeichen 02</string>
       <string id="Bookmark03">Lesezeichen 03</string>
       <string id="Bookmark01">Lesezeichen 01</string>
       <string id="Bookmark02">Lesezeichen 02</string>
       <string id="Bookmark03">Lesezeichen 03</string>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 3a6e2372bc07dbfbd0f4308bab0d2105d92756dd..23ce3252d8c4c742c08250f2be6f9a752f6b46ad 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -606,6 +606,10 @@ 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="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="WebsiteFilter">Website Filter (JSON)</string>
+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Bookmark 01</string>
       <string id="Bookmark02">Bookmark 02</string>
       <string id="Bookmark03">Bookmark 03</string>
       <string id="Bookmark01">Bookmark 01</string>
       <string id="Bookmark02">Bookmark 02</string>
       <string id="Bookmark03">Bookmark 03</string>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index b81500ce4c365029535fb169f9406a6c73335434..c494d0d6dd9ea6874de4a7361685b64121299eef 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -608,6 +608,10 @@ 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="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="WebsiteFilter">Website Filter (JSON)</string>
+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Marcador 1</string>
       <string id="Bookmark02">Marcador 2</string>
       <string id="Bookmark03">Marcador 3</string>
       <string id="Bookmark01">Marcador 1</string>
       <string id="Bookmark02">Marcador 2</string>
       <string id="Bookmark03">Marcador 3</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 66843c1006e0460f1fc6606fa3077b8ee179444e..70911e7745c14f330c0abfa2f5930508628d959d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2776,6 +2776,13 @@
         <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="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" />

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index dccf06025cdb1297b10981659b43408248c5f92e..c215eac3ac42f70925b0873a54c23881041fea77 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -607,6 +607,10 @@ 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="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="WebsiteFilter">Website Filter (JSON)</string>
+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Signet 01</string>
       <string id="Bookmark02">Signet 02</string>
       <string id="Bookmark03">Signet 03</string>
       <string id="Bookmark01">Signet 01</string>
       <string id="Bookmark02">Signet 02</string>
       <string id="Bookmark03">Signet 03</string>

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index e0c48749a5da9fea6422d5ccf69511302a244375..5b0137dc4cd43ac891edc0d8578a6cf12b032ccf 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -608,6 +608,9 @@ 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="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="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Segnalibro 01</string>
       <string id="Bookmark02">Segnalibro 02</string>
       <string id="Bookmark03">Segnalibro 03</string>
       <string id="Bookmark01">Segnalibro 01</string>
       <string id="Bookmark02">Segnalibro 02</string>
       <string id="Bookmark03">Segnalibro 03</string>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 53f74044a4f19de5dc61875c075ef16923bd2436..a861b8f627b4d525291fcb696f089299be603dd8 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -608,6 +608,9 @@ 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="WebsiteFilter_Exceptions_Explain">Если эта политика включена и фильтр веб-сайтов включен, вы можете указать шаблоны соответствия для сайтов, которые не хотите блокировать. Шаблоны соответствия задокументированы на https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Ограничение на ввод — 1000.
 
 Если эта политика отключена или не настроена, для фильтра веб-сайтов нет исключений.</string>

+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">Закладка 01</string>
       <string id="Bookmark02">Закладка 02</string>
       <string id="Bookmark03">Закладка 03</string>
       <string id="Bookmark01">Закладка 01</string>
       <string id="Bookmark02">Закладка 02</string>
       <string id="Bookmark03">Закладка 03</string>

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 46667d054ae129e0d274d74721f0a9ac17c75b1b..0df64db867cbe1c084abbc523a240c2c527440c4 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -608,6 +608,9 @@ 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="WebsiteFilter_Exceptions_Explain">若启用此原则，且启用了网站封锁规则，将可以指定要排除封锁的网站网址规则。 规则格式文件位于https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns。 仅支持最多1000笔项目。
 
 若禁用或不设定此原则，则不会放行任何例外网站。</string>

+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">书签 01</string>
       <string id="Bookmark02">书签 02</string>
       <string id="Bookmark03">书签 03</string>
       <string id="Bookmark01">书签 01</string>
       <string id="Bookmark02">书签 02</string>
       <string id="Bookmark03">书签 03</string>

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index d8da2ddd0fb1a139089e3f92453530482a50b98c..b079ea75da87c3e764972d7cadf764bd9d29aa55 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -606,6 +606,9 @@ 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="WebsiteFilter_Exceptions_Explain">若啟用此原則，且啟用了網站封鎖規則，將可以指定要排除封鎖的網站網址規則。規則格式文件位於 https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns。僅支援最多 1000 筆項目。
 
 若停用或不設定此原則，則不會放行任何例外網站。</string>

+      <string id="WebsiteFilter_Explain">If this policy is enabled, you can specify blocked sites and exceptions via JSON.
+
+If this policy is disabled or not configured, websites are not filtered.</string>

       <string id="Bookmark01">書籤 01</string>
       <string id="Bookmark02">書籤 02</string>
       <string id="Bookmark03">書籤 03</string>
       <string id="Bookmark01">書籤 01</string>
       <string id="Bookmark02">書籤 02</string>
       <string id="Bookmark03">書籤 03</string>