Tracking Protection Exceptions

diff --git a/docs/index.md b/docs/index.md
index f1b56e0c0c2e8db2ba179cd7b1efd435979f5543..9d40284c8734ccfc74034d5848beb7ad95ccf872 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -2892,7 +2892,9 @@ If this policy is not configured, tracking protection is not enabled by default
 
 If `Value` is set to false, tracking protection is disabled and locked in both the regular browser and private browsing.
 
 
 If `Value` is set to false, tracking protection is disabled and locked in both the regular browser and private browsing.
 

-If `Value` is set to true, tracking protection is enabled by default in both the regular browser and private browsing and the `Locked` value determines whether or not a user can change it.
+If `Value` is set to true, tracking protection is enabled by default in both the regular browser and private browsing.
+
+If `Locked` is set to true, users cannot change tracking protection values.

 
 If `Cryptomining` is set to true, cryptomining scripts on websites are blocked.
 
 
 If `Cryptomining` is set to true, cryptomining scripts on websites are blocked.
 


@@ -2906,9 +2908,15 @@ If `SuspectedFingerprinting` is set to true, Firefox reduces the amount of infor
 
 `Category` can be either ```strict``` or ```standard```. If category is set, it overrides all other settings except `Exceptions` and the user cannot change the category. (Firefox 142, Firefox ESR 140.2)
 
 
 `Category` can be either ```strict``` or ```standard```. If category is set, it overrides all other settings except `Exceptions` and the user cannot change the category. (Firefox 142, Firefox ESR 140.2)
 

-**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5. Category added in Firefox 142/140.2.)\
+IF `BaselineExceptions` is true, Firefox will automatically apply exceptions required to avoid major website breakage. (Firefox 145)
+
+If `ConvenienceExceptions`is true, Firefox will apply exceptions automatically that are only required to fix minor issues and make convenience features available. (Firefox 145)
+
+Note: Users can change `BaselineExceptions` and `ConvenienceExceptions` even when `Category` is set to ```strict``` unless `Locked` is set to true.
+
+**Compatibility:** Firefox 60, Firefox ESR 60 (Cryptomining and Fingerprinting added in 70/68.2, Exceptions added in 73/68.5. Category added in Firefox 142/140.2. BaselineExceptions and ConvenienceExceptions added in Firefox 145)\

 **CCK2 Equivalent:** N/A\
 **CCK2 Equivalent:** N/A\

-**Preferences Affected:** `privacy.trackingprotection.enabled`, `privacy.trackingprotection.pbmode.enabled`, `privacy.trackingprotection.cryptomining.enabled`, `privacy.trackingprotection.fingerprinting.enabled`
+**Preferences Affected:** `privacy.trackingprotection.enabled`, `privacy.trackingprotection.pbmode.enabled`, `privacy.trackingprotection.cryptomining.enabled`, `privacy.trackingprotection.fingerprinting.enabled`, `privacy.fingerprintingProtection`, `privacy.trackingprotection.emailtracking.enabled`, `privacy.trackingprotection.emailtracking.pbmode.enabled`, `privacy.trackingprotection.allow_list.baseline.enabled`, `privacy.trackingprotection.allow_list.convenience.enabled`

 
 #### Windows (GPO)
 ```
 
 #### Windows (GPO)
 ```

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 341b7a0f06c316f48a08cc51a081fc74eba673a6..c766e4f2c55c90201916d9d392d50e0986578530 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -81,6 +81,7 @@
       <string id="SUPPORTED_FF142">Firefox 142 oder höher, Firefox 140.2 ESR oder höher</string>
       <string id="SUPPORTED_FF144">Firefox 144 oder höher, Firefox 140.4 ESR oder höher</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 oder höher</string>
       <string id="SUPPORTED_FF142">Firefox 142 oder höher, Firefox 140.2 ESR oder höher</string>
       <string id="SUPPORTED_FF144">Firefox 144 oder höher, Firefox 140.4 ESR oder höher</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 oder höher</string>

