Add support for new Cookie Behavior policy

diff --git a/README.md b/README.md
index d9bc93ba059b695993d47821e1031ea8da756610..acf671da2321511b460231b1622079767e17eb83 100644 (file)
--- 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.
 
 
 `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.
 
 
 `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.
 
 
 `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\
 **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)
 ```
 
 #### 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\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)
 Software\Policies\Mozilla\Firefox\Cookies\Locked = 0x1 | 0x0
 ```
 #### Windows (Intune)


@@ -985,6 +1000,24 @@ Value (string):
 ```
 <enabled/> or <disabled/>
 ```
 ```
 <enabled/> or <disabled/>
 ```

+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_Behavior
+```
+Value (string):
+```
+<enabled/>
+<data id="Cookies_Behavior" value="accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign"/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Cookies/Cookies_BehaviorPrivateBrowsing
+```
+Value (string):
+```
+<enabled/>
+<data id="Cookies_BehaviorPrivateBrowsing" value="accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign"/>
+```

 #### macOS
 ```
 <dict>
 #### macOS
 ```
 <dict>


@@ -1012,6 +1045,10 @@ Value (string):
     <true/> | <false/>
     <key>Locked</key>
     <true/> | <false/>
     <true/> | <false/>
     <key>Locked</key>
     <true/> | <false/>

+    <key>Behavior</key>
+    <string>accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign</string>
+    <key>BehaviorPrivateBrowsing</key>
+    <string>accept | reject-foreign | reject | limit-foreign | reject-tracker | reject-tracker-and-partition-foreign</string>

   </dict>
 </dict>
 ```
   </dict>
 </dict>
 ```


@@ -1027,7 +1064,9 @@ Value (string):
       "AcceptThirdParty": "always" | "never" | "from-visited",
       "ExpireAtSessionEnd": true | false,
       "RejectTracker": true | false,
       "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 733afeb1b98d97a57020d19082310006accb6c73..1ad8bc6afab62595eced26ed854019fa359cdbce 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -118,14 +118,8 @@
                <array>
                        <string>https://www.example.edu/</string>
                </array>
                <array>
                        <string>https://www.example.edu/</string>
                </array>

-               <key>Default</key>
-               <false/>
-               <key>AcceptThirdParty</key>
-               <string>never</string>
-               <key>ExpireAtSessionEnd</key>
-               <true/>
-               <key>RejectTracker</key>
-               <true/>         
+               <key>Behavior</key>
+               <string>limit-foreign</string>

                <key>Locked</key>
                <true/>
        </dict>
                <key>Locked</key>
                <true/>
        </dict>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 1c4bc26c604e2e03d83f0383e7e2c11241ec5085..8d60782e792761656dff070b875364b5b8c71a85 100644 (file)
--- 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
       <string id="Cookies_Locked_Explain">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.</string>
       <string id="Cookies_Locked_Explain">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.</string>

+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain">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.</string>
       <string id="Camera_Allow_Explain">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.</string>


@@ -987,6 +1001,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>

+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>

       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index d279adc118b1614b9accc7dc54e449b12d5f1911..f4e0f8328c654f770efef4d99a289f08ce35c233 100644 (file)
--- 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
       <string id="Cookies_Block_Explain">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.</string>
       <string id="Cookies_Block_Explain">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.</string>

-      <string id="Cookies_Default">Accept cookies from websites</string>
+      <string id="Cookies_Default">Accept cookies from websites (Deprecated)</string>

       <string id="Cookies_Default_Explain">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.</string>
       <string id="Cookies_Default_Explain">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.</string>

-      <string id="Cookies_AcceptThirdParty">Accept third-party cookies</string>
+      <string id="Cookies_AcceptThirdParty">Accept third-party cookies (Deprecated)</string>

       <string id="Cookies_AcceptThirdParty_Explain">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.</string>
       <string id="Cookies_AcceptThirdParty_Explain">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.</string>


@@ -386,14 +386,26 @@ This setting is ignored if this policy is disabled or not configured or if cooki
       <string id="Cookies_ExpireAtSessionEnd_Explain">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.</string>
       <string id="Cookies_ExpireAtSessionEnd_Explain">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.</string>

-      <string id="Cookies_RejectTracker">Reject trackers</string>
+      <string id="Cookies_RejectTracker">Reject trackers (Deprecated)</string>

       <string id="Cookies_RejectTracker_Explain">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.</string>
       <string id="Cookies_Locked">Do not allow preferences to be changed</string>
       <string id="Cookies_RejectTracker_Explain">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.</string>
       <string id="Cookies_Locked">Do not allow preferences to be changed</string>

