From 72b89a381d3879f4e38d93d125b0b7525ac8086a Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Tue, 23 Nov 2021 20:23:06 +0100 Subject: [PATCH 01/16] The official name of the integrated PDF viewer is "PDF.js" See: https://mozilla.github.io/pdf.js/ https://github.com/mozilla/pdf.js --- windows/de-DE/firefox.adml | 4 ++-- windows/en-US/firefox.adml | 4 ++-- windows/es-ES/firefox.adml | 4 ++-- windows/fr-FR/firefox.adml | 4 ++-- windows/it-IT/firefox.adml | 4 ++-- windows/ru-RU/firefox.adml | 4 ++-- windows/zh-CN/firefox.adml | 4 ++-- windows/zh-TW/firefox.adml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 6201fa9..f4cda0e 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -69,7 +69,7 @@ Benutzer-Benachrichtigungen Disabled Ciphers DRM-Medien Erweiterungen - PDFjs + PDF.js Bild in Bild Erlaubte Seiten Erlaubte Seiten (Session Only) @@ -806,7 +806,7 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, werden Wenn diese Richtlinieneinstellung deaktiviert ist, können Nutzer Änderungen an der Einstellung zu DRM-Medien Erweiterungen vornehmen. Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, können Nutzer die Einstellung zu DRM-Medien Erweiterungen nicht ändern. - PDFjs (integrierter PDF-Betrachter) aktivieren + PDF.js (integrierter PDF-Betrachter) aktivieren Wenn diese Richtlinieneinstellung deaktiviert ist, wird der integrierte PDF-Betrachter nicht verwendet. Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird der integrierte PDF-Betrachter verwendet. diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 424ef15..852861f 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -69,7 +69,7 @@ User Messaging Disabled Ciphers Encrypted Media Extensions - PDFjs + PDF.js Picture-in-Picture Allowed Sites Allowed Sites (Session Only) @@ -808,7 +808,7 @@ If this policy is enabled or not configured, encrypted media extensions (like Wi If this policy is enabled and EncryptedMediaExtensions are disabled, Firefox will not download encrypted media extensions (like Widevine) or ask the user to install them. If this policy is not disabled or not configured, it has no effect. - Enable PDFjs + Enable PDF.js If this policy is disabled, the built-in PDF viewer is not used. If this policy is enabled or not configured, the built-in PDF viewer is used. diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 50013e4..7621b0b 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -69,7 +69,7 @@ Mensajería del usuario Cifrados deshabilitados Extensiones de medios cifrados - PDFjs + PDF.js Picture-in-Picture Sitios permitidos Sitios permitidos (Session Only) @@ -808,7 +808,7 @@ Si esta política está habilitada o no está configurada, Firefox descargará y Si esta política está habilitada y las extensiones de medios cifrados está deshabilitada, Firefox no descargará extensiones de medios cifrados (como Widevine) ni le pedirá al usuario que los instale. Si esta política no está deshabilitada o no está configurada, no tiene ningún efecto. - Habilitar PDFjs + Habilitar PDF.js Si esta política está deshabilitada, no se utilizará el visor de PDF incorporado. Si esta política está habilitada o no configurada, se utilizará el visor de PDF incorporado. diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 68d67f6..b85cd89 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -69,7 +69,7 @@ User Messaging Disabled Ciphers Encrypted Media Extensions - PDFjs + PDF.js Picture-in-Picture Sites autorisés Sites autorisés (Session Only) @@ -807,7 +807,7 @@ If this policy is enabled or not configured, encrypted media extensions (like Wi If this policy is enabled and EncryptedMediaExtensions are disabled, Firefox will not download encrypted media extensions (like Widevine) or ask the user to install them. If this policy is not disabled or not configured, it has no effect. - Enable PDFjs + Enable PDF.js If this policy is disabled, the built-in PDF viewer is not used. If this policy is enabled or not configured, the built-in PDF viewer is used. diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 5067a16..db24957 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -69,7 +69,7 @@ Messaggi utente Cifrari disabilitati Encrypted Media Extensions - PDFjs + PDF.js Picture-in-Picture Siti consentiti Siti consentiti (solo sessione) @@ -808,7 +808,7 @@ Se questo criterio è abilitato o non configurato, le Encrypted Media Extension Se questo criterio è abilitato e le Encrypted Media Extension sono disabilitate, Firefox non scaricherà le Encrypted Media Extension (come Widevine) né chiederà all'utente di installarle. Se questo criterio è disabilitato o non configurato, l'impostazione non ha effetto. - Abilita PDFjs + Abilita PDF.js Se questo criterio è disabilitato, il visualizzatore PDF integrato non è utilizzato. Se questo criterio è abilitato o non configurato, viene utilizzato il visualizzatore PDF integrato. diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index 7b379c0..3c6ce62 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -69,7 +69,7 @@ Обмен сообщений пользователей Отключенные шифры Зашифрованные медиа-сообщения - PDFjs + PDF.js Картинка в картинке Разрешённые сайты Разрешённые сайты (Session Only) @@ -808,7 +808,7 @@ If this policy is disabled or not configured, onboarding messages will be shown Если эта политика включена, а EncryptedMediaExtensions отключены, Firefox не будет загружать зашифрованные расширения мультимедиа (например, Widevine) и не будет просить пользователя установить их. Если эта политика не отключена или не настроена, она не действует. - Включить PDFjs + Включить PDF.js Если эта политика отключена, встроенная программа просмотра PDF не используется. Если эта политика включена или не настроена, используется встроенная программа просмотра PDF. diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index 37e18b6..1fe80a7 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -69,7 +69,7 @@ 显示给用户的消息 禁用加密算法 加密媒体扩充功能 - PDFjs + PDF.js 子母画面 允许的网站 允许的网站（仅当次浏览阶段） @@ -806,7 +806,7 @@ If this policy is disabled or not configured, onboarding messages will be shown 若启用此原则且禁用了 EncryptedMediaExtensions，Firefox 将不会下载加密媒体扩充功能（例如 Widevine），也不会询问用户是否要安装。 若禁用或不设定此原则，此原则就不会生效。 - 启用 PDFjs + 启用 PDF.js 若禁用此原则，将不会使用内置的 PDF 查看器。 若启用或不设定此原则，就会使用内置的 PDF 查看器。 diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 6510b76..f3fb308 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -69,7 +69,7 @@ 顯示給使用者的訊息 停用加密演算法 加密媒體擴充功能 - PDFjs + PDF.js 子母畫面 允許的網站 允許的網站（僅當次瀏覽階段） @@ -806,7 +806,7 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則且停用了 EncryptedMediaExtensions，Firefox 將不會下載加密媒體擴充功能（例如 Widevine），也不會詢問使用者是否要安裝。 若停用或不設定此原則，此原則就不會生效。 - 啟用 PDFjs + 啟用 PDF.js 若停用此原則，將不會使用內建的 PDF 檢視器。 若啟用或不設定此原則，就會使用內建的 PDF 檢視器。 -- 2.43.0 From 24e38b64f055166940f3020de578027d9702758c Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Tue, 23 Nov 2021 20:35:04 +0100 Subject: [PATCH 02/16] Fixed some errors in german translation --- windows/de-DE/firefox.adml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index f4cda0e..aa268de 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -313,7 +313,7 @@ Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Erweiterungen nicht mit einer Richtlinie verwaltet. -Für detalierte Informationen bitte die Dokumentation (in Englischer Sprache) lesen: https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings. +Für detalierte Informationen bitte die Dokumentation (in englischer Sprache) lesen: https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings. Hardware-Beschleunigung Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert. @@ -527,30 +527,30 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird Wenn diese Richtlinieneinstellung aktiviert ist, werden Cookies gelöscht, wenn der Browser geschlossen wird. Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden die Cookies nicht gelöscht wenn der Browser geschlossen wird. - Download Historie - Wenn diese Richtlinieneinstellung aktiviert ist, wird die Download Historie gelöscht, wenn der Browser geschlossen wird. + Download-Historie + Wenn diese Richtlinieneinstellung aktiviert ist, wird die Download-Historie gelöscht, wenn der Browser geschlossen wird. -Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird die Download Historie nicht gelöscht, wenn der Browser geschlossen wird. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird die Download-Historie nicht gelöscht, wenn der Browser geschlossen wird. Eingegebene Suchbegriffe und Formulardaten Wenn diese Gruppenrichtlinieneinstellung aktiviert ist, werden eingegebene Suchbegriffe und Formulardaten gelöscht, wenn der Browser geschlossen wird. Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden eingegebene Suchbegriffe und Formulardaten nicht gelöscht, wenn der Browser geschlossen wird. Chronik - Wenn diese Richtlinieneinstellung aktiviert ist, wird die Chronik gelöscht wenn der Browser geschlossen wird. + Wenn diese Richtlinieneinstellung aktiviert ist, wird die Chronik gelöscht, wenn der Browser geschlossen wird. -Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird die Chronik nicht gelöscht wenn der Browser geschlossen wird. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird die Chronik nicht gelöscht, wenn der Browser geschlossen wird. Gespeicherte Logins - Wenn diese Richtlinieneinstellung aktiviert ist, werden gespeicherte Logins gelöscht nachdem der Browser geschlossen wurde. + Wenn diese Richtlinieneinstellung aktiviert ist, werden gespeicherte Logins gelöscht, nachdem der Browser geschlossen wurde. -Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden gespeicherte Logins nicht gelöscht nachdem der Browser geschlossen wurde. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden gespeicherte Logins nicht gelöscht, nachdem der Browser geschlossen wurde. Website-Einstellungen Wenn diese Richtlinieneinstellung aktiviert ist, werden Website-Einstellungen gelöscht, wenn der Browser geschlossen wird. -Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Website-Einstellungen nicht gelöscht nachdem der Browser geschlossen wurde. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Website-Einstellungen nicht gelöscht, nachdem der Browser geschlossen wurde. Offline Website Daten - Wenn diese Richtlinieneinstellung aktiviert ist, werden Offline Website-Daten gelöscht wenn der Browser geschlossen wird. + Wenn diese Richtlinieneinstellung aktiviert ist, werden Offline Website-Daten gelöscht, wenn der Browser geschlossen wird. -Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Offline Website-Daten nicht gelöscht wenn der Browser geschlossen wird. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Offline Website-Daten nicht gelöscht, wenn der Browser geschlossen wird. Locked Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert sind, können alle Einstellungen vom Nutzer geändert werden. @@ -613,7 +613,7 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, gibt Lesezeichen 48 Lesezeichen 49 Lesezeichen 50 - Wenn Sie die Richtlinieneinstellung aktivieren, können Sie ein Lesezeichen konfigurieren, können Sie ein Lesezeichen konfigurieren, das zu Firefox hinzugefügt wird. Aufgrund eines Fehlers müssen Sie den Speicherort auswählen. Beachten Sie, dass Sie die Lesezeichen in der Reihenfolge angeben müssen. + Wenn Sie die Richtlinieneinstellung aktivieren, können Sie ein Lesezeichen konfigurieren, das zu Firefox hinzugefügt wird. Aufgrund eines Fehlers müssen Sie den Speicherort auswählen. Beachten Sie, dass Sie die Lesezeichen in der Reihenfolge angeben müssen. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Lesezeichen zu Firefox hinzugefügt. Werkzeugleiste -- 2.43.0 From fef754bd0f606218cd775d874087adb65deab381 Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Thu, 25 Nov 2021 22:09:34 +0100 Subject: [PATCH 03/16] Updated german translation Fixed some typos and translated a paragraph --- windows/de-DE/firefox.adml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index aa268de..8fb3a8d 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -313,7 +313,7 @@ Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Erweiterungen nicht mit einer Richtlinie verwaltet. -Für detalierte Informationen bitte die Dokumentation (in englischer Sprache) lesen: https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings. +Für detaillierte Informationen bitte die Dokumentation (in englischer Sprache) lesen: https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings. Hardware-Beschleunigung Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert. @@ -503,10 +503,10 @@ Wenn Sie die Richtlinieneinstellung nicht konfigurieren, ist Flash ausführbar.< Wenn Sie die Richtlinieneinstellung aktivieren, können Benutzer die Flash-Einstellungen nicht ändern. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Benutzer die Flash-Einstellungen ändern. - Willkommen Seite ändern + Willkommensseite ändern Wenn Sie die Richtlinieneinstellung aktivieren, können Sie eine URL angeben, die als Willkommensseite beim ersten Start von Firefox verwendet werden soll. Wenn Sie die URL leer lassen, wird keine Willkommensseite angezeigt. -Starting with Firefox 83, Firefox ESR 78.5, you can also specify multiple URLS separated by a vertical bar (|). +Ab Firefox 83 oder Firefox ESR 78.5 lassen sich mehrere Willkommensseiten festlegen. Diese müssen durch das Zeichen | getrennt sein. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Standard Willkommensseite angezeigt. Upgrade Seite ändern @@ -555,7 +555,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert sind, können alle Einstellungen vom Nutzer geändert werden. Wenn diese Richtlinieneinstellung aktiviert ist, können Einstellungen vom Nutzer nicht geändert werden. - Gesperrte Webseites + Gesperrte Webseiten Wenn Sie die Richtlinieneinstellung aktivieren, können Sie die Übereinstimmungsmuster für zu blockierende Webseiten angeben. Die Übereinstimmungsmuster sind unter https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns dokumentiert. Es gibt eine Beschränkung von 1000 Einträgen. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Webseiten gesperrt. -- 2.43.0 From 9cfb7b79042126a940094fe575e941dbd649668c Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Fri, 26 Nov 2021 19:32:38 +0100 Subject: [PATCH 04/16] Translated "Windows SSO" to german Took some parts of the explanation from: https://support.mozilla.org/de/kb/informationen-zur-funktion-windows-sso --- windows/de-DE/firefox.adml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 8fb3a8d..b6f57eb 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -866,9 +866,9 @@ If this policy is disabled or not configured, any site that invokes an external For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#autolaunchprotocolsfromorigins. Windows SSO - If this policy is enabled, Firefox will use credentials stored in Windows to sign in to Microsoft, work, and school accounts. + Wenn diese Richtlinieneinstellung aktiviert ist, verwendet Firefox in Windows gespeicherte Zugangsdaten, um Sie auf Webseiten von Microsoft anzumelden, einschließlich Outlook, Office 365 sowie allen anderen Geschäfts- oder Schulkonten, die Microsofts Authentifizierung verwenden. -If this policy is disabled or not configured, credentials must be entered manually. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, müssen die Zugangsdaten manuell eingegeben werden. Wenn diese Richtlinieneinstellung aktiviert ist, ist die Einstellung auf true gesperrt. Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Einstellung auf false gesperrt. Für eine Beschreibung der Einstellung, siehe: -- 2.43.0 From d086853b4a12ae53c200bcbc1bba6399106bcfc0 Mon Sep 17 00:00:00 2001 From: Patrick Canterino Date: Fri, 26 Nov 2021 19:39:33 +0100 Subject: [PATCH 05/16] Translated "Show Home button on toolbar" to german --- windows/de-DE/firefox.adml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index b6f57eb..3abe19f 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -640,12 +640,12 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird Startseite Letzte Sitzung Homepage (Locked) - Show Home button on toolbar - If this policy is enabled, the home button will appear on the toolbar by default. + Home-Button zur Symbolleiste hinzufügen + Wenn diese Richtlinieneinstellung aktiviert ist, erscheint der Home-Button standardmäßig in der Symbolleiste. -If this policy is disabled, the home button will not appear on the toolbar by default. +Wenn diese Richtlinieneinstellung deaktiviert ist, erscheint der Home-Button standardmäßig nicht in der Symbolleiste. -If this policy is not configured, Firefox will determine whether or not the home button appears on the toolbar by default. +Wenn diese Richtlinieneinstellung nicht konfiguriert ist, entscheidet Firefox selbst, ob der Home-Button standardmäßig in der Symbolleiste erscheint oder nicht. Passwort-Manager Wenn diese Richtlinieneinstellung deaktiviert ist, ist der Passwort-Manager nicht über die Einstellungen verfügbar. -- 2.43.0 From 8a55e5cbe19d27c265fa47f0106f79902bbe687d Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Mon, 29 Nov 2021 12:45:35 -0600 Subject: [PATCH 06/16] Clarify text --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c86e448..29a26d6 100644 --- a/README.md +++ b/README.md @@ -656,7 +656,7 @@ Note: [`ManagedBookmarks`](#managedbookmarks) is the new recommended way to add Add bookmarks in either the bookmarks toolbar or menu. Only `Title` and `URL` are required. If `Placement` is not specified, the bookmark will be placed on the toolbar. If `Folder` is specified, it is automatically created and bookmarks with the same folder name are grouped together. -If you want to clear all bookmarks set with this policy, you can set the value to an empty array (```[]```). This can be on Windows via GPO or Intune with the new Bookmarks (JSON) policy. +If you want to clear all bookmarks set with this policy, you can set the value to an empty array (```[]```). This can be on Windows via the new Bookmarks (JSON) policy available with GPO and Intune. **Compatibility:** Firefox 60, Firefox ESR 60\ **CCK2 Equivalent:** `bookmarks.toolbar`,`bookmarks.menu`\ -- 2.43.0 From dadc1b74d8b806dfc75206aed3d896a7256df199 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Mon, 6 Dec 2021 09:56:28 -0600 Subject: [PATCH 07/16] Add a couple new preferences --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 29a26d6..d21c047 100644 --- a/README.md +++ b/README.md @@ -4184,6 +4184,7 @@ general.smoothScroll (Firefox 83, Firefox ESR 78.5) geo. gfx. intl. +keyword.enabled (Firefox 95, Firefox ESR 91.4) layers. layout. media. @@ -4193,6 +4194,7 @@ places. print. signon. (Firefox 83, Firefox ESR 78.5) spellchecker. (Firefox 84, Firefox ESR 78.6) +toolkit.legacyUserProfileCustomizations.stylesheets (Firefox 95, Firefox ESR 91.4) ui. widget. ``` -- 2.43.0 From fb1d880727d3bdc64503b504edd44e9a03748ccc Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 09:49:24 -0600 Subject: [PATCH 08/16] Support for SponsoredTopSites and SponsoredPocket --- README.md | 14 ++++++++++++-- mac/org.mozilla.firefox.plist | 4 ++++ windows/de-DE/firefox.adml | 2 ++ windows/en-US/firefox.adml | 2 ++ windows/es-ES/firefox.adml | 2 ++ windows/firefox.admx | 16 ++++++++++++++++ windows/fr-FR/firefox.adml | 2 ++ windows/it-IT/firefox.adml | 2 ++ windows/ru-RU/firefox.adml | 2 ++ windows/zh-CN/firefox.adml | 2 ++ windows/zh-TW/firefox.adml | 2 ++ 11 files changed, 48 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d21c047..e4f1fe4 100644 --- a/README.md +++ b/README.md @@ -2889,16 +2889,18 @@ Value (string): ### FirefoxHome Customize the Firefox Home page. -**Compatibility:** Firefox 68, Firefox ESR 68\ +**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4) **CCK2 Equivalent:** N/A\ -**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets` +**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored` #### Windows (GPO) ``` Software\Policies\Mozilla\Firefox\FirefoxHome\Search = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0 ``` @@ -2912,8 +2914,10 @@ Value (string): + + ``` @@ -2926,10 +2930,14 @@ Value (string): | TopSites | + SponsoredTopSites + | Highlights | Pocket | + SponsoredPocket + | Snippets | Locked @@ -2944,8 +2952,10 @@ Value (string): "FirefoxHome": { "Search": true | false, "TopSites": true | false, + "SponsoredTopSites": true | false, "Highlights": true | false, "Pocket": true | false, + "SponsoredPocket": true | false, "Snippets": true | false, "Locked": true | false } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 6b1c1a8..733afeb 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -284,10 +284,14 @@ TopSites + SponsoredTopSites + Highlights Pocket + SponsoredPocket + Snippets Locked diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index d459705..1c4bc26 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -1161,8 +1161,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E Suche Top Seiten + Sponsored Top Sites Download Verlauf Von Pocket empfohlen + Sponsored Pocket Stories Snippets Es ist nicht erlaubt, dass Einstellungen geändert werden. diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index f3085d7..d279adc 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. Search Top Sites + Sponsored Top Sites Download History Recommended by Pocket + Sponsored Pocket Stories Snippets Don't allow settings to be changed diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 8fae8d6..c7a8b12 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences Búsqueda Sitios populares + Sponsored Top Sites Historial de descargas Recomendado por Pocket + Sponsored Pocket Stories Fragmentos No permitir que se cambie la configuración diff --git a/windows/firefox.admx b/windows/firefox.admx index d4fc2e7..aea314b 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -1106,6 +1106,14 @@ + + + + + + + + @@ -1122,6 +1130,14 @@ + + + + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index d25d776..8ca32b1 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -1159,8 +1159,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences Rechercher Meilleurs sites + Sponsored Top Sites Historique de téléchargement Enregistré dans Pocket + Sponsored Pocket Stories Brèves Ne pas autoriser la modification des paramètres diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index e4ece5d..15276cc 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -1161,8 +1161,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences Ricerca sul Web Siti principali + Sponsored Top Sites Cronologia dei download Raccomandati da Pocket + Sponsored Pocket Stories Snippet Non consentire la modifica delle preferenze diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index e3425dd..ade9f10 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. < Поиск Популярные сайты + Sponsored Top Sites История загрузок Рекомендуется Pocket + Sponsored Pocket Stories Фрагменты Запретить изменение настроек diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index 260e664..b114a53 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -1158,8 +1158,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 搜索 热门网站 +Sponsored Top Sites 下载记录 Pocket 推荐项 +Sponsored Pocket Stories 只字片语 不允许变更设置 diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 9e8ddd0..9495c90 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -1158,8 +1158,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 搜尋 熱門網站 + Sponsored Top Sites 下載紀錄 Pocket 推薦項目 + Sponsored Pocket Stories 隻字片語 不允許變更設定 -- 2.43.0 From 1088b76ba57ca085eb8b1b0d448bc6e94f35b939 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 10:20:28 -0600 Subject: [PATCH 09/16] Fix some alphabetization - Fixes #837 --- README.md | 721 +++++++++++++++++++++++++++--------------------------- 1 file changed, 359 insertions(+), 362 deletions(-) diff --git a/README.md b/README.md index e4f1fe4..d9bc93b 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,15 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`Certificates -> ImportEnterpriseRoots`](#certificates--importenterpriseroots)** | Trust certificates that have been added to the operating system certificate store by a user or administrator. | **[`Certificates -> Install`](#certificates--install)** | Install certificates into the Firefox certificate store. | **[`Cookies`](#cookies)** | Configure cookie preferences. +| **[`DefaultDownloadDirectory`](#defaultdownloaddirectory)** | Set the default download directory. | **[`DisableAppUpdate`](#disableappupdate)** | Turn off application updates. | **[`DisableBuiltinPDFViewer`](#disablebuiltinpdfviewer)** | Disable the built in PDF viewer. | **[`DisabledCiphers`](#disabledciphers)** | Disable ciphers. | **[`DisableDefaultBrowserAgent`](#disabledefaultbrowseragent)** | Prevent the default browser agent from taking any actions (Windows only). | **[`DisableDeveloperTools`](#disabledevelopertools)** | Remove access to all developer tools. | **[`DisableFeedbackCommands`](#disablefeedbackcommands)** | Disable the menus for reporting sites. -| **[`DisableFirefoxScreenshots`](#disablefirefoxscreenshots)** | Remove access to Firefox Screenshots. | **[`DisableFirefoxAccounts`](#disablefirefoxaccounts)** | Disable Firefox Accounts integration (Sync). +| **[`DisableFirefoxScreenshots`](#disablefirefoxscreenshots)** | Remove access to Firefox Screenshots. | **[`DisableFirefoxStudies`](#disablefirefoxstudies)** | Disable Firefox studies (Shield). | **[`DisableForgetButton`](#disableforgetbutton)** | Disable the "Forget" button. | **[`DisableFormHistory`](#disableformhistory)** | Turn off saving information on web forms and the search bar. @@ -46,11 +47,10 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`DisableSystemAddonUpdate`](#disablesystemaddonupdate)** | Prevent system add-ons from being installed or update. | **[`DisableTelemetry`](#disabletelemetry)** | DisableTelemetry | **[`DisplayBookmarksToolbar`](#displaybookmarkstoolbar)** | Set the initial state of the bookmarks toolbar. -| **[`DisplayMenuBar (Deprecated)`](#displaymenubar-deprecated)** | Set the initial state of the menubar. | **[`DisplayMenuBar`](#displaymenubar)** | Set the state of the menubar. +| **[`DisplayMenuBar (Deprecated)`](#displaymenubar-deprecated)** | Set the initial state of the menubar. | **[`DNSOverHTTPS`](#dnsoverhttps)** | Configure DNS over HTTPS. | **[`DontCheckDefaultBrowser`](#dontcheckdefaultbrowser)** | Don't check if Firefox is the default browser at startup. -| **[`DefaultDownloadDirectory`](#defaultdownloaddirectory)** | Set the default download directory. | **[`DownloadDirectory`](#downloaddirectory)** | Set and lock the download directory. | **[`EnableTrackingProtection`](#enabletrackingprotection)** | Configure tracking protection. | **[`EncryptedMediaExtensions`](#encryptedmediaextensions)** | Enable or disable Encrypted Media Extensions and optionally lock it. @@ -58,17 +58,16 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`Extensions`](#extensions)** | Control the installation, uninstallation and locking of extensions. | **[`ExtensionSettings`](#extensionsettings)** | Manage all aspects of extensions. | **[`ExtensionUpdate`](#extensionupdate)** | Control extension updates. -| **[`FlashPlugin`](#flashplugin)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed. | **[`FirefoxHome`](#firefoxhome)** | Customize the Firefox Home page. -| **[`HardwareAcceleration`](#hardwareacceleration)** | Control hardware acceleration. +| **[`FlashPlugin`](#flashplugin)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed. | **[`Handlers`](#handlers)** | Configure default application handlers. +| **[`HardwareAcceleration`](#hardwareacceleration)** | Control hardware acceleration. | **[`Homepage`](#homepage)** | Configure the default homepage and how Firefox starts. | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed. | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation. | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin. | **[`ManagedBookmarks`](#managedbookmarks)** | Configures a list of bookmarks managed by an administrator that cannot be changed by the user. | **[`ManualAppUpdateOnly`](#manualappupdateonly)** | Allow manual updates only and do not notify the user about updates.. -| **[`PrimaryPassword`](#primarypassword)** | Require or prevent using a primary (formerly master) password. | **[`NetworkPrediction`](#networkprediction)** | Enable or disable network prediction (DNS prefetching). | **[`NewTabPage`](#newtabpage)** | Enable or disable the New Tab page. | **[`NoDefaultBookmarks`](#nodefaultbookmarks)** | Disable the creation of default bookmarks. @@ -83,6 +82,7 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`PopupBlocking`](#popupblocking)** | Configure the default pop-up window policy as well as origins for which pop-up windows are allowed. | **[`Preferences`](#preferences)** | Set and lock preferences. | **[`Preferences (Deprecated)`](#preferences-deprecated)** | Set and lock some preferences. +| **[`PrimaryPassword`](#primarypassword)** | Require or prevent using a primary (formerly master) password. | **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading. | **[`Proxy`](#proxy)** | Configure proxy settings. | **[`RequestedLocales`](#requestedlocales)** | Set the the list of requested locales for the application in order of preference. @@ -116,7 +116,7 @@ If set to true, application updates are installed without user approval within F If set to false, application updates are downloaded but the user can choose when to install the update. -If you have disabled updates via DisableAppUpdate, this policy has no effect. +If you have disabled updates via `DisableAppUpdate`, this policy has no effect. **Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ @@ -1072,7 +1072,7 @@ Remove the master password functionality. If this value is true, it works the same as setting [`PrimaryPassword`](#primarypassword) to false and removes the primary password functionality. -If both DisableMasterPasswordCreation and PrimaryPassword are used, DisableMasterPasswordCreation takes precedent. +If both `DisableMasterPasswordCreation` and `PrimaryPassword` are used, `DisableMasterPasswordCreation` takes precedent. **Compatibility:** Firefox 60, Firefox ESR 60\ **CCK2 Equivalent:** `noMasterPassword`\ @@ -1106,6 +1106,50 @@ Value (string): } } ``` +### DefaultDownloadDirectory +Set the default download directory. + +You can use ${home} for the native home directory. + +**Compatibility:** Firefox 68, Firefox ESR 68\ +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** `browser.download.dir`, `browser.download.folderList` + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\DefaultDownloadDirectory = "${home}\Downloads" +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DefaultDownloadDirectory +``` +Value (string): +``` + + +``` +#### macOS +``` + + DefaultDownloadDirectory + ${home}/Downloads + +``` +#### policies.json (macOS and Linux) +``` +{ + "policies": { + "DefaultDownloadDirectory": "${home}/Downloads" +} +``` +#### policies.json (Windows) +``` +{ + "policies": { + "DefaultDownloadDirectory": "${home}\\Downloads" +} +``` ### DisableAppUpdate Turn off application updates within Firefox. @@ -1374,21 +1418,21 @@ Value (string): } } ``` -### DisableFirefoxScreenshots -Remove access to Firefox Screenshots. +### DisableFirefoxAccounts +Disable Firefox Accounts integration (Sync). **Compatibility:** Firefox 60, Firefox ESR 60\ -**CCK2 Equivalent:** N/A\ -**Preferences Affected:** `extensions.screenshots.disabled` +**CCK2 Equivalent:** `disableSync`\ +**Preferences Affected:** `identity.fxaccounts.enabled` #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\DisableFirefoxScreenshots = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\DisableFirefoxAccounts = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableFirefoxScreenshots +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableFirefoxAccounts ``` Value (string): ``` @@ -1397,7 +1441,7 @@ Value (string): #### macOS ``` - DisableFirefoxScreenshots + DisableFirefoxAccounts | ``` @@ -1405,25 +1449,25 @@ Value (string): ``` { "policies": { - "DisableFirefoxScreenshots": true | false + "DisableFirefoxAccounts": true | false } } ``` -### DisableFirefoxAccounts -Disable Firefox Accounts integration (Sync). +### DisableFirefoxScreenshots +Remove access to Firefox Screenshots. **Compatibility:** Firefox 60, Firefox ESR 60\ -**CCK2 Equivalent:** `disableSync`\ -**Preferences Affected:** `identity.fxaccounts.enabled` +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** `extensions.screenshots.disabled` #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\DisableFirefoxAccounts = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\DisableFirefoxScreenshots = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableFirefoxAccounts +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisableFirefoxScreenshots ``` Value (string): ``` @@ -1432,7 +1476,7 @@ Value (string): #### macOS ``` - DisableFirefoxAccounts + DisableFirefoxScreenshots | ``` @@ -1440,7 +1484,7 @@ Value (string): ``` { "policies": { - "DisableFirefoxAccounts": true | false + "DisableFirefoxScreenshots": true | false } } ``` @@ -1927,32 +1971,6 @@ Value (string): } } ``` -### DisplayMenuBar (Deprecated) -Set the initial state of the menubar. A user can still hide it and it will stay hidden. - -**Compatibility:** Firefox 60, Firefox ESR 60 (Windows, some Linux)\ -**CCK2 Equivalent:** `displayMenuBar`\ -**Preferences Affected:** N/A - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\DisplayMenuBar = 0x1 | 0x0 -``` -#### macOS -``` - - DisplayMenuBar - | - -``` -#### policies.json -``` -{ - "policies": { - "DisplayMenuBar": true | false - } -} -``` ### DisplayMenuBar Set the state of the menubar. @@ -1997,6 +2015,32 @@ Value (string): } } ``` +### DisplayMenuBar (Deprecated) +Set the initial state of the menubar. A user can still hide it and it will stay hidden. + +**Compatibility:** Firefox 60, Firefox ESR 60 (Windows, some Linux)\ +**CCK2 Equivalent:** `displayMenuBar`\ +**Preferences Affected:** N/A + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\DisplayMenuBar = 0x1 | 0x0 +``` +#### macOS +``` + + DisplayMenuBar + | + +``` +#### policies.json +``` +{ + "policies": { + "DisplayMenuBar": true | false + } +} +``` ### DNSOverHTTPS Configure DNS over HTTPS. @@ -2120,50 +2164,6 @@ Value (string): } } ``` -### DefaultDownloadDirectory -Set the default download directory. - -You can use ${home} for the native home directory. - -**Compatibility:** Firefox 68, Firefox ESR 68\ -**CCK2 Equivalent:** N/A\ -**Preferences Affected:** `browser.download.dir`, `browser.download.folderList` - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\DefaultDownloadDirectory = "${home}\Downloads" -``` -#### Windows (Intune) -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DefaultDownloadDirectory -``` -Value (string): -``` - - -``` -#### macOS -``` - - DefaultDownloadDirectory - ${home}/Downloads - -``` -#### policies.json (macOS and Linux) -``` -{ - "policies": { - "DefaultDownloadDirectory": "${home}/Downloads" -} -``` -#### policies.json (Windows) -``` -{ - "policies": { - "DefaultDownloadDirectory": "${home}\\Downloads" -} -``` ### DownloadDirectory Set and lock the download directory. @@ -2620,72 +2620,148 @@ Value (string): } } ``` -### FlashPlugin -Configure the default Flash plugin policy as well as origins for which Flash is allowed. - -`Allow` is a list of origins where Flash are allowed. - -`Block` is a list of origins where Flash is not allowed. - -`Default` determines whether or not Flash is allowed by default. - -`Locked` prevents the user from changing Flash preferences. +### FirefoxHome +Customize the Firefox Home page. -**Compatibility:** Firefox 60, Firefox ESR 60\ -**CCK2 Equivalent:** `permissions.plugin`\ -**Preferences Affected:** `plugin.state.flash` +**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4) +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored` #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\FlashPlugin\Allow\1 = "https://example.org" -Software\Policies\Mozilla\Firefox\FlashPlugin\Block\1 = "https://example.edu" -Software\Policies\Mozilla\Firefox\FlashPlugin\Default = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FlashPlugin\Locked = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\Search = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Allow +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/CustomizeFirefoxHome ``` Value (string): ``` - -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked -``` -Value (string): -``` - or -``` -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default -``` -Value (string): -``` - or + + + + + + + + ``` #### macOS ``` - FlashPlugin + FirefoxHome - Allow - - http://example.org - - Block - - http://example.edu - - Default + Search | - Locked + TopSites | - + SponsoredTopSites + | + Highlights + | + Pocket + | + SponsoredPocket + | + Snippets + | + Locked + | + + +``` +#### policies.json +``` +{ + "policies": { + "FirefoxHome": { + "Search": true | false, + "TopSites": true | false, + "SponsoredTopSites": true | false, + "Highlights": true | false, + "Pocket": true | false, + "SponsoredPocket": true | false, + "Snippets": true | false, + "Locked": true | false + } + } +} +``` +### FlashPlugin (Deprecated) +Configure the default Flash plugin policy as well as origins for which Flash is allowed. + +`Allow` is a list of origins where Flash are allowed. + +`Block` is a list of origins where Flash is not allowed. + +`Default` determines whether or not Flash is allowed by default. + +`Locked` prevents the user from changing Flash preferences. + +**Compatibility:** Firefox 60, Firefox ESR 60\ +**CCK2 Equivalent:** `permissions.plugin`\ +**Preferences Affected:** `plugin.state.flash` + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\FlashPlugin\Allow\1 = "https://example.org" +Software\Policies\Mozilla\Firefox\FlashPlugin\Block\1 = "https://example.edu" +Software\Policies\Mozilla\Firefox\FlashPlugin\Default = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\FlashPlugin\Locked = 0x1 | 0x0 +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Allow +``` +Value (string): +``` + + +``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Locked +``` +Value (string): +``` + or +``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Flash/FlashPlugin_Default +``` +Value (string): +``` + or +``` +#### macOS +``` + + FlashPlugin + + Allow + + http://example.org + + Block + + http://example.edu + + Default + | + Locked + | + ``` #### policies.json @@ -2701,9 +2777,6 @@ Value (string): } } ``` - - - ### Handlers Configure default application handlers. This policy is based on the internal format of `handlers.json`. @@ -2886,82 +2959,6 @@ Value (string): } } ``` -### FirefoxHome -Customize the Firefox Home page. - -**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4) -**CCK2 Equivalent:** N/A\ -**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored` - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\FirefoxHome\Search = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0 -Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0 -``` -#### Windows (Intune) -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/CustomizeFirefoxHome -``` -Value (string): -``` - - - - - - - - - -``` -#### macOS -``` - - FirefoxHome - - Search - | - TopSites - | - SponsoredTopSites - | - Highlights - | - Pocket - | - SponsoredPocket - | - Snippets - | - Locked - | - - -``` -#### policies.json -``` -{ - "policies": { - "FirefoxHome": { - "Search": true | false, - "TopSites": true | false, - "SponsoredTopSites": true | false, - "Highlights": true | false, - "Pocket": true | false, - "SponsoredPocket": true | false, - "Snippets": true | false, - "Locked": true | false - } - } -} -``` ### HardwareAcceleration Control hardware acceleration. @@ -3398,45 +3395,6 @@ This policy is primarily intended for advanced end users, not for enterprises. } } ``` -### PrimaryPassword -Require or prevent using a primary (formerly master) password. - -If this value is true, a primary password is required. If this value is false, it works the same as if [`DisableMasterPasswordCreation`](#disablemasterpasswordcreation) was true and removes the primary password functionality. - -If both DisableMasterPasswordCreation and PrimaryPassword are used, DisableMasterPasswordCreation takes precedent. - -**Compatibility:** Firefox 79, Firefox ESR 78.1\ -**CCK2 Equivalent:** `noMasterPassword`\ -**Preferences Affected:** N/A - -#### Windows (GPO) -``` -Software\Policies\Mozilla\Firefox\PrimaryPassword = 0x1 | 0x0 -``` -#### Windows (Intune) -OMA-URI: -``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PrimaryPassword -``` -Value (string): -``` - or -``` -#### macOS -``` - - PrimaryPassword - | - -``` -#### policies.json -``` -{ - "policies": { - "PrimaryPassword": true | false - } -} -``` ### NetworkPrediction Enable or disable network prediction (DNS prefetching). @@ -4505,6 +4463,45 @@ Value (string): } } ``` +### PrimaryPassword +Require or prevent using a primary (formerly master) password. + +If this value is true, a primary password is required. If this value is false, it works the same as if [`DisableMasterPasswordCreation`](#disablemasterpasswordcreation) was true and removes the primary password functionality. + +If both DisableMasterPasswordCreation and PrimaryPassword are used, DisableMasterPasswordCreation takes precedent. + +**Compatibility:** Firefox 79, Firefox ESR 78.1\ +**CCK2 Equivalent:** `noMasterPassword`\ +**Preferences Affected:** N/A + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\PrimaryPassword = 0x1 | 0x0 +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PrimaryPassword +``` +Value (string): +``` + or +``` +#### macOS +``` + + PrimaryPassword + | + +``` +#### policies.json +``` +{ + "policies": { + "PrimaryPassword": true | false + } +} +``` ### PromptForDownloadLocation Ask where to save each file before downloading. @@ -4936,35 +4933,86 @@ Value (string): ### SearchEngines (This policy is only available on the ESR.) -### SearchEngines | Default +### SearchEngines | Add -Set the default search engine. This policy is only available on the ESR. +Add new search engines (up to five). This policy is only available on the ESR. `Name` and `URLTemplate` are required. -**Compatibility:** Firefox ESR 60\ -**CCK2 Equivalent:** `defaultSearchEngine`\ +`Name` is the name of the search engine. + +`URLTemplate` is the search URL with {searchTerms} to substitute for the search term. + +`Method` is either GET or POST + +`IconURL` is a URL for the icon to use. + +`Alias` is a keyword to use for the engine. + +`Description` is a description of the search engine. + +`PostData` is the POST data as name value pairs separated by &. + +`SuggestURLTemplate` is a search suggestions URL with {searchTerms} to substitute for the search term. + +`Encoding` is the query charset for the engine. It defaults to UTF-8. + +**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68, Encoding support in Firefox 91)\ +**CCK2 Equivalent:** `searchplugins`\ **Preferences Affected:** N/A #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\SearchEngines\Default = NAME_OF_SEARCH_ENGINE +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Name = "Example1" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\URLTemplate = "https://www.example.org/q={searchTerms}" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Method = "GET" | "POST" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\IconURL = "https://www.example.org/favicon.ico" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Alias = "example" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Description = "Example Description" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\SuggestURLTemplate = "https://www.example.org/suggestions/q={searchTerms}" +Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\PostData = "name=value&q={searchTerms}" ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_Default +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_1 ``` Value (string): ``` - + + + + + + + + ``` #### macOS ``` SearchEngines - Default - NAME_OF_SEARCH_ENGINE + Add + + + Name + Example1 + URLTemplate + https://www.example.org/q={searchTerms} + Method + GET | POST + IconURL + https://www.example.org/favicon.ico + Alias + example + Description + Example Description + SuggestURLTemplate + https://www.example.org/suggestions/q={searchTerms} + PostData + name=value&q={searchTerms} + + ``` @@ -4973,39 +5021,51 @@ Value (string): { "policies": { "SearchEngines": { - "Default": "NAME_OF_SEARCH_ENGINE" + "Add": [ + { + "Name": "Example1", + "URLTemplate": "https://www.example.org/q={searchTerms}", + "Method": "GET" | "POST", + "IconURL": "https://www.example.org/favicon.ico", + "Alias": "example", + "Description": "Description", + "PostData": "name=value&q={searchTerms}", + "SuggestURLTemplate": "https://www.example.org/suggestions/q={searchTerms}" + } + ] } } } ``` -### SearchEngines | PreventInstalls +### SearchEngines | Default -Prevent installing search engines from webpages. +Set the default search engine. This policy is only available on the ESR. **Compatibility:** Firefox ESR 60\ -**CCK2 Equivalent:** `disableSearchEngineInstall`\ +**CCK2 Equivalent:** `defaultSearchEngine`\ **Preferences Affected:** N/A #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\SearchEngines\PreventInstalls = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\SearchEngines\Default = NAME_OF_SEARCH_ENGINE ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_PreventInstalls +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_Default ``` Value (string): ``` - or + + ``` #### macOS ``` SearchEngines - PreventInstalls - | + Default + NAME_OF_SEARCH_ENGINE ``` @@ -5014,42 +5074,39 @@ Value (string): { "policies": { "SearchEngines": { - "PreventInstalls": true | false + "Default": "NAME_OF_SEARCH_ENGINE" } } } ``` -### SearchEngines | Remove +### SearchEngines | PreventInstalls -Hide built-in search engines. This policy is only available on the ESR. +Prevent installing search engines from webpages. -**Compatibility:** Firefox ESR 60.2\ -**CCK2 Equivalent:** `removeDefaultSearchEngines` (removed all built-in engines)\ +**Compatibility:** Firefox ESR 60\ +**CCK2 Equivalent:** `disableSearchEngineInstall`\ **Preferences Affected:** N/A #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\SearchEngines\Remove\1 = NAME_OF_SEARCH_ENGINE +Software\Policies\Mozilla\Firefox\SearchEngines\PreventInstalls = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_Remove +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_PreventInstalls ``` Value (string): ``` - - + or ``` #### macOS ``` SearchEngines - Remove - - NAME_OF_SEARCH_ENGINE - + PreventInstalls + | ``` @@ -5058,91 +5115,42 @@ Value (string): { "policies": { "SearchEngines": { - "Remove": ["NAME_OF_SEARCH_ENGINE"] + "PreventInstalls": true | false } } } ``` -### SearchEngines | Add - -Add new search engines (up to five). This policy is only available on the ESR. `Name` and `URLTemplate` are required. - -`Name` is the name of the search engine. - -`URLTemplate` is the search URL with {searchTerms} to substitute for the search term. - -`Method` is either GET or POST - -`IconURL` is a URL for the icon to use. - -`Alias` is a keyword to use for the engine. - -`Description` is a description of the search engine. - -`PostData` is the POST data as name value pairs separated by &. - -`SuggestURLTemplate` is a search suggestions URL with {searchTerms} to substitute for the search term. +### SearchEngines | Remove -`Encoding` is the query charset for the engine. It defaults to UTF-8. +Hide built-in search engines. This policy is only available on the ESR. -**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68, Encoding support in Firefox 91)\ -**CCK2 Equivalent:** `searchplugins`\ +**Compatibility:** Firefox ESR 60.2\ +**CCK2 Equivalent:** `removeDefaultSearchEngines` (removed all built-in engines)\ **Preferences Affected:** N/A #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Name = "Example1" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\URLTemplate = "https://www.example.org/q={searchTerms}" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Method = "GET" | "POST" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\IconURL = "https://www.example.org/favicon.ico" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Alias = "example" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\Description = "Example Description" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\SuggestURLTemplate = "https://www.example.org/suggestions/q={searchTerms}" -Software\Policies\Mozilla\Firefox\SearchEngines\Add\1\PostData = "name=value&q={searchTerms}" +Software\Policies\Mozilla\Firefox\SearchEngines\Remove\1 = NAME_OF_SEARCH_ENGINE ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_1 +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Search/SearchEngines_Remove ``` Value (string): ``` - - - - - - - - + ``` #### macOS ``` SearchEngines - Add - - - Name - Example1 - URLTemplate - https://www.example.org/q={searchTerms} - Method - GET | POST - IconURL - https://www.example.org/favicon.ico - Alias - example - Description - Example Description - SuggestURLTemplate - https://www.example.org/suggestions/q={searchTerms} - PostData - name=value&q={searchTerms} - + Remove + NAME_OF_SEARCH_ENGINE + ``` @@ -5151,18 +5159,7 @@ Value (string): { "policies": { "SearchEngines": { - "Add": [ - { - "Name": "Example1", - "URLTemplate": "https://www.example.org/q={searchTerms}", - "Method": "GET" | "POST", - "IconURL": "https://www.example.org/favicon.ico", - "Alias": "example", - "Description": "Description", - "PostData": "name=value&q={searchTerms}", - "SuggestURLTemplate": "https://www.example.org/suggestions/q={searchTerms}" - } - ] + "Remove": ["NAME_OF_SEARCH_ENGINE"] } } } -- 2.43.0 From b06395a01a8b538676599667c571d4c3778c95ef Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:38:38 -0600 Subject: [PATCH 10/16] Add support for new Cookie Behavior policy --- README.md | 51 ++++++++++++++++++++--- mac/org.mozilla.firefox.plist | 10 +---- windows/de-DE/firefox.adml | 20 +++++++++ windows/en-US/firefox.adml | 30 +++++++++++--- windows/es-ES/firefox.adml | 20 +++++++++ windows/firefox.admx | 76 +++++++++++++++++++++++++++++++++++ windows/fr-FR/firefox.adml | 20 +++++++++ windows/it-IT/firefox.adml | 20 +++++++++ windows/ru-RU/firefox.adml | 42 ++++++++++++++----- windows/zh-CN/firefox.adml | 34 ++++++++++++---- windows/zh-TW/firefox.adml | 20 +++++++++ 11 files changed, 305 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index d9bc93b..acf671d 100644 --- a/README.md +++ b/README.md @@ -891,19 +891,32 @@ Configure cookie preferences. `Block` is a list of origins (not domains) where cookies are always blocked. You must include http or https. -`Default` determines whether cookies are accepted at all. +`Behavior` sets the default behavior for cookies based on the values below. -`AcceptThirdParty` determines how third-party cookies are handled. +`BehaviorPrivateBrowsing` sets the default behavior for cookies in private browsing based on the values below. + +| Value | Description +| --- | --- +| accept | Accept all cookies +| reject-foreign | Reject third party cookies +| reject | Reject all cookies +| limit-foreign | Reject third party cookies for sites you haven't visited +| reject-tracker | Reject cookies for known trackers (default) +| reject-tracker-and-partition-foreign | Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) (default for private browsing) + +`Default` (Deprecated) determines whether cookies are accepted at all. + +`AcceptThirdParty` (Deprecated) determines how third-party cookies are handled. `ExpireAtSessionEnd` determines when cookies expire. -`RejectTracker` only rejects cookies for trackers. +`RejectTracker` (Deprecated) only rejects cookies for trackers. `Locked` prevents the user from changing cookie preferences. -**Compatibility:** Firefox 60, Firefox ESR 60 (RejectTracker added in Firefox 63, AllowSession added in Firefox 79/78.1)\ +**Compatibility:** Firefox 60, Firefox ESR 60 (RejectTracker added in Firefox 63, AllowSession added in Firefox 79/78.1, Behavior added in Firefox 95/91.4)\ **CCK2 Equivalent:** N/A\ -**Preferences Affected:** `network.cookie.cookieBehavior`, `network.cookie.lifetimePolicy` +**Preferences Affected:** `network.cookie.cookieBehavior`, `network.cookie.cookieBehavior.pbmode`, `network.cookie.lifetimePolicy` #### Windows (GPO) ``` @@ -914,6 +927,8 @@ Software\Policies\Mozilla\Firefox\Cookies\Default = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\Cookies\AcceptThirdParty = "always" | "never" | "from-visited" Software\Policies\Mozilla\Firefox\Cookies\ExpireAtSessionEnd = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\Cookies\RejectTracker = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\Cookies\Behavior = "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign" +Software\Policies\Mozilla\Firefox\Cookies\BehaviorPrivateBrowsing = "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign" Software\Policies\Mozilla\Firefox\Cookies\Locked = 0x1 | 0x0 ``` #### Windows (Intune) @@ -985,6 +1000,24 @@ Value (string): ``` or ``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_Behavior +``` +Value (string): +``` + + +``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_BehaviorPrivateBrowsing +``` +Value (string): +``` + + +``` #### macOS ``` @@ -1012,6 +1045,10 @@ Value (string): | Locked | + Behavior + accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign + BehaviorPrivateBrowsing + accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign ``` @@ -1027,7 +1064,9 @@ Value (string): "AcceptThirdParty": "always" | "never" | "from-visited", "ExpireAtSessionEnd": true | false, "RejectTracker": true | false, - "Locked": true | false + "Locked": true | false, + "Behavior": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign", + "BehaviorPrivateBrowsing": "accept" | "reject-foreign" | "reject" | "limit-foreign" | "reject-tracker" | "reject-tracker-and-partition-foreign", } } } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 733afeb..1ad8bc6 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -118,14 +118,8 @@ https://www.example.edu/ - Default - - AcceptThirdParty - never - ExpireAtSessionEnd - - RejectTracker - + Behavior + limit-foreign Locked diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 1c4bc26..8d60782 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -394,6 +394,20 @@ Diese Einstellung wird ignoriert wenn diese Richtlinieneinstellung deaktiviert o Wenn Sie die Richtlinieneinstellung aktivieren können Benutzer die Cookie-Einstellungen nicht ändern. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, können Benutzer die Cookie-Einstellungen ändern. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) Wenn diese Richtlinieneinstellung aktiviert ist, wird die Kamera für die genannten Quellen automatisch freigegeben. Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird die Standardeinstellung befolgt. @@ -987,6 +1001,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E + + + + + + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index d279adc..f4e0f83 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -371,11 +371,11 @@ If this policy is disabled or not configured, the default cookie policy is follo If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well. If this policy is disabled or not configured, cookies are not blocked by default. - Accept cookies from websites + Accept cookies from websites (Deprecated) If this policy is disabled, cookies are not accepted from websites by default. If this policy is not configured or enabled, cookies are accepted from websites. - Accept third-party cookies + Accept third-party cookies (Deprecated) If this policy is enabled and cookies are allowed, you can set when to accept third-party cookies. This setting is ignored if this policy is disabled or not configured or if cookies are not allowed. @@ -386,14 +386,26 @@ This setting is ignored if this policy is disabled or not configured or if cooki If this policy is enabled and cookies are allowed, they will expire when Firefox is closed. This setting is ignored if this policy is disabled or not configured or if cookies are not allowed. - Reject trackers + Reject trackers (Deprecated) If this policy is enabled and cookies are allowed, Firefox will reject tracker cookies by default. This setting is ignored if this policy is disabled or not configured or if cookies are not allowed. Do not allow preferences to be changed - If this policy is enabled, cookie preferences cannot be changed by the user. - -If this policy is disabled or not configured, the user can change their cookie preferences. + If this policy is enabled, cookie preferences cannot be changed by the user. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) If this policy is enabled, access to the camera is always allowed for the origins indicated. If this policy is disabled or not configured, the default camera policy is followed. @@ -986,6 +998,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. + + + + + + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index c7a8b12..4c8a537 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -394,6 +394,20 @@ Esta configuración se ignora si esta política está deshabilitada o no está c Si esta política está habilitada, el usuario no podrá cambiar las preferencias de cookies. Si esta política está deshabilitada o no está configurada, el usuario podrá cambiar tus preferencias de cookies. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) Si esta política está habilitada, el acceso a la cámara siempre estará permitido para los orígenes indicados. Si esta política está deshabilitada o no está configurada, se seguirá la política de cámara predeterminada. @@ -986,6 +1000,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + diff --git a/windows/firefox.admx b/windows/firefox.admx index aea314b..104f75e 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -381,6 +381,82 @@ + + + + + + + + accept + + + + + reject-foreign + + + + + reject + + + + + limit-foreign + + + + + reject-tracker + + + + + reject-tracker-and-partition-foreign + + + + + + + + + + + + + accept + + + + + reject-foreign + + + + + reject + + + + + limit-foreign + + + + + reject-tracker + + + + + reject-tracker-and-partition-foreign + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 8ca32b1..a23203a 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -394,6 +394,20 @@ Ce paramètre est ignoré si cette stratégie est désactivée ou non configuré Si cette stratégie est activée, les préférences en matière de cookies ne peuvent pas être modifiées par l'utilisateur. Si cette stratégie est désactivée ou non configurée, l'utilisateur peut modifier ses préférences en matière de cookies. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) Si cette stratégie est activée, l'accès à la caméra est toujours autorisé pour les origines indiquées. Si cette stratégie est désactivée ou non configurée, la stratégie par défaut de la caméra est appliquée. @@ -985,6 +999,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 15276cc..02d35bd 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -394,6 +394,20 @@ Quest'impostazione è ignorata se questo criterio è disabilitato o non configur Se questo criterio è abilitato, le preferenze relative ai cookie non possono essere modificate dall'utente. Se questo criterio è disabilitato o non configurato, l'utente può modificare le preferenze relative ai cookie. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) Se questo criterio è abilitato, l'accesso alla fotocamera è sempre consentito per le origini indicate. Se questo criterio è disabilitato o non configurato verrà seguita la politica predefinita per la fotocamera. @@ -987,6 +1001,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + + + + diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index ade9f10..113b2fc 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -394,6 +394,20 @@ Mozilla рекомендует не отключать телеметрию. И Если эта политика включена, пользователь не может изменить настройки файлов cookie. Если эта политика отключена или не настроена, пользователь может изменить свои настройки файлов cookie. + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) Если эта политика включена, доступ к камере всегда разрешен для указанных источников. Если эта политика отключена или не настроена, применяется политика камеры по умолчанию. @@ -983,17 +997,23 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. < Разрешить всплывающие окна для веб-сайтов - - - - - - - - Не разрешать изменять настройки защиты от отслеживания. - Блокировать скрипты майнинга. - Блокировать скрипты снятия отпечатков пальцев. - Исключения: + + + + + + + + + + + + + + Не разрешать изменять настройки защиты от отслеживания. + Блокировать скрипты майнинга. + Блокировать скрипты снятия отпечатков пальцев. + Исключения: diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index b114a53..0b4e518 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -392,6 +392,20 @@ Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息 若启用此原则，用户将无法调整 Cookie 偏好设置。 若禁用或不设定此原则，则使用者能够自行调整 Cookie 偏好设定。 + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) 若启用此原则，将允许指定来源网址访问摄像头。 若禁用或不设定此原则，则依循预设摄影机存取原则。 @@ -981,13 +995,19 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 允许网站弹出窗口 - - - - - - - + + + + + + + + + + + + + 不允许调整追踪保护偏好设置。 封锁加密货币采矿程序。 封锁数位指纹追踪程序。 diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 9495c90..36ed4d6 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -392,6 +392,20 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則，使用者將無法調整 Cookie 偏好設定。 若停用或不設定此原則，則使用者能夠自行調整 Cookie 偏好設定。 + Cookie Behavior + If this policy is enabled, you can configure cookie behavior. + +If this policy is not configured or disabled, cookies are rejected for known trackers. + Cookie Behavior in private browsing + If this policy is enabled, you can configure cookie behavior in private browsing. + +If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned. + Accept all cookies + Reject third party cookies + Reject all cookies + Reject third party cookies for sites you haven't visited + Reject cookies for known trackers + Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection) 若啟用此原則，將允許指定來源網址存取攝影機。 若停用或不設定此原則，則依循預設攝影機存取原則。 @@ -984,6 +998,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 + + + + + + -- 2.43.0 From e5d25bfd37d6b5a5d5d04c25e6a7016b6f36c16c Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:43:15 -0600 Subject: [PATCH 11/16] Add deprecated notices to old cookie options --- windows/de-DE/firefox.adml | 6 +++--- windows/es-ES/firefox.adml | 6 +++--- windows/fr-FR/firefox.adml | 6 +++--- windows/it-IT/firefox.adml | 6 +++--- windows/ru-RU/firefox.adml | 6 +++--- windows/zh-CN/firefox.adml | 6 +++--- windows/zh-TW/firefox.adml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 8d60782..6cff0b6 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -371,11 +371,11 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird Wenn Sie die Richtlinieneinstellung aktivieren, sind Cookies für die angegebenen URLs gesperrt. Wenn eine Top-Level-Domain angegeben ist (http://example.org), werden Cookies von allen Sub-Domains ebenfalls blockiert. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, sind Cookies standardmäßig nicht blockiert. - Cookies und Website-Daten annehmen + Cookies und Website-Daten annehmen (veraltet) Wenn Sie die Richtlinieneinstellung deaktivieren, werden Cookies standardmäßig nicht von Webseiten akzeptiert. Wenn Sie die Richtlinieneinstellung nicht konfigurieren oder aktivieren, werden Cookies von Websiten akzeptiert. - Cookies und Website-Daten von Drittanbietern akzeptieren + Cookies und Website-Daten von Drittanbietern akzeptieren (veraltet) Wenn Sie die Richtlinieneinstellung aktivieren und Cookies erlauben, können Sie einstellen wie Sie Cookies von Drittanbietern akzeptieren. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren oder wenn Cookies nicht erlaubt sind. @@ -386,7 +386,7 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren oder w Wenn Sie die Richtlinieneinstellung aktivieren und Cookies erlaubt sind, werden diese gelöscht sobald Firefox geschlossen wird. Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren oder wenn "Cookies und Website-Daten annehmen" deaktiviert ist wird diese Richtlinieneinstellung ignoriert. - Tracker ablehnen + Tracker ablehnen (veraltet) Wenn diese Richtlinieneinstellung aktiviert ist und Cookies aktiviert sind, werden Tracker-Cookies standardmäßig abgewiesen. Diese Einstellung wird ignoriert wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist oder Cookies durch eine andere Richtlinie oder Einstellung nicht erlaubt sind. diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 4c8a537..9f11d99 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -371,11 +371,11 @@ If this policy is disabled or not configured, the default cookie policy is follo Si esta política está habilitada, las cookies estarán bloqueadas por los orígenes indicados. Si se especifica un dominio de nivel superior (http://ejemplo.org), también se bloquearán las cookies de todos los subdominios. Si esta política está deshabilitada o no está configurada, las cookies no estarán bloqueadas de manera predeterminada. - Aceptar cookies de sitios web + Aceptar cookies de sitios web (obsoleto) Si esta política está deshabilitada, las cookies no son aceptadas por los sitios web de forma predeterminada. Si esta política no está configurada o habilitada, se aceptarán cookies de los sitios web. - Aceptar cookies de terceros + Aceptar cookies de terceros (obsoleto) Si esta política está habilitada y se permiten las cookies, podrá establecer cuándo aceptar las cookies de terceros. Esta configuración se ignora si esta política está deshabilitada o no está configurada o si las cookies no están permitidas. @@ -386,7 +386,7 @@ Esta configuración se ignora si esta política está deshabilitada o no está c Si esta política está habilitada y las cookies estarán permitidas, caducarán cuando se cierre Firefox. Esta configuración se ignora si esta política está deshabilitada o no está configurada, o si las cookies no estarán permitidas. - Bloquear rastreadores + Bloquear rastreadores (obsoleto) Si esta política está habilitada y las cookies estarán permitidas, Firefox bloqueará las cookies de rastreo de manera predeterminada. Esta configuración se ignora si esta política está deshabilitada o no está configurada, o si las cookies no estarán permitidas. diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index a23203a..bb7dfbb 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -371,11 +371,11 @@ If this policy is disabled or not configured, the default cookie policy is follo Si cette stratégie est activée, les cookies sont bloqués pour les origines indiquées. Si un domaine de premier niveau est spécifié (http://example.org), les cookies sont également bloqués pour tous les sous-domaines. Si cette stratégie est désactivée ou non configurée, les cookies ne sont pas bloqués par défaut. - Accepter les cookies des sites Web + Accepter les cookies des sites Web (Deprecated) Si cette stratégie est désactivée, les cookies des sites Web ne sont pas acceptés par défaut. Si cette stratégie n'est ni configurée ni activée, les cookies des sites Web sont acceptés. - Accepter les cookies tiers + Accepter les cookies tiers (Deprecated) Si cette stratégie est activée et que les cookies sont autorisés, vous pouvez définir quand accepter les cookies tiers. Ce paramètre est ignoré si cette stratégie est désactivée ou non configurée ou si les cookies ne sont pas autorisés. @@ -386,7 +386,7 @@ Ce paramètre est ignoré si cette stratégie est désactivée ou non configuré Si cette stratégie est activée et que les cookies sont autorisés, ils expireront à la fermeture de Firefox. Ce paramètre est ignoré si cette stratégie est désactivée ou non configurée ou si les cookies ne sont pas autorisés. - Rejet des cookies de suivi + Rejet des cookies de suivi (Deprecated) Si cette stratégie est activée et que les cookies sont autorisés, Firefox rejettera les cookies de suivi par défaut. Ce paramètre est ignoré si cette stratégie est désactivée ou non configurée ou si les cookies ne sont pas autorisés.. diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 02d35bd..63687ef 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -371,11 +371,11 @@ Se questo criterio è disabilitato o non configurato, viene seguita la politica Se questo criterio è abilitato, i cookie dai siti indicati sono bloccati. Se è specificato un dominio di primo livello (http://example.org), i cookie sono bloccati anche da tutti i sottodomini. Se questo criterio è disabilitato o non configurato, i cookie non sono bloccati per impostazione predefinita. - Accetta i cookie dai siti Web + Accetta i cookie dai siti Web (deprecata) Se questo criterio è disabilitato, i cookie dai siti Web non sono accettati per impostazione predefinita. Se questo criterio non è configurato o è abilitato, i cookie dai siti Web sono accettati. - Accetta cookie di terze parti + Accetta cookie di terze parti (deprecata) Se questo criterio è abilitato e i cookie sono consentiti, è possibile impostare quando accettare i cookie di terze parti. Quest'impostazione è ignorata se questo criterio è disabilitato o non configurato o se i cookie non sono consentiti. @@ -386,7 +386,7 @@ Quest'impostazione è ignorata se questo criterio è disabilitato o non configur Se questo criterio è abilitato e i cookie sono consentiti, questi scadranno alla chiusura di Firefox. Quest'impostazione è ignorata se questo criterio è disabilitato o non configurato o se i cookie non sono consentiti. - Rifiuta elementi traccianti + Rifiuta elementi traccianti (deprecata) Se questo criterio è abilitato e i cookie sono consentiti, Firefox rifiuterà gli elementi traccianti per impostazione predefinita. Quest'impostazione è ignorata se questo criterio è disabilitato o non configurato o se i cookie non sono consentiti. diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index 113b2fc..ba0dd69 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -371,11 +371,11 @@ Mozilla рекомендует не отключать телеметрию. И Если эта политика включена, файлы cookie блокируются для указанных источников. Если указан домен верхнего уровня (http://example.org), файлы cookie также блокируются для всех поддоменов. Если эта политика отключена или не настроена, файлы cookie по умолчанию не блокируются. - Принимать файлы cookie с веб-сайтов + Принимать файлы cookie с веб-сайтов (устарело) Если эта политика отключена, файлы cookie по умолчанию не принимаются с веб-сайтов. Если эта политика не настроена или не включена, файлы cookie принимаются с веб-сайтов. - Принимать сторонние файлы cookie + Принимать сторонние файлы cookie (устарело) Если эта политика включена и файлы cookie разрешены, вы можете указать, когда следует принимать сторонние файлы cookie. Этот параметр игнорируется, если эта политика отключена, не настроена или если файлы cookie не разрешены. @@ -386,7 +386,7 @@ Mozilla рекомендует не отключать телеметрию. И Если эта политика включена и файлы cookie разрешены, срок их действия истечет при закрытии Firefox. Этот параметр игнорируется, если эта политика отключена, не настроена или если файлы cookie не разрешены. - Отклонить трекеры + Отклонить трекеры (устарело) Если эта политика включена и файлы cookie разрешены, Firefox по умолчанию отклоняет файлы cookie трекера. Этот параметр игнорируется, если эта политика отключена или не настроена, или если файлы cookie не разрешены. diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index 0b4e518..4ba4486 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -369,11 +369,11 @@ Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息 若启用此原则，将封锁来自指定来源网址的 Cookie。 若指定了顶级域名（例如 http://example.org），也将封锁所有来自子域的 Cookie。 若禁用或不设定此原则，则默认不封锁 Cookie。 - 接受来自网站的 Cookie + 接受来自网站的 Cookie（已弃用） 若禁用此原则，将默认不接受来自网站的 Cookie。 若未启用或设定此原则，则接受来自网站的 Cookie。 - 允许第三方 Cookie + 允许第三方 Cookie（已弃用） 若接受 Cookie 并启用了此原则，将可以设置是否要接受第三方 Cookie。 若禁用或未设定此原则，或是不允许 Cookie，则忽略此设定。 @@ -384,7 +384,7 @@ Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息 若启用此原则并允许 Cookie，Cookie 将在Firefox 时失效。 若禁用或未设定此原则，或是不允许 Cookie，则忽略此设定。 - 拒绝跟踪器 + 拒绝跟踪器（已弃用） 若启用此原则并允许 Cookie，Firefox 将默认拒绝跟踪器 Cookie。 若禁用或未设定此原则，或是不允许 Cookie，则忽略此设定。 diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 36ed4d6..a09284f 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -369,11 +369,11 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則，將封鎖來自指定來源網址的 Cookie。若指定了頂級網域名稱（例如 http://example.org），也將封鎖所有來自子網域的 Cookie。 若停用或不設定此原則，則預設不封鎖 Cookie。 - 接受來自網站的 Cookie + 接受來自網站的 Cookie（已棄用） 若停用此原則，將預設不接受來自網站的 Cookie。 若未啟用或設定此原則，則接受來自網站的 Cookie。 - 允許第三方 Cookie + 允許第三方 Cookie（已棄用） 若接受 Cookie 並啟用了此原則，將可以設定是否要接受第三方 Cookie。 若停用或未設定此原則，或是不允許 Cookie，則忽略此設定。 @@ -384,7 +384,7 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用此原則並允許 Cookie，Cookie 將在 Firefox 時失效。 若停用或未設定此原則，或是不允許 Cookie，則忽略此設定。 - 拒絕追蹤器 + 拒絕追蹤器（已棄用） 若啟用此原則並允許 Cookie，Firefox 將預設拒絕追蹤器 Cookie。 若停用或未設定此原則，或是不允許 Cookie，則忽略此設定。 -- 2.43.0 From ca0bceeb927755806f55c4159ba32e3f55f153f8 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 15:46:59 -0600 Subject: [PATCH 12/16] Bump version for release --- windows/de-DE/firefox.adml | 2 +- windows/en-US/firefox.adml | 2 +- windows/es-ES/firefox.adml | 2 +- windows/firefox.admx | 4 ++-- windows/fr-FR/firefox.adml | 2 +- windows/it-IT/firefox.adml | 2 +- windows/ru-RU/firefox.adml | 2 +- windows/zh-CN/firefox.adml | 2 +- windows/zh-TW/firefox.adml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 6cff0b6..dd9063f 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index f4e0f83..f6771c0 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 9f11d99..5fb0e6f 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/firefox.admx b/windows/firefox.admx index 104f75e..42da413 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -1,10 +1,10 @@  - + - + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index bb7dfbb..176804f 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 63687ef..96cf9ae 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml index ba0dd69..3e6bf67 100644 --- a/windows/ru-RU/firefox.adml +++ b/windows/ru-RU/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml index 4ba4486..34087ab 100644 --- a/windows/zh-CN/firefox.adml +++ b/windows/zh-CN/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index a09284f..64c72fa 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -1,5 +1,5 @@ - + -- 2.43.0 From 8eeb0097159d76bbbdc0dc36d9a6c488a0c10a38 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 8 Dec 2021 16:00:38 -0600 Subject: [PATCH 13/16] Add example of user pref --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acf671d..c3341ff 100644 --- a/README.md +++ b/README.md @@ -4240,7 +4240,7 @@ Default preferences can be modified by the user. If a value is locked, it is also set as the default. -User preferences persist across invocations of Firefox. It is the equivalent of a user setting the preference. They are most useful when a preference is needed very early in startup so it can't be set as default by policy. +User preferences persist across invocations of Firefox. It is the equivalent of a user setting the preference. They are most useful when a preference is needed very early in startup so it can't be set as default by policy. An example of this is ```toolkit.legacyUserProfileCustomizations.stylesheets```. User preferences persist even if the policy is removed, so if you need to remove them, you should use the clear policy. -- 2.43.0 From bce2e7c83f74ac262fab4471693a11f789b6f59e Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Tue, 14 Dec 2021 09:07:39 -0600 Subject: [PATCH 14/16] Fix a few typos --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c3341ff..090e9b7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ -**These policies are in active development and so might contain changes that do not work with current versions of Firefox.** - -**You should use the [officially released versions](https://github.com/mozilla/policy-templates/releases) if you are deploying changes.** - Policies can be specified using the [Group Policy templates on Windows](https://github.com/mozilla/policy-templates/tree/master/windows), [Intune on Windows](https://support.mozilla.org/kb/managing-firefox-intune), [configuration profiles on macOS](https://github.com/mozilla/policy-templates/tree/master/mac), or by creating a file called `policies.json`. On Windows, create a directory called `distribution` where the EXE is located and place the file there. On Mac, the file goes into `Firefox.app/Contents/Resources/distribution`. On Linux, the file goes into `firefox/distribution`, where `firefox` is the installation directory for firefox, which varies by distribution or you can specify system-wide policy by placing the file in `/etc/firefox/policies`. | Policy Name | Description @@ -90,10 +86,10 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`SanitizeOnShutdown` (Selective)](#sanitizeonshutdown-selective)** | Clear data on shutdown. | **[`SearchBar`](#searchbar)** | Set whether or not search bar is displayed. | **[`SearchEngines`](#searchengines-this-policy-is-only-available-on-the-esr)** | +| **[`SearchEngines -> Add`](#searchengines--add)** | Add new search engines. | **[`SearchEngines -> Default`](#searchengines--default)** | Set the default search engine. | **[`SearchEngines -> PreventInstalls`](#searchengines--preventinstalls)** | Prevent installing search engines from webpages. | **[`SearchEngines -> Remove`](#searchengines--remove)** | Hide built-in search engines. -| **[`SearchEngines -> Add`](#searchengines--add)** | Add new search engines. | **[`SearchSuggestEnabled`](#searchsuggestenabled)** | Enable search suggestions. | **[`SecurityDevices`](#securitydevices)** | Install PKCS #11 modules. | **[`ShowHomeButton`](#showhomebutton)** | Show the home button on the toolbar. @@ -4229,7 +4225,7 @@ as well as the following security preferences: | security.tls.version.enable-deprecated | boolean | false |     If true, browser will accept TLS 1.0. and TLS 1.1 (Firefox 86, Firefox 78.8). | security.warn_submit_secure_to_insecure | boolean | true -|     If false, no warning is shown when submitting s form from https to http. +|     If false, no warning is shown when submitting a form from https to http.   Using the preference as the key, set the `Value` to the corresponding preference value. @@ -5454,7 +5450,7 @@ Prevent Firefox from messaging the user in certain situations. `ExtensionRecommendations` If false, don't recommend extensions while the user is visiting web pages. -`FeatureRecommendations` IF false, don't recommend browser features. +`FeatureRecommendations` If false, don't recommend browser features. `UrlbarInterventions` If false, Don't offer Firefox specific suggestions in the URL bar. -- 2.43.0 From 867f28814be78428f3de7f961752819597b7af1e Mon Sep 17 00:00:00 2001 From: maiki Date: Tue, 21 Dec 2021 12:29:22 -0800 Subject: [PATCH 15/16] Alphabetize AllowedDomainsForApps Now it matches the table listing, as well. :sunglasses: --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 090e9b7..e8af2a7 100644 --- a/README.md +++ b/README.md @@ -104,86 +104,86 @@ Policies can be specified using the [Group Policy templates on Windows](https:// Allow WebExtensions to configure policy. For more information, see [Adding policy support to your extension](https://extensionworkshop.com/documentation/enterprise/adding-policy-support-to-your-extension/). -### AppAutoUpdate - -Enable or disable **automatic** application update. +### AllowedDomainsForApps -If set to true, application updates are installed without user approval within Firefox. The operating system might still require approval. +Define domains allowed to access Google Workspace. -If set to false, application updates are downloaded but the user can choose when to install the update. +This policy is based on the [Chrome policy](https://chromeenterprise.google/policies/#AllowedDomainsForApps) of the same name. -If you have disabled updates via `DisableAppUpdate`, this policy has no effect. +If this policy is enabled, users can only access Google Workspace using accounts from the specified domains. If you want to allow Gmail, you can add ```consumer_accounts``` to the list. -**Compatibility:** Firefox 75, Firefox ESR 68.7\ +**Compatibility:** Firefox 89, Firefox ESR 78.11\ **CCK2 Equivalent:** N/A\ -**Preferences Affected:** `app.update.auto` +**Preferences Affected:** N/A #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\AppAutoUpdate = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\AllowedDomainsForApps = "managedfirefox.com,example.com" ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AppAutoUpdate +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AllowedDomainsForApps ``` Value (string): ``` - or + + ``` #### macOS ``` - AppAutoUpdate - | + AllowedDomainsForApps + managedfirefox.com,example.com ``` #### policies.json ``` { "policies": { - "AppAutoUpdate": true | false + "AllowedDomainsForApps": "managedfirefox.com,example.com" } } ``` -### AllowedDomainsForApps +### AppAutoUpdate -Define domains allowed to access Google Workspace. +Enable or disable **automatic** application update. -This policy is based on the [Chrome policy](https://chromeenterprise.google/policies/#AllowedDomainsForApps) of the same name. +If set to true, application updates are installed without user approval within Firefox. The operating system might still require approval. -If this policy is enabled, users can only access Google Workspace using accounts from the specified domains. If you want to allow Gmail, you can add ```consumer_accounts``` to the list. +If set to false, application updates are downloaded but the user can choose when to install the update. -**Compatibility:** Firefox 89, Firefox ESR 78.11\ +If you have disabled updates via `DisableAppUpdate`, this policy has no effect. + +**Compatibility:** Firefox 75, Firefox ESR 68.7\ **CCK2 Equivalent:** N/A\ -**Preferences Affected:** N/A +**Preferences Affected:** `app.update.auto` #### Windows (GPO) ``` -Software\Policies\Mozilla\Firefox\AllowedDomainsForApps = "managedfirefox.com,example.com" +Software\Policies\Mozilla\Firefox\AppAutoUpdate = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: ``` -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AllowedDomainsForApps +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AppAutoUpdate ``` Value (string): ``` - - + or ``` #### macOS ``` - AllowedDomainsForApps - managedfirefox.com,example.com + AppAutoUpdate + | ``` #### policies.json ``` { "policies": { - "AllowedDomainsForApps": "managedfirefox.com,example.com" + "AppAutoUpdate": true | false } } ``` -- 2.43.0 From c8b948fb9ecedb12c7c5fcd1555a666da93f8634 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Fri, 7 Jan 2022 15:33:10 -0600 Subject: [PATCH 16/16] README updates for samesite --- README.md | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/README.md b/README.md index e8af2a7..f454d04 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,8 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`Homepage`](#homepage)** | Configure the default homepage and how Firefox starts. | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed. | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation. +| **[`LegacySameSiteCookieBehaviorEnabled`](#legacysamesitecookiebehaviorenabled)** | Enable default legacy SameSite cookie behavior setting. +| **[`LegacySameSiteCookieBehaviorEnabledForDomainList`](#legacysamesitecookiebehaviorenabledfordomainlist)** | Revert to legacy SameSite behavior for cookies on specified sites. | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin. | **[`ManagedBookmarks`](#managedbookmarks)** | Configures a list of bookmarks managed by an administrator that cannot be changed by the user. | **[`ManualAppUpdateOnly`](#manualappupdateonly)** | Allow manual updates only and do not notify the user about updates.. @@ -3207,6 +3209,85 @@ Value (string): ``` or ``` +### LegacySameSiteCookieBehaviorEnabled +Enable default legacy SameSite cookie behavior setting. + +If this policy is set to true, it to revert all cookies to legacy SameSite behavior. + +**Compatibility:** Firefox 96\ +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** N/A + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\LegacySameSiteCookieBehaviorEnabled = = 0x1 | 0x0 +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/LegacySameSiteCookieBehaviorEnabled +``` +Value (string): +``` + or +``` +#### macOS +``` + + LegacySameSiteCookieBehaviorEnabled + | + +``` +#### policies.json +``` +{ + "policies": { + "LegacySameSiteCookieBehaviorEnabled": true | false +} +``` +### LegacySameSiteCookieBehaviorEnabledForDomainList +Revert to legacy SameSite behavior for cookies on specified sites. + +If this policy is set to true, cookies set for domains in this list will revert to legacy SameSite behavior. + +**Compatibility:** Firefox 96\ +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** N/A + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\LegacySameSiteCookieBehaviorEnabledForDomainList\1 = "example.org" +Software\Policies\Mozilla\Firefox\LegacySameSiteCookieBehaviorEnabledForDomainList\2 = "example.edu" +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/LegacySameSiteCookieBehaviorEnabledForDomainList +``` +Value (string): +``` + + +``` +#### macOS +``` + + LegacySameSiteCookieBehaviorEnabledForDomainList + + example.org + example.edu + + +``` +#### policies.json +``` +{ + "policies": { + "LegacySameSiteCookieBehaviorEnabledForDomainList": ["example.org", + "example.edu"] + } +} +``` ### LocalFileLinks Enable linking to local files by origin. -- 2.43.0