Remove unused presentation parameters

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 4d7dc7c1ff02f94c0b51dc6f13b45571a83bd607..adf20984b995f386990367d2a6eaf82871e24ec0 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1434,7 +1434,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
         <listBox refId="WebsiteFilter"/>
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
-      <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Pop-up-Blocker deaktivieren</listBox></presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
@@ -1447,13 +1446,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
-      <presentation id="TrackingProtection">
-        <checkBox refId="TrackingProtectionLocked">Änderungen am Schutz vor Aktivitätenverfolgung nicht erlauben</checkBox>
-        <checkBox refId="Cryptomining">Cryptomining-Skripte blockieren.</checkBox>
-        <checkBox refId="Fingerprinting">Identifizierer-Skripte (Fingerprinter) blockieren.</checkBox>
-        <text>Ausnahmen:</text>
-        <listBox refId="TrackingProtection_Exceptions"/>
-      </presentation>
       <presentation id="TrackingProtection_Exceptions">
         <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
@@ -1531,49 +1523,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="SearchEngines_Remove">
         <listBox refId="SearchEngines_Remove"/>
       </presentation>
-      <presentation id="Proxy">
-        <checkBox refId="ProxyLocked">Ändern der Proxy-Einstellungen nicht erlauben</checkBox>
-        <text>Verbindungs-Einstellungen</text>
-        <dropdownList refId="ConnectionType"/>
-        <text>HTTP Proxy:</text>
-        <textBox refId="HTTPProxy">
-          <label/>
-        </textBox>
-        <checkBox refId="UseHTTPProxyForAllProtocols">Für alle Protokolle diesen Proxy-Server verwenden.</checkBox>
-        <text>SSL Proxy:</text>
-        <textBox refId="SSLProxy">
-          <label/>
-        </textBox>
-        <text>FTP Proxy:</text>
-        <textBox refId="FTPProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS Host:</text>
-        <textBox refId="SOCKSProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS Version:</text>
-        <dropdownList refId="SOCKSVersion"/>
-        <text>Kein Proxy für:</text>
-        <textBox refId="Passthrough">
-          <label/>
-        </textBox>
-        <text>Beispiel: .mozilla.org, .net.nz, 192.168.1.0/24</text>
-        <text>Automatische Proxy-Konfigurations-Adresse:</text>
-        <textBox refId="AutoConfigURL">
-          <label/>
-        </textBox>
-        <checkBox refId="AutoLogin">Keine Authentifizierungsanfrage bei gespeichertem Passwort.</checkBox>
-        <checkBox refId="UseProxyForDNS">Bei Verwendung von SOCKS v5 den Proxy für DNS-Anfragen verwenden.</checkBox>
-      </presentation>
-      <presentation id="DNSOverHTTPS">
-        <text>Provider URL:</text>
-        <textBox refId="ProviderURL">
-          <label/>
-        </textBox>
-        <checkBox refId="DNSOverHTTPSEnabled">DNS über HTTPS aktivieren.</checkBox>
-        <checkBox refId="DNSOverHTTPSLocked">Änderungen an den DNS-über-HTTPS Einstellungen nicht erlauben.</checkBox>
-      </presentation>
       <presentation id="SSLVersionMin">
         <dropdownList refId="SSLVersion" defaultItem="2"/>
       </presentation>
@@ -1611,16 +1560,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
-      <presentation id="SanitizeOnShutdown">
-        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Downloads">Download-Chronik</checkBox>
-        <checkBox refId="SanitizeOnShutdown_FormData">Eingegebene Suchbegriffe &amp; Formulardaten</checkBox>
-        <checkBox refId="SanitizeOnShutdown_History">Besuchte Seiten</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Sessions">Aktive Logins</checkBox>
-        <checkBox refId="SanitizeOnShutdown_SiteSettings">Website-Einstellungen</checkBox>
-        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline-Website-Daten</checkBox>
-      </presentation>
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Suche</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Top Seiten</checkBox>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index c2adf860954c321210613ea8ec362d648219da92..a78b129cb4fe96ed5975243016182a32dae70411 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1425,7 +1425,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <listBox refId="WebsiteFilter"/>
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
-      <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
@@ -1438,13 +1437,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
-      <presentation id="TrackingProtection">
-        <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
-        <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>
-        <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>
-        <text>Exceptions:</text>
-        <listBox refId="TrackingProtection_Exceptions"/>
-      </presentation>
       <presentation id="TrackingProtection_Exceptions">
         <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
@@ -1522,49 +1514,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="SearchEngines_Remove">
         <listBox refId="SearchEngines_Remove"/>
       </presentation>
