po: Regenerate .pot files and merge .po files with them

1 files changed, 58 insertions, 47 deletions

diff --git a/man/po/es.po b/man/po/es.po
index 94597856f..9f5df1a78 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2015-08-04 20:59+0200\n"
+"POT-Creation-Date: 2015-09-21 07:14+0200\n"
 "PO-Revision-Date: 2015-04-18 18:10+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -422,15 +422,17 @@ msgstr ""
 
 #. type: SH
 #: deb-control.5 deb-origin.5
-#, no-wrap
-msgid "REQUIRED FIELDS"
-msgstr "CAMPOS OBLIGATORIOS"
+#, fuzzy, no-wrap
+#| msgid "SOURCE FIELDS"
+msgid "FIELDS"
+msgstr "CAMPOS DE FUENTE"
 
 #. type: TP
 #: deb-control.5
-#, no-wrap
-msgid "B<Package:>I< package-name>"
-msgstr "B<Package>I<nombre-del-paquete>"
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Package:> I<package-name> (required)"
+msgstr "B<Package:> I<nombre-del-paquete-binario> (obligatorio)"
 
 #. type: Plain text
 #: deb-control.5
@@ -443,8 +445,9 @@ msgstr ""
 
 #. type: TP
 #: deb-control.5
-#, no-wrap
-msgid "B<Version:>I< version-string>"
+#, fuzzy, no-wrap
+#| msgid "B<Version:>I< version-string>"
+msgid "B<Version:> I<version-string> (required)"
 msgstr "B<Version:>I<cadena-de-caracteres-con-el-número-de-versión>"
 
 #. type: Plain text
@@ -461,10 +464,10 @@ msgstr ""
 "describen en B<deb-version>(5)."
 
 #. type: TP
-#: deb-control.5
+#: deb-control.5 deb-src-control.5
 #, no-wrap
-msgid "B<Maintainer:>I< fullname-email>"
-msgstr "B<Maintainer:>I<nombre-completo correo-electrónico>"
+msgid "B<Maintainer:> I<fullname-email> (required)"
+msgstr "B<Maintainer:> I<nombre-completo correo-electrónico> (obligatorio)"
 
 #. type: Plain text
 #: deb-control.5
@@ -482,11 +485,11 @@ msgstr ""
 "comE<gt>». Generalmente, es la persona que ha empaquetado el programa, y no "
 "su autor original."
 
-#. type: TP
-#: deb-control.5
+#. type: TQ
+#: deb-control.5 deb-src-control.5
 #, no-wrap
-msgid "B<Description:>I< short-description>"
-msgstr "B<Description:>I<descripción-corta>"
+msgid "B<Description:> I<short-description> (required)"
+msgstr "B<Description:> I<descripción-corta> (obligatorio)"
 
 #. type: TQ
 #: deb-control.5
@@ -516,12 +519,6 @@ msgstr ""
 "debe preceder cada línea de la descripción larga, y las líneas en blanco "
 "deben tener un único punto «.» a continuación del espacio precedente."
 
-#. type: SH
-#: deb-control.5 deb-origin.5
-#, no-wrap
-msgid "OPTIONAL FIELDS"
-msgstr "CAMPOS OPCIONALES"
-
 #. type: TP
 #: deb-control.5 deb-src-control.5
 #, no-wrap
@@ -1258,12 +1255,6 @@ msgstr ""
 "de suma (+), resta (-) y puntos (.). Los nombres de paquete deben tener una "
 "longitud mínima de 2 caracteres, y empezar con un carácter alfanumérico."
 
-#. type: TP
-#: deb-src-control.5
-#, no-wrap
-msgid "B<Maintainer:> I<fullname-email> (required)"
-msgstr "B<Maintainer:> I<nombre-completo correo-electrónico> (obligatorio)"
-
 #. type: Plain text
 #: deb-src-control.5
 #, fuzzy
@@ -1451,8 +1442,9 @@ msgstr ""
 
 #. type: TP
 #: deb-src-control.5
-#, no-wrap
-msgid "B<Build-Depends-Arch:>I< package list>"
+#, fuzzy, no-wrap
+#| msgid "B<Build-Depends-Arch:>I< package list>"
+msgid "B<Build-Depends-Arch:>I< package-list>"
 msgstr "B<Build-Depends-Arch:>I< lista-de-paquetes>"
 
 #. type: Plain text
