Merge branch 'mozilla:master' into master

diff --git a/docs/index.md b/docs/index.md
index 6618e5f2e54e70c748ff6909e1668f5e67e04e60..9923f2e5882e45be0ceae56fc77d4020ad2cb900 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -3174,6 +3174,7 @@ The configuration for each extension is another dictionary that can contain the
 | `updates_disabled` | (Firefox 89, Firefox ESR 78.11) Boolean that indicates whether or not to disable automatic updates for an individual extension.
 | `default_area` | (Firefox 113) String that indicates where to place the extension icon by default. Possible values are `navbar` and `menupanel`.
 | `temporarily_allow_weak_signatures`| (Firefox 127) A boolean that indicates whether to allow installing extensions signed using deprecated signature algorithms.
+| `private_browsing`| (Firefox 136, Firefox ESR 128.8) A boolean that indicates whether or not this extension should be enabled in private browsing.
 
 **Compatibility:** Firefox 69, Firefox ESR 68.1 (As of Firefox 85, Firefox ESR 78.7, installing a theme makes it the default.)\
 **CCK2 Equivalent:** N/A\

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 6c2320b8e002db515b3f5f04c314b6dac2b72b09..1d1c295f14e0ea2e968e2005541980a2d6dd0801 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f28aec40d321a7f24c76307992e4ca39b0903689..0033bbdbedd4bdde739ff2eaa9b2c84fbc23ad06 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 7ef174ef588791e4a9f4735eb225c638f006a7b1..83d29c03500add04ccda47dfd9754e499b902bd1 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="6.6" schemaVersion="1.0">
+<policyDefinitions revision="6.8" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="6.6"/>
+  <resources minRequiredRevision="6.8"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 1b75eed0daab3743dd8d763c21fd074634ec3821..c6f25eeb8c41cee9ede503fd35152a71dce44d92 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 59020e045a9f5f6fc46a8205094bd54e33891bcc..57f753f3e658ded7c4cbe4f4d0a231a6274cb457 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.6" schemaVersion="1.0">
+<policyDefinitionResources revision="6.8" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>