diff options
Diffstat (limited to 'debian/po/es.po')
| -rw-r--r-- | debian/po/es.po | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/debian/po/es.po b/debian/po/es.po index 3bba235..2d7f3f4 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -31,7 +31,7 @@ msgid "" msgstr "" "Project-Id-Version: ucf 3.0025\n" "Report-Msgid-Bugs-To: ucf@packages.debian.org\n" -"POT-Creation-Date: 2014-05-07 01:28-0700\n" +"POT-Creation-Date: 2018-02-16 15:56-0800\n" "PO-Revision-Date: 2014-06-13 21:05-0300\n" "Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -93,8 +93,10 @@ msgstr "comparar a tres bandas las versiones disponibles" #. Choices #. Translators, please keep translations *short* (less than 65 columns) #: ../templates:3001 -msgid "do a 3-way merge between available versions (experimental)" -msgstr "fusionar a tres bandas las versiones disponibles (experimental)" +#, fuzzy +#| msgid "show a 3-way difference between available versions" +msgid "do a 3-way merge between available versions" +msgstr "comparar a tres bandas las versiones disponibles" #. Type: select #. Choices @@ -116,9 +118,7 @@ msgstr "" #. Type: select #. Description -#. Type: select -#. Description -#: ../templates:3002 ../templates:4002 +#: ../templates:3002 msgid "" "A new version (${NEW}) of configuration file ${FILE} is available, but the " "version installed currently has been locally modified." @@ -126,6 +126,20 @@ msgstr "" "Hay una nueva versión («${NEW}») del archivo de configuración «${FILE}» , " "pero la versión que está instalada ha sido modificada localmente." +#. Type: select +#. Description +#: ../templates:4002 +#, fuzzy +#| msgid "" +#| "A new version (${NEW}) of configuration file ${FILE} is available, but " +#| "the version installed currently has been locally modified." +msgid "" +"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is " +"available, but the version installed currently has been locally modified." +msgstr "" +"Hay una nueva versión («${NEW}») del archivo de configuración «${FILE}» , " +"pero la versión que está instalada ha sido modificada localmente." + #. Type: note #. Description #: ../templates:5001 @@ -158,6 +172,9 @@ msgstr "" "El archivo «${dest_file}.${ERR_SUFFIX}» tiene un registro del fallo de " "fusión del archivo de configuración." +#~ msgid "do a 3-way merge between available versions (experimental)" +#~ msgstr "fusionar a tres bandas las versiones disponibles (experimental)" + #~ msgid "" #~ "A new version of configuration file ${FILE} is available, but the version " #~ "installed currently has been locally modified." |