-      <presentation id="Proxy">
-        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
-        <text>Connection Type:</text>
-        <dropdownList refId="ConnectionType"/>
-        <text>HTTP Proxy:</text>
-        <textBox refId="HTTPProxy">
-          <label/>
-        </textBox>
-        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
-        <text>SSL Proxy:</text>
-        <textBox refId="SSLProxy">
-          <label/>
-        </textBox>
-        <text>FTP Proxy:</text>
-        <textBox refId="FTPProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS Host:</text>
-        <textBox refId="SOCKSProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS Version:</text>
-        <dropdownList refId="SOCKSVersion"/>
-        <text>No proxy for</text>
-        <textBox refId="Passthrough">
-          <label/>
-        </textBox>
-        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
-        <text>Automatic proxy configuration URL:</text>
-        <textBox refId="AutoConfigURL">
-          <label/>
-        </textBox>
-        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
-        <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
-      </presentation>
-      <presentation id="DNSOverHTTPS">
-        <text>Provider URL:</text>
-        <textBox refId="ProviderURL">
-          <label/>
-        </textBox>
-        <checkBox refId="DNSOverHTTPSEnabled">Enable DNS over HTTPS.</checkBox>
-        <checkBox refId="DNSOverHTTPSLocked">Don't allow DNS over HTTPS preferences to be changed.</checkBox>
-      </presentation>
       <presentation id="SSLVersionMin">
         <dropdownList refId="SSLVersion" defaultItem="2"/>
       </presentation>
@@ -1602,16 +1551,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
-      <presentation id="SanitizeOnShutdown">
-        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
-        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
-        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
-        <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
-        <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
-      </presentation>
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Search</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Shortcuts</checkBox>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 45baf9209d5c2ceba4061f48d8588996055cecd5..bc3cfc8de6d9a0cf14df98a14ceeeed7a603462a 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1432,7 +1432,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <listBox refId="WebsiteFilter"/>
       </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
-      <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Autoriser les fenêtres pop-up pour les sites web</listBox></presentation>
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
@@ -1445,13 +1444,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="SearchBar">
         <dropdownList refId="SearchBar"/>
       </presentation>
-      <presentation id="TrackingProtection">
-        <checkBox refId="TrackingProtectionLocked">Ne pas autoriser la modification des préférences de protection contre le suivi.</checkBox>
-        <checkBox refId="Cryptomining">Bloquer les scripts de cryptominage.</checkBox>
-        <checkBox refId="Fingerprinting">Bloquer les scripts de fingerprinting.</checkBox>
-        <text>Exceptions :</text>
-        <listBox refId="TrackingProtection_Exceptions"/>
-      </presentation>
       <presentation id="TrackingProtection_Exceptions">
         <listBox refId="TrackingProtection_Exceptions"/>
       </presentation>
@@ -1529,49 +1521,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="SearchEngines_Remove">
         <listBox refId="SearchEngines_Remove"/>
       </presentation>
-      <presentation id="Proxy">
-        <checkBox refId="ProxyLocked">Ne pas autoriser la modification des paramètres du Proxy.</checkBox>
-        <text>Type de connexion :</text>
-        <dropdownList refId="ConnectionType"/>
-        <text>Proxy HTTP :</text>
-        <textBox refId="HTTPProxy">
-          <label/>
-        </textBox>
-        <checkBox refId="UseHTTPProxyForAllProtocols">Utiliser ce serveur Proxy pour tous les protocoles.</checkBox>
-        <text>Proxy SSL :</text>
-        <textBox refId="SSLProxy">
-          <label/>
-        </textBox>
-        <text>Proxy FTP :</text>
-        <textBox refId="FTPProxy">
-          <label/>
-        </textBox>
-        <text>Hôte SOCKS :</text>
-        <textBox refId="SOCKSProxy">
-          <label/>
-        </textBox>
-        <text>Version de SOCKS :</text>
-        <dropdownList refId="SOCKSVersion"/>
-        <text>Pas de Proxy pour</text>
-        <textBox refId="Passthrough">
-          <label/>
-        </textBox>
-        <text>Exemple : .mozilla.org, .net.nz, 192.168.1.0/24</text>
-        <text>URL de configuration automatique du Proxy :</text>
-        <textBox refId="AutoConfigURL">
-          <label/>
-        </textBox>
-        <checkBox refId="AutoLogin">Ne pas demander d'authentification si le mot de passe est enregistré.</checkBox>
-        <checkBox refId="UseProxyForDNS">Proxy DNS lors de l'utilisation de SOCKS v5.</checkBox>
-      </presentation>
-      <presentation id="DNSOverHTTPS">
-        <text>URL du fournisseur :</text>
-        <textBox refId="ProviderURL">
-          <label/>
-        </textBox>
-        <checkBox refId="DNSOverHTTPSEnabled">Activer DNS sur HTTPS.</checkBox>
-        <checkBox refId="DNSOverHTTPSLocked">Ne pas autoriser la modification des préférences DNS sur HTTPS.</checkBox>
-      </presentation>
       <presentation id="SSLVersionMin">
         <dropdownList refId="SSLVersion" defaultItem="2"/>
       </presentation>