@@ -1495,8 +1487,9 @@ msgstr ""
 
 #. type: TP
 #: deb-src-control.5
-#, no-wrap
-msgid "B<Build-Conflicts:>I< package list>"
+#, fuzzy, no-wrap
+#| msgid "B<Build-Conflicts:>I< package list>"
+msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Build-Conflicts:>I< lista-de-paquetes>"
 
 #. type: Plain text
@@ -1516,8 +1509,9 @@ msgstr ""
 
 #. type: TP
 #: deb-src-control.5
-#, no-wrap
-msgid "B<Build-Conflicts-Arch:>I< package list>"
+#, fuzzy, no-wrap
+#| msgid "B<Build-Conflicts-Arch:>I< package list>"
+msgid "B<Build-Conflicts-Arch:>I< package-list>"
 msgstr "B<Build-Conflicts-Arch:>I< lista-de-paquetes>"
 
 #. type: Plain text
@@ -1741,12 +1735,6 @@ msgstr ""
 "tamaño limitado utilizados por el instalador de Debian. «deb» es el valor "
 "predefinido cuando se omite el campo. Se añadirán más tipos en el futuro."
 
-#. type: TQ
-#: deb-src-control.5
-#, no-wrap
-msgid "B<Description:> I<short-description> (required)"
-msgstr "B<Description:> I<descripción-corta> (obligatorio)"
-
 #. type: Plain text
 #: deb-src-control.5
 msgid ""
@@ -2549,8 +2537,9 @@ msgstr ""
 
 #. type: TP
 #: deb-origin.5
-#, no-wrap
-msgid "B<Vendor:>I< vendor-name>"
+#, fuzzy, no-wrap
+#| msgid "B<Vendor:>I< vendor-name>"
+msgid "B<Vendor:> I<vendor-name> (required)"
 msgstr "B<Vendor:>I< proveedor>"
 
 #. type: Plain text
@@ -4590,7 +4579,7 @@ msgstr ""
 #: dpkg.1
 #, fuzzy, no-wrap
 #| msgid "B<-p>I<package>"
-msgid "B<--predep-packages>"
+msgid "B<--predep-package>"
 msgstr "B<-p>I<paquete>"
 
 #. type: Plain text
@@ -23645,12 +23634,19 @@ msgstr "B<--display> I<nombre>"
 
 #. type: Plain text
 #: update-alternatives.1
+#, fuzzy
+#| msgid ""
+#| "Display information about the link group.  Information displayed includes "
+#| "the group's mode (auto or manual), which alternative the master link "
+#| "currently points to, what other alternatives are available (and their "
+#| "corresponding slave alternatives), and the highest priority alternative "
+#| "currently installed."
 msgid ""
 "Display information about the link group.  Information displayed includes "
-"the group's mode (auto or manual), which alternative the master link "
-"currently points to, what other alternatives are available (and their "
-"corresponding slave alternatives), and the highest priority alternative "
-"currently installed."
+"the group's mode (auto or manual), the master and slave links, which "
+"alternative the master link currently points to, what other alternatives are "
+"available (and their corresponding slave alternatives), and the highest "
+"priority alternative currently installed."
 msgstr ""
 "Muestra información acerca del grupo de enlaces. La información incluye el "
 "modo del grupo (manual o automático), a qué alternativa apunta el enlace "
@@ -24198,6 +24194,21 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, el estándar de la jerarquía del sistema de ficheros."
 
+#~ msgid "REQUIRED FIELDS"
+#~ msgstr "CAMPOS OBLIGATORIOS"
+
+#~ msgid "B<Package:>I< package-name>"
+#~ msgstr "B<Package>I<nombre-del-paquete>"
+
+#~ msgid "B<Maintainer:>I< fullname-email>"
+#~ msgstr "B<Maintainer:>I<nombre-completo correo-electrónico>"
+
+#~ msgid "B<Description:>I< short-description>"
+#~ msgstr "B<Description:>I<descripción-corta>"
+
+#~ msgid "OPTIONAL FIELDS"
+#~ msgstr "CAMPOS OPCIONALES"
+
 #, fuzzy
 #~| msgid "2012-04-09"
 #~ msgid "2013-12-12"