+      <string id="SUPPORTED_FF145_ONLY">Firefox 145 oder höher</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>


@@ -818,6 +819,14 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, reduziert Firefox die Menge an Informationen, die Websites zur Verfügung gestellt werden, um potenzielle Fingerprinting-Versuche zu verhindern.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, reduziert Firefox die bereitgestellten Informationen für verdächtiges Fingerprinting nicht.</string>
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, reduziert Firefox die Menge an Informationen, die Websites zur Verfügung gestellt werden, um potenzielle Fingerprinting-Versuche zu verhindern.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, reduziert Firefox die bereitgestellten Informationen für verdächtiges Fingerprinting nicht.</string>

+      <string id="TrackingProtection_BaselineExceptions">Grundlegende Ausnahmen</string>
+      <string id="TrackingProtection_BaselineExceptions_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, wendet Firefox automatisch die erforderlichen Ausnahmen an, um schwerwiegende Website-Fehler zu vermeiden.
+
+Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wendet Firefox die erforderlichen Ausnahmen zur Vermeidung schwerwiegender Website-Fehler nicht automatisch an.</string>
+      <string id="TrackingProtection_ConvenienceExceptions">Komfortausnahmen</string>
+      <string id="TrackingProtection_ConvenienceExceptions_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, wendet Firefox automatisch Ausnahmen an, die nur erforderlich sind, um kleinere Probleme zu beheben und Komfortfunktionen verfügbar zu machen.
+
+Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wendet Firefox solche Ausnahmen nicht automatisch an.</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.
       <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 7b404aa09c93e4725bcbe5c5953f6d35bc05813f..fdd1fd2d95f2f668a644eb632725ea3d06a05bdd 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -81,6 +81,7 @@
       <string id="SUPPORTED_FF142">Firefox 142 or later, Firefox 140.2 ESR or later</string>
       <string id="SUPPORTED_FF144">Firefox 144 or later, Firefox 140.4 ESR or later</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 or later</string>
       <string id="SUPPORTED_FF142">Firefox 142 or later, Firefox 140.2 ESR or later</string>
       <string id="SUPPORTED_FF144">Firefox 144 or later, Firefox 140.4 ESR or later</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 or later</string>

+      <string id="SUPPORTED_FF145_ONLY">Firefox 145 or later</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>


@@ -818,6 +819,14 @@ If this policy is disabled or not configured, the default tracking protection mo
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">If this policy is enabled, Firefox reduces the amount of information exposed to websites to protect against potential fingerprinting attempts.
 
 If this policy is disabled or not configured, Firefox does not reduce information exposure for suspected fingerprinting.</string>
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">If this policy is enabled, Firefox reduces the amount of information exposed to websites to protect against potential fingerprinting attempts.
 
 If this policy is disabled or not configured, Firefox does not reduce information exposure for suspected fingerprinting.</string>

+      <string id="TrackingProtection_BaselineExceptions">Baseline Exceptions</string>
+      <string id="TrackingProtection_BaselineExceptions_Explain">If this policy is enabled, Firefox will automatically apply exceptions required to avoid major website breakage.
+
+If this policy is disabled or not configured, Firefox will not automatically apply exceptions required to avoid major website breakage.</string>
+      <string id="TrackingProtection_ConvenienceExceptions">Convenience Exceptions</string>
+      <string id="TrackingProtection_ConvenienceExceptions_Explain">If this policy is enabled, Firefox will apply exceptions automatically that are only required to fix minor issues and make convenience features available.
+
+If this policy is disabled or not configured, Firefox will not Firefox will apply exceptions automatically that are only required to fix minor issues and make convenience features available.</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.
       <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/firefox.admx b/windows/firefox.admx
