From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 1 Jun 2022 18:35:13 +0000 (-0400)
Subject: Merge branch 'master' into PasswordManagerExceptions
X-Git-Tag: 3.10~2^2~3
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/24469360c5e97c284cff2e77407e83c3aad0746c?hp=417f958cbfb569456953c7ba642e24bde4570276

Merge branch 'master' into PasswordManagerExceptions
---

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 82cae86..6c0e9f1 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 oder höher</string>
       <string id="SUPPORTED_FF99">Firefox 99 oder höher, Firefox 91.8 ESR oder höher</string>
       <string id="SUPPORTED_FF100">Firefox 100 oder höher, Firefox 91.9 ESR oder höher</string>
+      <string id="SUPPORTED_FF101">Firefox 101 oder höher, Firefox 91.10 ESR oder höher</string>
+      <string id="SUPPORTED_FF102">Firefox 102 oder höher, Firefox 91.11 ESR oder höher</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 906b0c0..7a71f5c 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 or later</string>
       <string id="SUPPORTED_FF99">Firefox 99 or later, Firefox 91.8 ESR or later</string>
       <string id="SUPPORTED_FF100">Firefox 100 or later, Firefox 91.9 ESR or later</string>
+      <string id="SUPPORTED_FF101">Firefox 101 or later, Firefox 91.10 ESR or later</string>
+      <string id="SUPPORTED_FF102">Firefox 102 or later, Firefox 91.11 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 5c731b2..122c357 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 o posterior</string>
       <string id="SUPPORTED_FF99">Firefox 99 o posterior, Firefox 91.8 ESR o posterior</string>
       <string id="SUPPORTED_FF100">Firefox 100 o posterior, Firefox 91.9 ESR o posterior</string>
+      <string id="SUPPORTED_FF101">Firefox 101 o posterior, Firefox 91.10 ESR o posterior</string>
+      <string id="SUPPORTED_FF102">Firefox 102 o posterior, Firefox 91.11 ESR o posterior</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permisos</string>
       <string id="Camera_group">Cámara</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 3ec1416..2d13769 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -50,6 +50,8 @@
       <definition name="SUPPORTED_FF98_ONLY" displayName="$(string.SUPPORTED_FF98_ONLY)"/>
       <definition name="SUPPORTED_FF99" displayName="$(string.SUPPORTED_FF99)"/>
       <definition name="SUPPORTED_FF100" displayName="$(string.SUPPORTED_FF100)"/>
+      <definition name="SUPPORTED_FF101" displayName="$(string.SUPPORTED_FF101)"/>
+      <definition name="SUPPORTED_FF102" displayName="$(string.SUPPORTED_FF102)"/>
     </definitions>
   </supportedOn>
   <categories>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index f6f6ce3..5af1e39 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 ou supérieur</string>
       <string id="SUPPORTED_FF99">Firefox 99 ou supérieur, Firefox 91.8 ESR ou supérieur</string>
       <string id="SUPPORTED_FF100">Firefox 100 ou supérieur, Firefox 91.9 ESR ou supérieur</string>
+      <string id="SUPPORTED_FF101">Firefox 101 ou supérieur, Firefox 91.10 ESR ou supérieur</string>
+      <string id="SUPPORTED_FF102">Firefox 102 ou supérieur, Firefox 91.11 ESR ou supérieur</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Caméra</string>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 4bc4978..e150593 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 o versione successiva</string>
       <string id="SUPPORTED_FF99">Firefox 99 o versione successiva, Firefox 91.8 ESR o versione successiva</string>
       <string id="SUPPORTED_FF100">Firefox 100 o versione successiva, Firefox 91.9 ESR o versione successiva</string>
+      <string id="SUPPORTED_FF101">Firefox 101 o versione successiva, Firefox 91.10 ESR o versione successiva</string>
+      <string id="SUPPORTED_FF102">Firefox 102 o versione successiva, Firefox 91.11 ESR o versione successiva</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permessi</string>
       <string id="Camera_group">Fotocamera</string>
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index cc28c8d..8cf0740 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 или более поздние версии</string>
       <string id="SUPPORTED_FF99">Firefox 99 или более поздние версии, Firefox 91.8 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF100">Firefox 100 или более поздние версии, Firefox 91.9 ESR или более поздние версии</string>
+      <string id="SUPPORTED_FF101">Firefox 101 или более поздние версии, Firefox 91.10 ESR или более поздние версии</string>
+      <string id="SUPPORTED_FF102">Firefox 102 или более поздние версии, Firefox 91.11 ESR или более поздние версии</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Разрешения</string>
       <string id="Camera_group">Камера</string>
diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 4b7c6d3..f8b6c75 100644
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -48,6 +48,8 @@
    <string id="SUPPORTED_FF98_ONLY">Firefox 98 或更新版本</string>
    <string id="SUPPORTED_FF99">Firefox 99 或更新版本、Firefox 91.8 ESR 或更新版本</string>
    <string id="SUPPORTED_FF100">Firefox 100 或更新版本、Firefox 91.9 ESR 或更新版本</string>
+   <string id="SUPPORTED_FF100">Firefox 101 或更新版本、Firefox 91.10 ESR 或更新版本</string>
+   <string id="SUPPORTED_FF100">Firefox 102 或更新版本、Firefox 91.11 ESR 或更新版本</string>
    <string id="firefox">Firefox</string>
 <string id="Permissions_group">权限</string>
    <string id="Camera_group">摄像头</string>
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 45efe9a..76bdfb4 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -48,6 +48,8 @@
       <string id="SUPPORTED_FF98_ONLY">Firefox 98 或更新版本</string>
       <string id="SUPPORTED_FF99">Firefox 99 或更新版本、Firefox 91.8 ESR 或更新版本</string>
       <string id="SUPPORTED_FF100">Firefox 100 或更新版本、Firefox 91.9 ESR 或更新版本</string>
+      <string id="SUPPORTED_FF100">Firefox 101 或更新版本、Firefox 91.10 ESR 或更新版本</string>
+      <string id="SUPPORTED_FF100">Firefox 102 或更新版本、Firefox 91.11 ESR 或更新版本</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">權限</string>
       <string id="Camera_group">攝影機</string>