EmailTracker support

diff --git a/README.md b/README.md
index c4aa88ff3ce76869d042e72e73ad1d545533c8c1..2be59fcba51f4c87ab130854753202aa603d0ebb 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2415,6 +2415,8 @@ If `Cryptomining` is set to true, cryptomining scripts on websites are blocked.
 
 If `Fingerprinting` is set to true, fingerprinting scripts on websites are blocked.
 
+If `EmailTracking` is set to true, hidden email tracking pixels and scripts on websites are blocked. (Firefox 112)
+
 `Exceptions` are origins for which tracking protection is not enabled.
 
 **Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5)\

diff --git a/linux/policies.json b/linux/policies.json
index e39b34cfffbf3a885a2289a4d4bd484cf7ba9f25..c38d88f6377ddd7f2dc2b62c582f523139abde79 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -96,6 +96,7 @@
       "Locked": true | false,
       "Cryptomining": true | false,
       "Fingerprinting": true | false,
+      "EmailTracking": true | false,
       "Exceptions": ["https://example.com"]
     },
     "EncryptedMediaExtensions": {

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index a2b21c10e6e532b9f0148ddbd48728cb1b1acb92..9e05b66a3d9f076f1449054e5c6d1710862adfc2 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -226,6 +226,8 @@
                <true/>
                <key>Fingerprinting</key>
                <true/>
+               <key>EmailTracking</key>
+               <true/>
                <key>Exceptions</key>
                <array>
                        <string>https://example.com</string>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 327cef8f8e1fc8bbadf3e20516c1386481e55aee..5a8681653a8b8cf3233a0f352e09efef7acb4259 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -748,6 +748,10 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, gelte
       <string id="TrackingProtection_Locked_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können Nutzer keine Änderungen an den Einstellungen zum Schutz vor Aktivitätenverfolgung vornehmen.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, kann der Nutzer Änderungen an den Einstellungen vornehmen.</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">Angefordertes Gebietsschema</string>
       <string id="RequestedLocalesString">Angefordertes Gebietsschema (Zeichenfolge)</string>
       <string id="RequestedLocales_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können Sie eine Liste der angeforderten Gebietsschemata für die Anwendung in der Reihenfolge ihrer Präferenz angeben. Dadurch wird das entsprechende Sprachpaket aktiv.

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7967a8d70ee339a177fe245fd80fc87a4d4592fe..27323b3874218b1831e9a400ce79a571acc0baac 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -748,6 +748,10 @@ If this policy is disabled or not configured, tracking protection is enabled for
       <string id="TrackingProtection_Locked_Explain">If this policy is enabled, tracking protection preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, the user can change tracking protection preferences.</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">Requested locale</string>
       <string id="RequestedLocalesString">Requested locale (string)</string>
       <string id="RequestedLocales_Explain">If this policy is enabled, you can specify a list of requested locales for the application in order of preference. It will cause the corresponding language pack to become active.

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index f4b120be6e23d50bc54de59b10679b5d3f099fcf..b35467395a10f71130f9452d2a0ce14fcd602072 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -750,6 +750,10 @@ Si esta política está deshabilitada o no está configurada, la protección con
       <string id="TrackingProtection_Locked_Explain">Si esta política está habilitada, el usuario no podrá cambiar las preferencias de protección contra rastreo.
 
 Si esta política está deshabilitada o no está configurada, el usuario podrá cambiar las preferencias de protección contra rastreo.</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">Solicitud de localización</string>
       <string id="RequestedLocalesString">Solicitud de localización (cadena)</string>
       <string id="RequestedLocales_Explain">Si esta política está habilitada, podrá especificar una lista de las localizaciones solicitadas para la aplicación en orden de preferencia. Esto hará que el paquete de idioma correspondiente se active.

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 8eb82c57a9c8f4e40297b235f38a98b760e97780..c9beebc24a4c58c66d1a7910322f355e56cab262 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3647,6 +3647,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="F_TrackingProtection_EmailTracking" class="Both" displayName="$(string.TrackingProtection_EmailTracking)" explainText="$(string.TrackingProtection_EmailTracking_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="EmailTracking">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF112"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="UserMessaging_WhatsNew" class="Both" displayName="$(string.UserMessaging_WhatsNew)" explainText="$(string.UserMessaging_WhatsNew_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="WhatsNew">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75_ONLY"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index a0c63296d12b40d1a5b01299483a0e2fdbc7cec9..964c76ef3fec88af49e5a4522d1b65646899787f 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -749,6 +749,10 @@ Si cette stratégie est désactivée ou n'est pas configurée, la protection con
       <string id="TrackingProtection_Locked_Explain">Si cette politique est activée, les préférences de protection du suivi ne peuvent pas être modifiées par l'utilisateur.\r
 \r
 Si cette stratégie est désactivée ou n'est pas configurée, l'utilisateur peut modifier les préférences de protection du suivi.</string>\r
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>\r
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.\r
+\r
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>\r
       <string id="RequestedLocales">liste des paramètres régionaux</string>\r
       <string id="RequestedLocalesString">liste des paramètres régionaux (string)</string>\r
       <string id="RequestedLocales_Explain">Si cette stratégie est activée, vous pouvez spécifier une liste des paramètres régionaux demandés pour l'application par ordre de préférence. Le module linguistique correspondant deviendra actif.\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 52fc3544a5e3e7bfa3b0941b9bdf247c35328ad4..3af6e8178c57a91da4bcee5e856855bfa96a0cfb 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -750,6 +750,10 @@ Se questo criterio è disabilitato o non configurato, la protezione antitracciam
       <string id="TrackingProtection_Locked_Explain">Se questo criterio è abilitato, le preferenze relative alla protezione antitracciamento non possono essere modificate dall'utente.
 
 Se questo criterio è disabilitato o non configurato, l'utente può modificare le preferenze relative alla protezione antitracciamento.</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">Lingua richiesta</string>
       <string id="RequestedLocalesString">Lingua richiesta (stringa)</string>
       <string id="RequestedLocales_Explain">Se questo criterio è abilitato, è possibile specificare un elenco di lingue richieste per l'applicazione in ordine di preferenza. Il pacchetto lingue corrispondente sarà attivato.

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 0e00955f042ea1458e3324b89b529b83bebbfae7..c6296ce870e8ba7789519decdb9075266a74a9cd 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -750,6 +750,10 @@ If this policy is disabled or not configured, the bookmarks toolbar is displayed
       <string id="TrackingProtection_Locked_Explain">Если эта политика включена, пользователь не может изменить настройки защиты от отслеживания.
 
 Если эта политика отключена или не настроена, пользователь может изменить настройки защиты от отслеживания.</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">Запрошенный языковой стандарт</string>
       <string id="RequestedLocalesString">Запрошенный языковой стандарт (строка)</string>
       <string id="RequestedLocales_Explain">Если эта политика включена, вы можете указать список запрошенных локалей для приложения в порядке предпочтения. Это приведет к активации соответствующего языкового пакета.

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index fc66ac76ca3772001f0241559851ea0dc9806b89..3b2832b3cf82dbf07184524debc7aaa590867dbd 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -736,10 +736,6 @@ If this policy is disabled or not configured, Firefox will offer to save passwor
    <string id="TrackingProtection_Cryptomining_Explain">若启用此原则，将封锁使用加密货币采矿程序的指令码。
 
 若禁用或不设定此原则，则不会封锁使用加密货币采矿程序的指令码。 </string>
-   <string id="TrackingProtection_Fingerprinting">数字指纹追踪程序</string>
-   <string id="TrackingProtection_Fingerprinting_Explain">若启用此原则，将封锁使用数字指纹追踪程序的指令码。
-
-若禁用或不设定此原则，则不会封锁使用数字指纹追踪程序的指令码。 </string>
    <string id="TrackingProtection_Exceptions">例外网址</string>
    <string id="TrackingProtection_Exceptions_Explain">若启用此原则，可针对指定的来源不开启追踪保护功能。
 
@@ -748,6 +744,14 @@ If this policy is disabled or not configured, Firefox will offer to save passwor
    <string id="TrackingProtection_Locked_Explain">若启用此原则，用户将无法调整追踪保护功能偏好设定。
 
 若禁用或不设定此原则，用户则可以调整追踪保护功能偏好设定。 </string>
+   <string id="TrackingProtection_Fingerprinting">数字指纹追踪程序</string>
+   <string id="TrackingProtection_Fingerprinting_Explain">若启用此原则，将封锁使用数字指纹追踪程序的指令码。
+
+若禁用或不设定此原则，则不会封锁使用数字指纹追踪程序的指令码。 </string>
+   <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+   <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
    <string id="RequestedLocales">请求语系</string>
    <string id="RequestedLocalesString">请求语系（字串）</string>
    <string id="RequestedLocales_Explain">若启用此原则，您可以指定要由应用程序显示的语系顺序清单。 将使得对应的语言套件生效。 

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 06d8922c72d7d13e19d11d29938e3225d89253ae..60fd006f563a23dffb2e4a480cc5562cfb14622b 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -748,6 +748,10 @@ If this policy is disabled or not configured, Firefox will offer to save passwor
       <string id="TrackingProtection_Locked_Explain">若啟用此原則，使用者將無法調整追蹤保護功能偏好設定。
 
 若停用或不設定此原則，使用者則可以調整追蹤保護功能偏好設定。</string>
+      <string id="TrackingProtection_EmailTracking">Email Tracking</string>
+      <string id="TrackingProtection_EmailTracking_Explain">If this policy is enabled, hidden email tracking pixels and scripts on websites are blocked.
+
+If this policy is disabled or not configured, hidden email tracking pixels and scripts on websites are not blocked.</string>
       <string id="RequestedLocales">請求語系</string>
       <string id="RequestedLocalesString">請求語系（字串）</string>
       <string id="RequestedLocales_Explain">若啟用此原則，您可以指定要由應用程式顯示的語系順序清單。將使得對應的語言套件生效。