-      <string id="Cookies_Locked_Explain">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.</string>
+      <string id="Cookies_Locked_Explain">If this policy is enabled, cookie preferences cannot be changed by the user.</string>
+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain">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.</string>
       <string id="Camera_Allow_Explain">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.</string>


@@ -986,6 +998,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>

+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>

       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index c7a8b12b14c5217916739f80babfd1f834d19708..4c8a5379cd0e53fc539ef789645100c0eb3d9291 100644 (file)
--- 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
       <string id="Cookies_Locked_Explain">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.</string>
       <string id="Cookies_Locked_Explain">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.</string>

+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain">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.</string>
       <string id="Camera_Allow_Explain">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.</string>


@@ -986,6 +1000,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>

+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>

       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index aea314bcfdc9219c596617e57bf65c79f7158809..104f75edcc293aff0608a04d38634721a1084a9a 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -381,6 +381,82 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="Cookies_Behavior" class="Both" displayName="$(string.Cookies_Behavior)" explainText="$(string.Cookies_Behavior_Explain)" key="Software\Policies\Mozilla\Firefox\Cookies"  presentation="$(presentation.Cookies_Behavior)">
+      <parentCategory ref="Cookies"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <enum id="Cookies_Behavior" valueName="Behavior">
+          <item displayName="$(string.Cookies_Behavior_Accept)">
+            <value>
+              <string>accept</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectForeign)">
+            <value>
+              <string>reject-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_Reject)">
+            <value>
+              <string>reject</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_LimitForeign)">
+            <value>
+              <string>limit-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTracker)">
+            <value>
+              <string>reject-tracker</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTrackerAndPartitionForeign)">
+            <value>
+              <string>reject-tracker-and-partition-foreign</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy name="Cookies_BehaviorPrivateBrowsing" class="Both" displayName="$(string.Cookies_BehaviorPrivateBrowsing)" explainText="$(string.Cookies_BehaviorPrivateBrowsing_Explain)" key="Software\Policies\Mozilla\Firefox\Cookies"  presentation="$(presentation.Cookies_BehaviorPrivateBrowsing)">
+      <parentCategory ref="Cookies"/>
+      <supportedOn ref="SUPPORTED_FF95"/>
+      <elements>
+        <enum id="Cookies_BehaviorPrivateBrowsing" valueName="BehaviorPrivateBrowsing">
+          <item displayName="$(string.Cookies_Behavior_Accept)">
+            <value>
+              <string>accept</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectForeign)">
+            <value>
+              <string>reject-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_Reject)">
+            <value>
+              <string>reject</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_LimitForeign)">
+            <value>
+              <string>limit-foreign</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTracker)">
+            <value>
+              <string>reject-tracker</string>
+            </value>
+          </item>
+          <item displayName="$(string.Cookies_Behavior_RejectTrackerAndPartitionForeign)">
+            <value>
+              <string>reject-tracker-and-partition-foreign</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>

     <policy name="Camera_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Camera_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
       <parentCategory ref="Camera"/>
       <supportedOn ref="SUPPORTED_FF62"/>
     <policy name="Camera_Allow" class="Both" displayName="$(string.Allow)" explainText="$(string.Camera_Allow_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions" presentation="$(presentation.Permissions)">
       <parentCategory ref="Camera"/>
       <supportedOn ref="SUPPORTED_FF62"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 8ca32b1190b34029a41901dbf854622fb771c1cd..a23203a9aaf7dd4f5487838d98dbf869dfd08326 100644 (file)
--- 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é
       <string id="Cookies_Locked_Explain">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.\r
 \r
 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.</string>\r
       <string id="Cookies_Locked_Explain">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.\r
 \r
 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.</string>\r

+      <string id="Cookies_Behavior">Cookie Behavior</string>\r
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.\r
+\r
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>\r
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>\r
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">If this policy is enabled, you can configure cookie behavior in private browsing.\r
+\r
+If this policy is not configured or disabled, in private browsing, cookies are rejected for known trackers and third-party cookies are partitioned.</string>\r
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>\r
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>\r
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>\r
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>\r
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>\r
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>\r

       <string id="Camera_Allow_Explain">Si cette stratégie est activée, l'accès à la caméra est toujours autorisé pour les origines indiquées.\r
 \r
 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.</string>\r
       <string id="Camera_Allow_Explain">Si cette stratégie est activée, l'accès à la caméra est toujours autorisé pour les origines indiquées.\r
 \r
 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.</string>\r


