From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 16 Sep 2019 22:29:49 +0000 (-0500)
Subject: Merge pull request #439 from alexisabarca/patch-1
X-Git-Tag: v1.10~16
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/e4f00d0145a5aa50b5274c8cfa5a3f20dcfe5585?ds=inline;hp=-c

Merge pull request #439 from alexisabarca/patch-1

fix duplicate key SUPPORTED_FF69
---

e4f00d0145a5aa50b5274c8cfa5a3f20dcfe5585
diff --combined windows/es-ES/firefox.adml
index ceb39c0,0c5ebdb..9c8faed
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@@ -15,7 -15,7 +15,7 @@@
        <string id="SUPPORTED_FF6801">Firefox 68.0.1 o posterior, Firefox 68.0.1 ESR o posterior</string>
        <string id="SUPPORTED_FF60ESR">Firefox 60 ESR o posterior</string>
        <string id="SUPPORTED_FF69">Firefox 69 o posterior, Firefox 68.1 ESR o posterior</string>
-       <string id="SUPPORTED_FF69">Firefox 70 o posterior, Firefox 68.2 ESR o posterior</string>
+       <string id="SUPPORTED_FF70">Firefox 70 o posterior, Firefox 68.2 ESR o posterior</string>
        <string id="firefox">Firefox</string>
        <string id="Permissions_group">Permisos</string>
        <string id="Camera_group">Camera</string>
@@@ -736,7 -736,7 +736,7 @@@ Si esta política está deshabilitada 
          <dropdownList refId="SSLVersion"/>
        </presentation>
        <presentation id="SupportMenu">
 -        <text>Title:</text>
 +        <text>Título:</text>
          <textBox refId="SupportMenuTitle">
            <label/>
          </textBox>
@@@ -744,7 -744,7 +744,7 @@@
          <textBox refId="SupportMenuURL">
            <label/>
          </textBox>
 -        <text>Access key:</text>
 +        <text>Clave de acceso:</text>
          <textBox refId="SupportMenuAccessKey">
            <label/>
          </textBox>