@@ -1609,16 +1558,6 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
-      <presentation id="SanitizeOnShutdown">
-        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Downloads">Historique des téléchargements</checkBox>
-        <checkBox refId="SanitizeOnShutdown_FormData">Historique des formulaires et des recherches</checkBox>
-        <checkBox refId="SanitizeOnShutdown_History">Historique de navigation</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Sessions">Connexions actives</checkBox>
-        <checkBox refId="SanitizeOnShutdown_SiteSettings">Préférences du site</checkBox>
-        <checkBox refId="SanitizeOnShutdown_OfflineApps">Données de sites hors ligne</checkBox>
-      </presentation>
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Recherche</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Sites populaires</checkBox>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index 47524edbdf516f8211e210376dc6dcc465d76643..0905c629d5e19e1f4eef892638817a2c7ff0eeee 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1427,7 +1427,6 @@ https://mozilla.github.io/policy-templates/#preferences.</string>
         <listBox refId="WebsiteFilter"/>
       </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>
@@ -1440,13 +1439,6 @@ https://mozilla.github.io/policy-templates/#preferences.</string>
       <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>
@@ -1524,49 +1516,6 @@ https://mozilla.github.io/policy-templates/#preferences.</string>
       <presentation id="SearchEngines_Remove">
         <listBox refId="SearchEngines_Remove"/>
       </presentation>
-      <presentation id="Proxy">
-        <checkBox refId="ProxyLocked">Не разрешать изменение настроек прокси.</checkBox>
-         <text>Тип подключения:</text>
-         <dropdownList refId="ConnectionType"/>
-         <text>HTTP-прокси:</text>
-        <textBox refId="HTTPProxy">
-          <label/>
-        </textBox>
-        <checkBox refId="UseHTTPProxyForAllProtocols">Использовать этот прокси-сервер для всех протоколов.</checkBox>
-        <text>SSL прокси:</text>
-        <textBox refId="SSLProxy">
-          <label/>
-        </textBox>
-        <text>FTP прокси:</text>
-        <textBox refId="FTPProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS хост:</text>
-        <textBox refId="SOCKSProxy">
-          <label/>
-        </textBox>
-        <text>SOCKS версия:</text>
-        <dropdownList refId="SOCKSVersion"/>
-        <text>Нет прокси для</text>
-        <textBox refId="Passthrough">
-          <label/>
-        </textBox>
-        <text>Например: .mozilla.org, .net.nz, 192.168.1.0/24</text>
-        <text>URL автоматической настройки прокси:</text>
-        <textBox refId="AutoConfigURL">
-          <label/>
-        </textBox>
-        <checkBox refId="AutoLogin">Не запрашивать аутентификацию, если пароль сохранен.</checkBox>
-         <checkBox refId="UseProxyForDNS">Прокси-сервер DNS при использовании SOCKS v5.</checkBox>
-       </presentation>
-       <presentation id="DNSOverHTTPS">
-         <text>URL-адрес поставщика:</text>
-         <textBox refId="ProviderURL">
-           <label/>
-         </textBox>
-         <checkBox refId="DNSOverHTTPSEnabled">Включить DNS через HTTPS.</checkBox>
-         <checkBox refId="DNSOverHTTPSLocked">Запретить изенение настроек DNS через HTTPS.</checkBox>
-       </presentation>
       <presentation id="SSLVersionMin">
         <dropdownList refId="SSLVersion" defaultItem="2"/>
       </presentation>
@@ -1604,16 +1553,6 @@ https://mozilla.github.io/policy-templates/#preferences.</string>
       <presentation id="LocalFileLinks">
         <listBox refId="LocalFileLinks"/>
       </presentation>
-      <presentation id="SanitizeOnShutdown">
-        <checkBox refId="SanitizeOnShutdown_Cache">Кэш</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Cookies">Файлы cookie</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Downloads">История загрузок</checkBox>
-        <checkBox refId="SanitizeOnShutdown_FormData">Данные форм&amp;История поиска</checkBox>
-        <checkBox refId="SanitizeOnShutdown_History">История просмотров</checkBox>
-        <checkBox refId="SanitizeOnShutdown_Sessions">Активные логины</checkBox>
-        <checkBox refId="SanitizeOnShutdown_SiteSettings">Настройки сайта</checkBox>
-        <checkBox refId="SanitizeOnShutdown_OfflineApps">Данные автономного веб-сайта</checkBox>
-      </presentation>
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Поиск</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Популярные сайты</checkBox>