@@ -985,6 +999,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Cookies_AcceptThirdParty">\r
         <dropdownList refId="Cookies_AcceptThirdParty"/>\r
       </presentation>\r
       <presentation id="Cookies_AcceptThirdParty">\r
         <dropdownList refId="Cookies_AcceptThirdParty"/>\r
       </presentation>\r

+      <presentation id="Cookies_Behavior">\r
+        <dropdownList refId="Cookies_Behavior"/>\r
+      </presentation>\r
+      <presentation id="Cookies_BehaviorPrivateBrowsing">\r
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>\r
+      </presentation>\r

       <presentation id="SearchBar">\r
         <dropdownList refId="SearchBar"/>\r
       </presentation>\r
       <presentation id="SearchBar">\r
         <dropdownList refId="SearchBar"/>\r
       </presentation>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 15276cc9b462d2781dc953803b93f399857571d4..02d35bda41c3ca85fdaa8f2f19ab6309a3f6918e 100644 (file)
--- 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
       <string id="Cookies_Locked_Explain">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.</string>
       <string id="Cookies_Locked_Explain">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.</string>

+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain">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.</string>
       <string id="Camera_Allow_Explain">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.</string>


@@ -987,6 +1001,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>

+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>

       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index ade9f1009a564351f49e0a55c21f5d0d3454e5d5..113b2fc224d2b100b722324bf11ed4677f791969 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -394,6 +394,20 @@ Mozilla рекомендует не отключать телеметрию. И
       <string id="Cookies_Locked_Explain"> Если эта политика включена, пользователь не может изменить настройки файлов cookie.
 
 Если эта политика отключена или не настроена, пользователь может изменить свои настройки файлов cookie. </string>
       <string id="Cookies_Locked_Explain"> Если эта политика включена, пользователь не может изменить настройки файлов cookie.
 
 Если эта политика отключена или не настроена, пользователь может изменить свои настройки файлов cookie. </string>

+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain"> Если эта политика включена, доступ к камере всегда разрешен для указанных источников.
 
 Если эта политика отключена или не настроена, применяется политика камеры по умолчанию. </string>
       <string id="Camera_Allow_Explain"> Если эта политика включена, доступ к камере всегда разрешен для указанных источников.
 
 Если эта политика отключена или не настроена, применяется политика камеры по умолчанию. </string>


@@ -983,17 +997,23 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. <
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Разрешить всплывающие окна для веб-сайтов </listBox> </presentation>
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Разрешить всплывающие окна для веб-сайтов </listBox> </presentation>

-       <presentation id="Cookies_AcceptThirdParty">
-         <dropdownList refId="Cookies_AcceptThirdParty" />
-       </presentation>
-       <presentation id="SearchBar">
-         <dropdownList refId="SearchBar" />
-       </presentation>
-       <presentation id="TrackingProtection">
-         <checkBox refId="TrackingProtectionLocked"> Не разрешать изменять настройки защиты от отслеживания. </checkBox>
-         <checkBox refId="Cryptomining"> Блокировать скрипты майнинга. </checkBox>
-         <checkBox refId="Fingerprinting"> Блокировать скрипты снятия отпечатков пальцев. </checkBox>
-         <text> Исключения: </text>
+      <presentation id="Cookies_AcceptThirdParty">
+        <dropdownList refId="Cookies_AcceptThirdParty" />
+      </presentation>
+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>
+      <presentation id="SearchBar">
+        <dropdownList refId="SearchBar" />
+      </presentation>
+      <presentation id="TrackingProtection">
+        <checkBox refId="TrackingProtectionLocked"> Не разрешать изменять настройки защиты от отслеживания. </checkBox>
+        <checkBox refId="Cryptomining"> Блокировать скрипты майнинга. </checkBox>
+        <checkBox refId="Fingerprinting"> Блокировать скрипты снятия отпечатков пальцев. </checkBox>
+        <text> Исключения: </text>

         <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="TrackingProtection_Exceptions">
         <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
       <presentation id="TrackingProtection_Exceptions">

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index b114a53ac4daf639324d4ae7b2afbe08b596c1f7..0b4e51828b0d624c41a98559396ad9d75c27583e 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -392,6 +392,20 @@ Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息
    <string id="Cookies_Locked_Explain">若启用此原则，用户将无法调整 Cookie 偏好设置。 
 
 若禁用或不设定此原则，则使用者能够自行调整 Cookie 偏好设定。 </string>
    <string id="Cookies_Locked_Explain">若启用此原则，用户将无法调整 Cookie 偏好设置。 
 
 若禁用或不设定此原则，则使用者能够自行调整 Cookie 偏好设定。 </string>

