DNSOverHTTPS - Move to category, add ExcludedDomains

diff --git a/README.md b/README.md
index 8e09c210de0dd10f90254d509e8da9aed102518b..071ebcdeed6461ce2f77679b3ed50d568ae78d03 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1182,7 +1182,9 @@ Configure DNS over HTTPS.
 
 `Locked` prevents the user from changing DNS over HTTPS preferences.
 
 
 `Locked` prevents the user from changing DNS over HTTPS preferences.
 

-**Compatibility:** Firefox 63, Firefox ESR 68\
+`ExcludedDomains` excludes domains from DNS over HTTPS.
+
+**Compatibility:** Firefox 63, Firefox ESR 68 (ExcludedDomains added in 75/68.7)\

 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.trr.mode`,`network.trr.uri`
 
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** `network.trr.mode`,`network.trr.uri`
 


@@ -1191,6 +1193,7 @@ Configure DNS over HTTPS.
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ProviderURL = "URL_TO_ALTERNATE_PROVIDER"
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ProviderURL = "URL_TO_ALTERNATE_PROVIDER"
 Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0

+Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains\1 = "example.com"

 ```
 #### macOS
 ```
 ```
 #### macOS
 ```


@@ -1203,6 +1206,10 @@ Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0
     <string>URL_TO_ALTERNATE_PROVIDER</string>
     <key>Locked</key>
     <true/> | <false/>
     <string>URL_TO_ALTERNATE_PROVIDER</string>
     <key>Locked</key>
     <true/> | <false/>

+    <key>ExcludedDomains</key>
+    <array>
+      <string>example.com</string>
+    </array>

   </dict>
 </dict>
 ```
   </dict>
 </dict>
 ```


@@ -1213,7 +1220,8 @@ Software\Policies\Mozilla\Firefox\DNSOverHTTPS\Locked = 0x1 | 0x0
     "DNSOverHTTPS": {
       "Enabled":  true | false,
       "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",
     "DNSOverHTTPS": {
       "Enabled":  true | false,
       "ProviderURL": "URL_TO_ALTERNATE_PROVIDER",

-      "Locked": true | false
+      "Locked": true | false,
+      "ExcludedDomains": ["example.com"]

     }
   }
 }
     }
   }
 }

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index c62f305a102b77ebae23c088e0f49f993ba194ed..9ac6498845fcbe4231ff2b8f333a6ff279877812 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -120,6 +120,10 @@
                <string>URL_TO_ALTERNATE_PROVIDER</string>
                <key>Locked</key>
                <true/>
                <string>URL_TO_ALTERNATE_PROVIDER</string>
                <key>Locked</key>
                <true/>

+               <key>ExcludedDomains</key>
+               <array>
+                       <string>example.com</string>
+               </array>

        </dict>
        <key>DisableAppUpdate</key>
        <true/>
        </dict>
        <key>DisableAppUpdate</key>
        <true/>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 2c5f8425c59c1c49025166b5ac6ded819e978eb2..9585510081a331513a525080b8f9d75a876e5897 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 oder höher, Firefox 68.4 ESR oder höher</string>
       <string id="SUPPORTED_FF73">Firefox 73 oder höher, Firefox 68.5 ESR oder höher</string>
       <string id="SUPPORTED_FF74">Firefox 74 oder höher, Firefox 68.6 ESR oder höher</string>
       <string id="SUPPORTED_FF72">Firefox 72 oder höher, Firefox 68.4 ESR oder höher</string>
       <string id="SUPPORTED_FF73">Firefox 73 oder höher, Firefox 68.5 ESR oder höher</string>
       <string id="SUPPORTED_FF74">Firefox 74 oder höher, Firefox 68.6 ESR oder höher</string>

+      <string id="SUPPORTED_FF75">Firefox 75 oder höher, Firefox 68.7 ESR oder höher</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>


@@ -116,7 +117,25 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird
       <string id="DownloadDirectory_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie das Standard Verzeichnis für Downloads definieren und sperren. ${home} kann für den nativen Profilpfad verwendet werden.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird das Standard Firefox Download Verzeichnis benutzt und der Benutzer kann dies ändern.</string>
       <string id="DownloadDirectory_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie das Standard Verzeichnis für Downloads definieren und sperren. ${home} kann für den nativen Profilpfad verwendet werden.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird das Standard Firefox Download Verzeichnis benutzt und der Benutzer kann dies ändern.</string>

-      <string id="DNSOverHTTPS">DNS Over HTTPS konfigurieren</string>
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.
+
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.
+
+If this policy is disabled or not configured, the default provider is used.</string>
+
+      <string id="DNSOverHTTPS_Locked">Locked</string>
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.
+
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.
+
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>
+      <string id="DNSOverHTTPS">DNS Over HTTPS konfigurieren (Moved)</string>

       <string id="DNSOverHTTPS_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können die Standardeinstellungen für DNS over HTTPS geändert werden.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden von Mozilla Firefox die Standardeinstellungen zu DNS Over HTTPS benutzt.</string>
       <string id="DNSOverHTTPS_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können die Standardeinstellungen für DNS over HTTPS geändert werden.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden von Mozilla Firefox die Standardeinstellungen zu DNS Over HTTPS benutzt.</string>


@@ -947,6 +966,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="String">
+        <textBox refId="String">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="List">
+        <listBox refId="List"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4857d5fa30ef46a8ccdf71141e860612eb1fbf66..24610d74311ebd51c0f48890755742c73ec7e2c2 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 or later, Firefox 68.4 ESR or later</string>
       <string id="SUPPORTED_FF73">Firefox 73 or later, Firefox 68.5 ESR or later</string>
       <string id="SUPPORTED_FF74">Firefox 74 or later, Firefox 68.6 ESR or later</string>
       <string id="SUPPORTED_FF72">Firefox 72 or later, Firefox 68.4 ESR or later</string>
       <string id="SUPPORTED_FF73">Firefox 73 or later, Firefox 68.5 ESR or later</string>
       <string id="SUPPORTED_FF74">Firefox 74 or later, Firefox 68.6 ESR or later</string>

+      <string id="SUPPORTED_FF75">Firefox 75 or later, Firefox 68.7 ESR or later</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>


@@ -116,7 +117,25 @@ If this policy is disabled or not configured, the default Firefox download direc
       <string id="DownloadDirectory_Explain">If this policy is enabled, you can set and lock the directory for downloads. ${home} can be used for the native home path.
 
 If this policy is disabled or not configured, the default Firefox download directory is used and the user can change it.</string>
       <string id="DownloadDirectory_Explain">If this policy is enabled, you can set and lock the directory for downloads. ${home} can be used for the native home path.
 
 If this policy is disabled or not configured, the default Firefox download directory is used and the user can change it.</string>

-      <string id="DNSOverHTTPS">Configure DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.
+
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.
+
+If this policy is disabled or not configured, the default provider is used.</string>
+
+      <string id="DNSOverHTTPS_Locked">Locked</string>
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.
+
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.
+
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>
+      <string id="DNSOverHTTPS">Configure DNS Over HTTPS (Moved)</string>

       <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
 
 If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>
       <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
 
 If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>


@@ -948,6 +967,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="String">
+        <textBox refId="String">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="List">
+        <listBox refId="List"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 39f8ae05f3197396f12b9229bc26ccb121784355..2fc93ef1c7e0db580963062d2573c5d2c282f96a 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 o posterior, Firefox 68.4 ESR o posterior</string>
       <string id="SUPPORTED_FF73">Firefox 73 o posterior, Firefox 68.5 ESR o posterior</string>
       <string id="SUPPORTED_FF74">Firefox 74 o posterior, Firefox 68.6 ESR o posterior</string>
       <string id="SUPPORTED_FF72">Firefox 72 o posterior, Firefox 68.4 ESR o posterior</string>
       <string id="SUPPORTED_FF73">Firefox 73 o posterior, Firefox 68.5 ESR o posterior</string>
       <string id="SUPPORTED_FF74">Firefox 74 o posterior, Firefox 68.6 ESR o posterior</string>

+      <string id="SUPPORTED_FF75">Firefox 75 o posterior, Firefox 68.7 ESR o posterior</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permisos</string>
       <string id="Camera_group">Cámara</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permisos</string>
       <string id="Camera_group">Cámara</string>


@@ -116,7 +117,25 @@ Si esta política está deshabilitada o no está configurada, se utilizará el d
       <string id="DownloadDirectory_Explain">Si esta política está habilitada, podrá configurar y bloquear el directorio para las descargas. ${home} se puede utilizar para la ruta de inicio nativa.
 
 Si esta política está deshabilitada o no está configurada, se utilizará el directorio de descarga predeterminado de Firefox y el usuario puede cambiarlo.</string>
       <string id="DownloadDirectory_Explain">Si esta política está habilitada, podrá configurar y bloquear el directorio para las descargas. ${home} se puede utilizar para la ruta de inicio nativa.
 
 Si esta política está deshabilitada o no está configurada, se utilizará el directorio de descarga predeterminado de Firefox y el usuario puede cambiarlo.</string>

-      <string id="DNSOverHTTPS">Configurar DNS mediante HTTPS</string>
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.
+
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.
+
+If this policy is disabled or not configured, the default provider is used.</string>
+
+      <string id="DNSOverHTTPS_Locked">Locked</string>
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.
+
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.
+
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>
+      <string id="DNSOverHTTPS">Configurar DNS mediante HTTPS (Moved)</string>

       <string id="DNSOverHTTPS_Explain">Si esta política está habilitada, se podrá cambiar la configuración predeterminada de DNS mediante HTTPS.
 
 Si esta política está deshabilitada o no está configurada, DNS mediante HTTPS usa la configuración predeterminada de Firefox.</string>
       <string id="DNSOverHTTPS_Explain">Si esta política está habilitada, se podrá cambiar la configuración predeterminada de DNS mediante HTTPS.
 
 Si esta política está deshabilitada o no está configurada, DNS mediante HTTPS usa la configuración predeterminada de Firefox.</string>


@@ -948,6 +967,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="String">
+        <textBox refId="String">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="List">
+        <listBox refId="List"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index cc540ea8c296a1341b91508db52717787c4cb535..508454181366759478e2206aac955fabb9c69590 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -23,6 +23,7 @@
       <definition name="SUPPORTED_FF72" displayName="$(string.SUPPORTED_FF72)"/>
       <definition name="SUPPORTED_FF73" displayName="$(string.SUPPORTED_FF73)"/>
       <definition name="SUPPORTED_FF74" displayName="$(string.SUPPORTED_FF74)"/>
       <definition name="SUPPORTED_FF72" displayName="$(string.SUPPORTED_FF72)"/>
       <definition name="SUPPORTED_FF73" displayName="$(string.SUPPORTED_FF73)"/>
       <definition name="SUPPORTED_FF74" displayName="$(string.SUPPORTED_FF74)"/>

+      <definition name="SUPPORTED_FF75" displayName="$(string.SUPPORTED_FF75)"/>

       <definition name="SUPPORTED_FF68ESR" displayName="$(string.SUPPORTED_FF68ESR)"/>
     </definitions>
   </supportedOn>
       <definition name="SUPPORTED_FF68ESR" displayName="$(string.SUPPORTED_FF68ESR)"/>
     </definitions>
   </supportedOn>


@@ -87,6 +88,9 @@
     <category displayName="$(string.TrackingProtection_group)" name="TrackingProtection">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.TrackingProtection_group)" name="TrackingProtection">
       <parentCategory ref="firefox"/>
     </category>

+    <category displayName="$(string.DNSOverHTTPS_group)" name="DNSOverHTTPS">
+      <parentCategory ref="firefox"/>
+    </category>

   </categories>
   <policies>
     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">
   </categories>
   <policies>
     <policy name="Authentication_SPNEGO" class="Both" displayName="$(string.Authentication_SPNEGO)"  key="Software\Policies\Mozilla\Firefox\Authentication\SPNEGO" explainText="$(string.Authentication_SPNEGO_Explain)" presentation="$(presentation.Authentication)">


@@ -472,6 +476,40 @@
         <text id="Preferences_String" valueName="DownloadDirectory" expandable="true"/>
       </elements>
     </policy>
         <text id="Preferences_String" valueName="DownloadDirectory" expandable="true"/>
       </elements>
     </policy>

+    <policy name="DNSOverHTTPS_Enabled" class="Both" displayName="$(string.DNSOverHTTPS_Enabled)" explainText="$(string.DNSOverHTTPS_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Enabled">
+      <parentCategory ref="DNSOverHTTPS"/>
+      <supportedOn ref="SUPPORTED_FF63ESR"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DNSOverHTTPS_ProviderURL" class="Both" displayName="$(string.DNSOverHTTPS_ProviderURL)" explainText="$(string.DNSOverHTTPS_ProviderURL_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.String)">
+      <parentCategory ref="DNSOverHTTPS"/>
+      <supportedOn ref="SUPPORTED_FF63ESR"/>
+      <elements>
+        <text id="String" valueName="ProviderURL"/>
+      </elements>
+    </policy>
+    <policy name="DNSOverHTTPS_Locked" class="Both" displayName="$(string.DNSOverHTTPS_Locked)" explainText="$(string.DNSOverHTTPS_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" valueName="Locked">
+      <parentCategory ref="DNSOverHTTPS"/>
+      <supportedOn ref="SUPPORTED_FF63ESR"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DNSOverHTTPS_ExcludedDomains" class="Both" displayName="$(string.DNSOverHTTPS_ExcludedDomains)" explainText="$(string.DNSOverHTTPS_ExcludedDomains_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.List)">
+      <parentCategory ref="DNSOverHTTPS"/>
+      <supportedOn ref="SUPPORTED_FF75"/>
+      <elements>
+        <list id="List" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS\ExcludedDomains" valuePrefix=""/>
+      </elements>
+    </policy>

     <policy name="DNSOverHTTPS" class="Both" displayName="$(string.DNSOverHTTPS)" explainText="$(string.DNSOverHTTPS_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.DNSOverHTTPS)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF63ESR" />
     <policy name="DNSOverHTTPS" class="Both" displayName="$(string.DNSOverHTTPS)" explainText="$(string.DNSOverHTTPS_Explain)" key="Software\Policies\Mozilla\Firefox\DNSOverHTTPS" presentation="$(presentation.DNSOverHTTPS)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF63ESR" />

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 7e7e9bfa0931dc70fc2a4c8ba55710770ec8e211..449299eb4190e827a0e8180f8356708dddec68eb 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 ou supérieur, Firefox 68.4 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF73">Firefox 73 ou supérieur, Firefox 68.5 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF74">Firefox 74 ou supérieur, Firefox 68.6 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF72">Firefox 72 ou supérieur, Firefox 68.4 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF73">Firefox 73 ou supérieur, Firefox 68.5 ESR ou supérieur</string>\r
       <string id="SUPPORTED_FF74">Firefox 74 ou supérieur, Firefox 68.6 ESR ou supérieur</string>\r

+      <string id="SUPPORTED_FF75">Firefox 75 ou supérieur, Firefox 68.7 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
       <string id="firefox">Firefox</string>\r
       <string id="Permissions_group">Permissions</string>\r
       <string id="Camera_group">Caméra</string>\r


@@ -116,7 +117,25 @@ Si cette stratégie est désactivée ou non configurée, le répertoire de tél
       <string id="DownloadDirectory_Explain">Si cette stratégie est activée, vous pouvez définir et verrouiller le répertoire de téléchargement. ${home} peut être utilisé comme chemin de base.\r
 \r
 Si cette stratégie est désactivée ou non configurée, le répertoire de téléchargement par défaut de Firefox est utilisé et l'uilisateur peut le modifier.</string>\r
       <string id="DownloadDirectory_Explain">Si cette stratégie est activée, vous pouvez définir et verrouiller le répertoire de téléchargement. ${home} peut être utilisé comme chemin de base.\r
 \r
 Si cette stratégie est désactivée ou non configurée, le répertoire de téléchargement par défaut de Firefox est utilisé et l'uilisateur peut le modifier.</string>\r

-      <string id="DNSOverHTTPS">Configurer DNS sur HTTPS</string>\r
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>\r
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>\r
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.\r
+\r
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>\r
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>\r
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.\r
+\r
+If this policy is disabled or not configured, the default provider is used.</string>\r
+\r
+      <string id="DNSOverHTTPS_Locked">Locked</string>\r
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.\r
+\r
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>\r
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>\r
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.\r
+\r
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>\r
+      <string id="DNSOverHTTPS">Configurer DNS sur HTTPS (Moved)</string>\r

       <string id="DNSOverHTTPS_Explain">Si cette stratégie est activée, la configuration par défaut de DNS sur HTTPS peut être modifiée.\r
 \r
 Si cette stratégie est désactivée ou non configurée, DNS Over HTTPS utilise la configuration par défaut de Firefox.</string>\r
       <string id="DNSOverHTTPS_Explain">Si cette stratégie est activée, la configuration par défaut de DNS sur HTTPS peut être modifiée.\r
 \r
 Si cette stratégie est désactivée ou non configurée, DNS Over HTTPS utilise la configuration par défaut de Firefox.</string>\r


@@ -948,6 +967,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">\r
         <dropdownList refId="DisplayMenuBar"/>\r
       </presentation>\r
       <presentation id="DisplayMenuBar">\r
         <dropdownList refId="DisplayMenuBar"/>\r
       </presentation>\r

+      <presentation id="String">\r
+        <textBox refId="String">\r
+          <label/>\r
+        </textBox>\r
+      </presentation>\r
+      <presentation id="List">\r
+        <listBox refId="List"/>\r
+      </presentation>\r

     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r
     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index fa482e14e2b26e8cfdc768c9b553e050ddae9339..3280e7cf5ef24eb10ed7e7949226ad8eee16050a 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 o versione successiva, Firefox 68.4 ESR o versione successiva</string>
       <string id="SUPPORTED_FF73">Firefox 73 o versione successiva, Firefox 68.5 ESR o versione successiva</string>
       <string id="SUPPORTED_FF74">Firefox 74 o versione successiva, Firefox 68.6 ESR o versione successiva</string>
       <string id="SUPPORTED_FF72">Firefox 72 o versione successiva, Firefox 68.4 ESR o versione successiva</string>
       <string id="SUPPORTED_FF73">Firefox 73 o versione successiva, Firefox 68.5 ESR o versione successiva</string>
       <string id="SUPPORTED_FF74">Firefox 74 o versione successiva, Firefox 68.6 ESR o versione successiva</string>

+      <string id="SUPPORTED_FF75">Firefox 75 o versione successiva, Firefox 68.7 ESR o versione successiva</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permessi</string>
       <string id="Camera_group">Fotocamera</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permessi</string>
       <string id="Camera_group">Fotocamera</string>


@@ -116,7 +117,25 @@ Se questo criterio è disabilitato o non configurato, Firefox utilizzerà la dir
       <string id="DownloadDirectory_Explain">Se questo criterio è abilitato, è possibile impostare e rendere non modificabile la directory per i download. È possibile usare ${home} per specificare il percorso nativo della directory utente.
 
 Se questo criterio è disabilitato o non configurato, Firefox utilizzerà la directory di download predefinita e l'utente sarà in grado di modificarla.</string>
       <string id="DownloadDirectory_Explain">Se questo criterio è abilitato, è possibile impostare e rendere non modificabile la directory per i download. È possibile usare ${home} per specificare il percorso nativo della directory utente.
 
 Se questo criterio è disabilitato o non configurato, Firefox utilizzerà la directory di download predefinita e l'utente sarà in grado di modificarla.</string>

-      <string id="DNSOverHTTPS">Configura DNS su HTTPS</string>
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.
+
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.
+
+If this policy is disabled or not configured, the default provider is used.</string>
+
+      <string id="DNSOverHTTPS_Locked">Locked</string>
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.
+
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.
+
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>
+      <string id="DNSOverHTTPS">Configura DNS su HTTPS (Moved)</string>

       <string id="DNSOverHTTPS_Explain">Se questo criterio è abilitato, la configurazione predefinita per DNS su HTTPS può essere modificata.
 
 Se questo criterio è disabilitato o non configurato, DNS su HTTPS utilizza la configurazione predefinita di Firefox.</string>
       <string id="DNSOverHTTPS_Explain">Se questo criterio è abilitato, la configurazione predefinita per DNS su HTTPS può essere modificata.
 
 Se questo criterio è disabilitato o non configurato, DNS su HTTPS utilizza la configurazione predefinita di Firefox.</string>


@@ -948,6 +967,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="String">
+        <textBox refId="String">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="List">
+        <listBox refId="List"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 7afaf38389bb7a1be580955408d2b02cee0b45a7..51a89b4ae8c7aa445e0c101a4f112cdcd0238629 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -22,6 +22,7 @@
       <string id="SUPPORTED_FF72">Firefox 72 或更新版本、Firefox 68.4 ESR 或更新版本</string>
       <string id="SUPPORTED_FF73">Firefox 73 或更新版本、Firefox 68.5 ESR 或更新版本</string>
       <string id="SUPPORTED_FF74">Firefox 74 或更新版本、Firefox 68.6 ESR 或更新版本</string>
       <string id="SUPPORTED_FF72">Firefox 72 或更新版本、Firefox 68.4 ESR 或更新版本</string>
       <string id="SUPPORTED_FF73">Firefox 73 或更新版本、Firefox 68.5 ESR 或更新版本</string>
       <string id="SUPPORTED_FF74">Firefox 74 或更新版本、Firefox 68.6 ESR 或更新版本</string>

+      <string id="SUPPORTED_FF75">Firefox 75 或更新版本、Firefox 68.7 ESR 或更新版本</string>

       <string id="firefox">Firefox</string>
       <string id="Permissions_group">權限</string>
       <string id="Camera_group">攝影機</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">權限</string>
       <string id="Camera_group">攝影機</string>


@@ -116,7 +117,25 @@ If this policy is enabled or not configured, authentication preferences cannot b
       <string id="DownloadDirectory_Explain">若啟用此原則，可設定並固定下載項目的預設儲存資料夾。可使用 ${home} 來指定家目錄。
 
 若停用或不設定此原則，將使用 Firefox 的預設下載資料夾，且可由使用者變更。</string>
       <string id="DownloadDirectory_Explain">若啟用此原則，可設定並固定下載項目的預設儲存資料夾。可使用 ${home} 來指定家目錄。
 
 若停用或不設定此原則，將使用 Firefox 的預設下載資料夾，且可由使用者變更。</string>

-      <string id="DNSOverHTTPS">設定 DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_group">DNS Over HTTPS</string>
+      <string id="DNSOverHTTPS_Enabled">Enabled</string>
+      <string id="DNSOverHTTPS_Enabled_Explain">If this policy is disabled, DNS over HTTPS is disabled.
+
+If this policy is enabled or not configured, DNS Over HTTPS is enabled.</string>
+      <string id="DNSOverHTTPS_ProviderURL">Provider URL</string>
+      <string id="DNSOverHTTPS_ProviderURL_Explain">If this policy is enabled, the URL specified is used as the provider URL.
+
+If this policy is disabled or not configured, the default provider is used.</string>
+
+      <string id="DNSOverHTTPS_Locked">Locked</string>
+      <string id="DNSOverHTTPS_Locked_Explain">If this policy is enabled, DNS over HTTPS settings cannot be changed by the user.
+
+If this policy is disabled or not configured, DNS over HTTPS settings can be changed by the user.</string>
+      <string id="DNSOverHTTPS_ExcludedDomains">Excluded Domains</string>
+      <string id="DNSOverHTTPS_ExcludedDomains_Explain">If this policy is enabled, the specified domains are excluded from DNS over HTTPS.
+
+If this policy is disabled or not configured, no domains are excluded from DNS over HTTPS.</string>
+      <string id="DNSOverHTTPS">設定 DNS Over HTTPS (Moved)</string>

       <string id="DNSOverHTTPS_Explain">若啟用此原則，可變更預設 DNS over HTTPS 設定。
 
 若停用或不設定此原則，將使用預設 DNS Over HTTPS 設定。</string>
       <string id="DNSOverHTTPS_Explain">若啟用此原則，可變更預設 DNS over HTTPS 設定。
 
 若停用或不設定此原則，將使用預設 DNS Over HTTPS 設定。</string>


@@ -946,6 +965,14 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>

+      <presentation id="String">
+        <textBox refId="String">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="List">
+        <listBox refId="List"/>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
\ No newline at end of file
     </presentationTable>
   </resources>
 </policyDefinitionResources>
\ No newline at end of file