Merge branch 'master' into PasswordManagerExceptions

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 82cae86e24be5e9c8f21f17a1cd1d58ae45a8a06..6c0e9f18bc1cda54a15dad7a63808f2dbaa9b9bd 100644 (file)
--- 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 906b0c09587b7fd762eabac5b78fe72f76a019a9..7a71f5ca522c4d22435cc5843b74ce57b07ea9e3 100644 (file)
--- 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 5c731b2e916167c1b3a24a65cbc417d876d022aa..122c357dadacbda7fd4f0ecd13455877bb0fcdfc 100644 (file)
--- 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 3ec141636374b3dd2c5d20cdae3c543c78767525..2d13769e90783428d53aecd9fc71b8d5d3f76406 100644 (file)
--- 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 f6f6ce3edaa0c50b1cce47f75516e4042e023d9e..5af1e39289300e27dc013b309663760d9d5a82d9 100644 (file)
--- 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>\r
       <string id="SUPPORTED_FF99">Firefox 99 ou supérieur, Firefox 91.8 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF100">Firefox 100 ou supérieur, Firefox 91.9 ESR ou supérieur</string>\r
+      <string id="SUPPORTED_FF101">Firefox 101 ou supérieur, Firefox 91.10 ESR ou supérieur</string>\r
+      <string id="SUPPORTED_FF102">Firefox 102 ou supérieur, Firefox 91.11 ESR ou supérieur</string>\r
       <string id="firefox">Firefox</string>\r
       <string id="Permissions_group">Permissions</string>\r
       <string id="Camera_group">Caméra</string>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 4bc4978f9f1d062cfc2a87168de6dcafb328d5a7..e1505933da11b2a6bed361ebb61384e1f0cc59a3 100644 (file)
--- 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 cc28c8daaa52cb86dfcdf0d9985c245533f179f8..8cf0740862688fc898eb539345ada431806dd3e0 100644 (file)
--- 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 4b7c6d3efc6e92eba25b6f6d057dc6826ab553ba..f8b6c75789bb22d11ab94ddc23e689b176d930d8 100644 (file)
--- 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 45efe9aad7f1d232ea228c68c6c11647ed3f4c1c..76bdfb48fdddee20129efca025f676a93f69dba9 100644 (file)
--- 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>