+   <string id="Cookies_Behavior">Cookie Behavior</string>
+   <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+   <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+   <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+   <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+   <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+   <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+   <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+   <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+   <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

    <string id="Camera_Allow_Explain">若启用此原则，将允许指定来源网址访问摄像头。 
 
 若禁用或不设定此原则，则依循预设摄影机存取原则。 </string>
    <string id="Camera_Allow_Explain">若启用此原则，将允许指定来源网址访问摄像头。 
 
 若禁用或不设定此原则，则依循预设摄影机存取原则。 </string>


@@ -981,13 +995,19 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
    </presentation>
 <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
 <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">允许网站弹出窗口</listBox></presentation>
    </presentation>
 <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
 <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">允许网站弹出窗口</listBox></presentation>

-   <presentation id="Cookies_AcceptThirdParty">
-<dropdownList refId="Cookies_AcceptThirdParty"/>
-   </presentation>
-   <presentation id="SearchBar">
-<dropdownList refId="SearchBar"/>
-   </presentation>
-   <presentation id="TrackingProtection">
+<presentation id="Cookies_AcceptThirdParty">
+  <dropdownList refId="Cookies_AcceptThirdParty"/>
+ </presentation>
+<presentation id="Cookies_Behavior">
+  <dropdownList refId="Cookies_Behavior"/>
+</presentation>
+<presentation id="Cookies_BehaviorPrivateBrowsing">
+  <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+</presentation>
+ <presentation id="SearchBar">
+  <dropdownList refId="SearchBar"/>
+</presentation>
+ <presentation id="TrackingProtection">

 <checkBox refId="TrackingProtectionLocked">不允许调整追踪保护偏好设置。 </checkBox>
 <checkBox refId="Cryptomining">封锁加密货币采矿程序。 </checkBox>
 <checkBox refId="Fingerprinting">封锁数位指纹追踪程序。 </checkBox>
 <checkBox refId="TrackingProtectionLocked">不允许调整追踪保护偏好设置。 </checkBox>
 <checkBox refId="Cryptomining">封锁加密货币采矿程序。 </checkBox>
 <checkBox refId="Fingerprinting">封锁数位指纹追踪程序。 </checkBox>

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 9495c90d58a17b8f3c4669503d8132471e77aa04..36ed4d67edeef9f1eec1cfb6b7a052eba69585a8 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -392,6 +392,20 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
       <string id="Cookies_Locked_Explain">若啟用此原則，使用者將無法調整 Cookie 偏好設定。
 
 若停用或不設定此原則，則使用者能夠自行調整 Cookie 偏好設定。</string>
       <string id="Cookies_Locked_Explain">若啟用此原則，使用者將無法調整 Cookie 偏好設定。
 
 若停用或不設定此原則，則使用者能夠自行調整 Cookie 偏好設定。</string>

+      <string id="Cookies_Behavior">Cookie Behavior</string>
+      <string id="Cookies_Behavior_Explain">If this policy is enabled, you can configure cookie behavior.
+
+If this policy is not configured or disabled, cookies are rejected for known trackers.</string>
+      <string id="Cookies_BehaviorPrivateBrowsing">Cookie Behavior in private browsing</string>
+      <string id="Cookies_BehaviorPrivateBrowsing_Explain">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.</string>
+      <string id="Cookies_Behavior_Accept">Accept all cookies</string>
+      <string id="Cookies_Behavior_RejectForeign">Reject third party cookies</string>
+      <string id="Cookies_Behavior_Reject">Reject all cookies</string>
+      <string id="Cookies_Behavior_LimitForeign">Reject third party cookies for sites you haven't visited</string>
+      <string id="Cookies_Behavior_RejectTracker">Reject cookies for known trackers</string>
+      <string id="Cookies_Behavior_RejectTrackerAndPartitionForeign">Reject cookies for known trackers and partition third-party cookies (Total Cookie Protection)</string>

       <string id="Camera_Allow_Explain">若啟用此原則，將允許指定來源網址存取攝影機。
 
 若停用或不設定此原則，則依循預設攝影機存取原則。</string>
       <string id="Camera_Allow_Explain">若啟用此原則，將允許指定來源網址存取攝影機。
 
 若停用或不設定此原則，則依循預設攝影機存取原則。</string>


@@ -984,6 +998,12 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>

+      <presentation id="Cookies_Behavior">
+        <dropdownList refId="Cookies_Behavior"/>
+      </presentation>
+      <presentation id="Cookies_BehaviorPrivateBrowsing">
+        <dropdownList refId="Cookies_BehaviorPrivateBrowsing"/>
+      </presentation>

       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>