Merge pull request #701 from petercpg/1022_zhtw

[policy-templates.git] / windows / es-ES / firefox.adml

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index ab3e4b16a3ef0024f5fce82f469bda9810ff4a26..c9a67394a0fb67cd79f996cd16138813957edad1 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="2.2" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.4" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -32,6 +32,11 @@
       <string id="SUPPORTED_FF79">Firefox 79 o posterior, Firefox 78.1 ESR o posterior</string>
       <string id="SUPPORTED_FF80">Firefox 80 o posterior, Firefox 78.2 ESR o posterior</string>
       <string id="SUPPORTED_FF81">Firefox 81 o posterior, Firefox 78.3 ESR o posterior</string>
       <string id="SUPPORTED_FF79">Firefox 79 o posterior, Firefox 78.1 ESR o posterior</string>
       <string id="SUPPORTED_FF80">Firefox 80 o posterior, Firefox 78.2 ESR o posterior</string>
       <string id="SUPPORTED_FF81">Firefox 81 o posterior, Firefox 78.3 ESR o posterior</string>

+      <string id="SUPPORTED_FF82">Firefox 82 o posterior, Firefox 78.4 ESR o posterior</string>
+      <string id="SUPPORTED_FF83">Firefox 83 o posterior, Firefox 78.5 ESR o posterior</string>
+      <string id="SUPPORTED_FF84">Firefox 84 o posterior, Firefox 78.6 ESR o posterior</string>
+      <string id="SUPPORTED_FF85">Firefox 85 o posterior, Firefox 78.7 ESR o posterior</string>
+      <string id="SUPPORTED_FF86">Firefox 86 o posterior, Firefox 78.8 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>


@@ -50,7 +55,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Página de inicio</string>
       <string id="Search_group">Búsqueda</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Página de inicio</string>
       <string id="Search_group">Búsqueda</string>

-      <string id="Preferences_group">Preferencias</string>
+      <string id="Preferences_group">Preferencias (obsoleto)</string>

       <string id="UserMessaging_group">Mensajería del usuario</string>
       <string id="DisabledCiphers_group">Cifrados deshabilitados</string>
       <string id="EncryptedMediaExtensions_group">Extensiones de medios cifrados</string>
       <string id="UserMessaging_group">Mensajería del usuario</string>
       <string id="DisabledCiphers_group">Cifrados deshabilitados</string>
       <string id="EncryptedMediaExtensions_group">Extensiones de medios cifrados</string>


@@ -804,6 +809,12 @@ If this policy is not configured, users can choose to create a primary password.
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>

+      <string id="Preferences">Preferencias</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>

       <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
 
 Para una descripción de la preferencia, visita:
       <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
 
 Para una descripción de la preferencia, visita:


@@ -1108,6 +1119,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>

+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>

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