index 8080e419febf867542d3b9c542ef4d91145785b6..e70f5086f8a15932fbf803c5d008a663c1445dc5 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -83,6 +83,7 @@
       <definition name="SUPPORTED_FF142" displayName="$(string.SUPPORTED_FF142)"/>
       <definition name="SUPPORTED_FF144" displayName="$(string.SUPPORTED_FF144)"/>
       <definition name="SUPPORTED_FF144_ONLY" displayName="$(string.SUPPORTED_FF144_ONLY)"/>
       <definition name="SUPPORTED_FF142" displayName="$(string.SUPPORTED_FF142)"/>
       <definition name="SUPPORTED_FF144" displayName="$(string.SUPPORTED_FF144)"/>
       <definition name="SUPPORTED_FF144_ONLY" displayName="$(string.SUPPORTED_FF144_ONLY)"/>

+      <definition name="SUPPORTED_FF145_ONLY" displayName="$(string.SUPPORTED_FF145_ONLY)"/>

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


@@ -3723,6 +3724,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="I_TrackingProtection_BaselineExceptions" class="Both" displayName="$(string.TrackingProtection_BaselineExceptions)" explainText="$(string.TrackingProtection_BaselineExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="BaselineExceptions">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="J_TrackingProtection_ConvenienceExceptions" class="Both" displayName="$(string.TrackingProtection_ConvenienceExceptions)" explainText="$(string.TrackingProtection_ConvenienceExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\EnableTrackingProtection" valueName="ConvenienceExceptions">
+      <parentCategory ref="TrackingProtection"/>
+      <supportedOn ref="SUPPORTED_FF144_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

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

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 53c7ff5c6a68f619ae85e84ac90406e9824c6e8e..7ce0c29989e2c9498130dc280c3d72ea8789a56c 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -81,6 +81,7 @@
       <string id="SUPPORTED_FF142">Firefox 142 ou supérieur, Firefox 140.2 ESR ou supérieur</string>
       <string id="SUPPORTED_FF144">Firefox 144 ou supérieur, Firefox 140.4 ESR ou supérieur</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 ou supérieur</string>
       <string id="SUPPORTED_FF142">Firefox 142 ou supérieur, Firefox 140.2 ESR ou supérieur</string>
       <string id="SUPPORTED_FF144">Firefox 144 ou supérieur, Firefox 140.4 ESR ou supérieur</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 ou supérieur</string>

+      <string id="SUPPORTED_FF145_ONLY">Firefox 145 ou supérieur</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Caméra</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Caméra</string>


@@ -818,6 +819,14 @@ Si cette stratégie est désactivée ou non configurée, le mode de protection c
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Si cette stratégie est activée, Firefox réduit la quantité d’informations exposées aux sites Web afin de se protéger contre les tentatives potentielles d’empreinte numérique.
 
 Si cette stratégie est désactivée ou non configurée, Firefox ne réduit pas les informations exposées pour les cas d’empreinte numérique suspectée.</string>
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Si cette stratégie est activée, Firefox réduit la quantité d’informations exposées aux sites Web afin de se protéger contre les tentatives potentielles d’empreinte numérique.
 
 Si cette stratégie est désactivée ou non configurée, Firefox ne réduit pas les informations exposées pour les cas d’empreinte numérique suspectée.</string>

+      <string id="TrackingProtection_BaselineExceptions">Exceptions de base</string>
+      <string id="TrackingProtection_BaselineExceptions_Explain">Si cette stratégie est activée, Firefox appliquera automatiquement les exceptions nécessaires pour éviter les défaillances majeures des sites web.
+
+Si cette stratégie est désactivée ou non configurée, Firefox n’appliquera pas automatiquement les exceptions nécessaires pour éviter les défaillances majeures des sites web.</string>
+      <string id="TrackingProtection_ConvenienceExceptions">Exceptions de commodité</string>
+      <string id="TrackingProtection_ConvenienceExceptions_Explain">Si cette stratégie est activée, Firefox appliquera automatiquement les exceptions nécessaires pour corriger de petits problèmes et rendre certaines fonctionnalités pratiques disponibles.
+
+Si cette stratégie est désactivée ou non configurée, Firefox n’appliquera pas automatiquement ces exceptions.</string>

       <string id="RequestedLocales">Langue demandée</string>
       <string id="RequestedLocalesString">Langue demandée (chaîne)</string>
       <string id="RequestedLocales_Explain">Si cette stratégie est activée, vous pouvez spécifier une liste de langues demandées pour l'application, par ordre de préférence. Cela activera le pack linguistique correspondant.
       <string id="RequestedLocales">Langue demandée</string>
       <string id="RequestedLocalesString">Langue demandée (chaîne)</string>
       <string id="RequestedLocales_Explain">Si cette stratégie est activée, vous pouvez spécifier une liste de langues demandées pour l'application, par ordre de préférence. Cela activera le pack linguistique correspondant.

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index b14122258625b838f437ec30044bdf7cb33779b8..9c4d8d7d6f7958959eaa01730e93338c16253367 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -82,6 +82,7 @@
       <string id="SUPPORTED_FF142">Firefox 142 или более поздние версии, Firefox 140.2 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF144">Firefox 144 или более поздние версии, Firefox 140.4 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 или более поздние версии</string>
       <string id="SUPPORTED_FF142">Firefox 142 или более поздние версии, Firefox 140.2 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF144">Firefox 144 или более поздние версии, Firefox 140.4 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF144_ONLY">Firefox 144 или более поздние версии</string>

+      <string id="SUPPORTED_FF145_ONLY">Firefox 145 или более поздние версии</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Разрешения</string>
       <string id="Camera_group">Камера</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Разрешения</string>
       <string id="Camera_group">Камера</string>


@@ -821,6 +822,14 @@ Mozilla рекомендует не отключать телеметрию. И
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Если эта политика включена, Firefox уменьшает объём информации, предоставляемой веб-сайтам, чтобы защититься от возможных попыток снятия отпечатков.
 
 Если эта политика отключена или не настроена, Firefox не ограничивает объём предоставляемой информации для случаев подозрительного снятия отпечатков.</string>
       <string id="TrackingProtection_SuspectedFingerprinting_Explain">Если эта политика включена, Firefox уменьшает объём информации, предоставляемой веб-сайтам, чтобы защититься от возможных попыток снятия отпечатков.
 
 Если эта политика отключена или не настроена, Firefox не ограничивает объём предоставляемой информации для случаев подозрительного снятия отпечатков.</string>

+      <string id="TrackingProtection_BaselineExceptions">Базовые исключения</string>
+      <string id="TrackingProtection_BaselineExceptions_Explain">Если эта политика включена, Firefox автоматически применяет исключения, необходимые для предотвращения серьезных сбоев работы веб-сайтов.
+
+Если эта политика отключена или не настроена, Firefox не будет автоматически применять исключения, необходимые для предотвращения серьезных сбоев работы веб-сайтов.</string>
+      <string id="TrackingProtection_ConvenienceExceptions">Исключения для удобства</string>
+      <string id="TrackingProtection_ConvenienceExceptions_Explain">Если эта политика включена, Firefox автоматически применяет исключения, которые нужны только для устранения незначительных проблем и включения дополнительных удобных функций.
+
+Если эта политика отключена или не настроена, Firefox не будет автоматически применять такие исключения.</string>

       <string id="RequestedLocales">Запрошенный языковой стандарт</string>
       <string id="RequestedLocalesString">Запрошенный языковой стандарт (строка)</string>
       <string id="RequestedLocales_Explain">Если эта политика включена, вы можете указать список запрошенных локалей для приложения в порядке предпочтения. Это приведет к активации соответствующего языкового пакета.
       <string id="RequestedLocales">Запрошенный языковой стандарт</string>
       <string id="RequestedLocalesString">Запрошенный языковой стандарт (строка)</string>
       <string id="RequestedLocales_Explain">Если эта политика включена, вы можете указать список запрошенных локалей для приложения в порядке предпочтения. Это приведет к активации соответствующего языкового пакета.