From 2a7c43752f523196e015e6bf01329eda6682bfab Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Wed, 1 Jun 2022 16:14:33 -0400
Subject: [PATCH] Update ADMX templates

---
 windows/de-DE/firefox.adml | 4 ++++
 windows/en-US/firefox.adml | 4 ++++
 windows/es-ES/firefox.adml | 4 ++++
 windows/firefox.admx       | 7 +++++++
 windows/fr-FR/firefox.adml | 4 ++++
 windows/it-IT/firefox.adml | 4 ++++
 windows/ru-RU/firefox.adml | 4 ++++
 windows/zh-CN/firefox.adml | 8 ++++++--
 windows/zh-TW/firefox.adml | 8 ++++++--
 9 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 6c0e9f1..eeb50a0 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -675,6 +675,10 @@ Wenn diese Richtlinieneinstellung nicht konfiguriert ist, entscheidet Firefox se
       <string id="PasswordManagerEnabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist der Passwort-Manager nicht über die Einstellungen verfügbar.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist der Passwort-Manager über die Einstellungen verfügbar.</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">Abfrage des Download-Verzeichnisses</string>
       <string id="PromptForDownloadLocation_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird der Nutzer nicht nach einem Verzeichnis für den Download gefragt.
 
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7a71f5c..205c9cc 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -675,6 +675,10 @@ If this policy is not configured, Firefox will determine whether or not the home
       <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
 
 If this policy is enabled or not configured, the password manager is available via preferences.</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">Prompt for download location</string>
       <string id="PromptForDownloadLocation_Explain">If this policy is disabled, the user is not prompted for a download location.
 
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 122c357..e9f178c 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -677,6 +677,10 @@ If this policy is not configured, Firefox will determine whether or not the home
       <string id="PasswordManagerEnabled_Explain">Si esta política está deshabilitada, el administrador de contraseñas no estará disponible a través de las preferencias.
 
 Si esta política está habilitada o no está configurada, el administrador de contraseñas estará disponible a través de preferencias.</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">Solicitar ubicación de descarga</string>
       <string id="PromptForDownloadLocation_Explain">Si esta política está deshabilitada, no se solicitará al usuario una ubicación de descarga.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 2d13769..9248846 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2486,6 +2486,13 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="PasswordManagerExceptions" class="Both" displayName="$(string.PasswordManagerExceptions)" explainText="$(string.PasswordManagerExceptions_Explain)" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" presentation="$(presentation.List)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF101"/>
+      <elements>
+        <list id="List" key="Software\Policies\Mozilla\Firefox\PasswordManagerExceptions" valuePrefix=""/>
+      </elements>
+    </policy>
     <policy name="Proxy" class="Both" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF60" />
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 5af1e39..7e8c258 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -676,6 +676,10 @@ If this policy is not configured, Firefox will determine whether or not the home
       <string id="PasswordManagerEnabled_Explain">Si cette stratégie est désactivée, le gestionnaire de mots de passe n'est pas disponible via les préférences.
 
 Si cette stratégie est activée ou non configurée, le gestionnaire de mots de passe est disponible via les préférences.</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">Demander l'emplacement de téléchargement</string>
       <string id="PromptForDownloadLocation_Explain">Si cette stratégie est désactivée, l'utilisateur n'est pas invité à indiquer un emplacement de téléchargement.
 
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index e150593..c78a33b 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -677,6 +677,10 @@ If this policy is not configured, Firefox will determine whether or not the home
       <string id="PasswordManagerEnabled_Explain">Se questo criterio è disabilitato, il gestore password non è disponibile nelle Preferenze.
 
 Se questo criterio è abilitato o non configurato, il gestore password è disponibile nelle Preferenze.</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">Richiedi percorso di download</string>
       <string id="PromptForDownloadLocation_Explain">Se questo criterio è disabilitato, all'utente non verrà chiesto un percorso di download.
 
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 8cf0740..2c762ec 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -677,6 +677,10 @@ If this policy is not configured, Firefox will determine whether or not the home
       <string id="PasswordManagerEnabled_Explain"> Если эта политика отключена, менеджер паролей недоступен в настройках.
 
 Если эта политика включена или не настроена, менеджер паролей доступен в настройках. </string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation"> Запрос места загрузки </string>
       <string id="PromptForDownloadLocation_Explain"> Если эта политика отключена, пользователю не предлагается указать расположение для загрузки.
 
diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index f8b6c75..62f78e7 100644
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -48,8 +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="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>
@@ -675,6 +675,10 @@ If this policy is not configured, Firefox will determine whether or not the home
    <string id="PasswordManagerEnabled_Explain">若禁用此策略，将无法于偏好设定中使用密码管理员。 
 
 若启用或不设定此原则，则可于偏好设定中使用密码管理员。 </string>
+   <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+   <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
    <string id="PromptForDownloadLocation">提示下载位置</string>
    <string id="PromptForDownloadLocation_Explain">若禁用此原则，将不会向用户询问文件下载位置。
 
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 76bdfb4..4131279 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -48,8 +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="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>
@@ -675,6 +675,10 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
       <string id="PasswordManagerEnabled_Explain">若停用此原則，將無法於偏好設定中使用密碼管理員。
 
 若啟用或不設定此原則，則可於偏好設定中使用密碼管理員。</string>
+      <string id="PasswordManagerExceptions">Password Manager Exceptions</string>
+      <string id="PasswordManagerExceptions_Explain">If this policy is enabled, you can specify sites where Firefox won't offer to save passwords.
+
+If this policy is disabled or not configured, Firefox will offer to save passwords on all sites.</string>
       <string id="PromptForDownloadLocation">提示下載位置</string>
       <string id="PromptForDownloadLocation_Explain">若停用此原則，將不會向使用者詢問檔案下載位置。
 
-- 
2.34.1