Release 1.2.2

diff --git a/configure.ac b/configure.ac
index 802cd5e02602f11ef83bcd45227b236a98001d87..eccb40403d01d6a4b29c2c2585910ff23a12da88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 PACKAGE="apt"

-PACKAGE_VERSION="1.2.1"
+PACKAGE_VERSION="1.2.2"

 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")

diff --git a/debian/changelog b/debian/changelog
index 350e6527a4615c7aabb824765e16fc76daff6026..d0fff8b510552ecf8db718938594df24a72912fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+apt (1.2.2) unstable; urgency=medium
+
+  [ David Kalnischkies ]
+  * always create pkg at the time pkg:arch is created
+  * reimplement build-dep via apts normal resolver
+    (Closes: #137560, #444930, #489911, #583914, #728317, #812173)
+  * parse version correctly from binary Source field (Closes: 812492)
+  * get sources for packages in multiple releases again (Closes: 812497)
+  * only warn about missing/invalid Date field for now (Closes: 809329)
+  * support <libc>-<kernel>-<cpu> in architecture specs.
+    Thanks to Bálint Réczey for initial patch (Closes: #812212)
+  * avoid building dependency tree in 'source' command
+
+  [ Stefan Bühler ]
+  * fix "Mismatched free() / delete / delete []" in simple_buffer
+
+  [ Julian Andres Klode ]
+  * Do not buffer writes larger than the buffer if possible
+  * Drop the g++ build-dep, transition is done
+  * NEWS: Prefix the keep deb option with Binary::apt:: (Closes: #812111)
+  * rred: If there were I/O errors, fail
+  * Correctly report write errors when flushing buffered writer
+  * test: Fix apt-key tests to work with current gpg 2.1
+
+  [ Manuel "Venturi" Porras Peralta ]
+  * Spanish program translation update (Closes: 813467)
+
+  [ Adrian Wielgosik ]
+  * Try avoiding loading long package description
+  * Avoid temporary strings in SubstVar.
+
+  [ Fredrik Fornwall ]
+  * edspsystem.cc: include <stdlib.h> for mkdtemp (Closes: #807367)
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 04 Feb 2016 22:50:43 +0100
+

 apt (1.2.1) unstable; urgency=high
 
   [ Zhou Mo ]
 apt (1.2.1) unstable; urgency=high
 
   [ Zhou Mo ]

diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6be663dfd85429c30104d8e519d58b6659ce3d02..d73094e888e4c4e3d726a13fceb8fd7b13b627d1 100644 (file)
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -237,7 +237,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
 ">
 
 <!-- this will be updated by 'prepare-release' -->

-<!ENTITY apt-product-version "1.2.1">
+<!ENTITY apt-product-version "1.2.2">

 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 98b28bae904da73d75dac37ba262288c5a76f97a..cca03bec1f68d9ed384cb70d2d2058ef0c47c3c0 100644 (file)
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: apt-doc 1.2.1\n"
+"Project-Id-Version: apt-doc 1.2.2\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/doc/po/de.po b/doc/po/de.po
index 2eabdaafe5e06e6206fa84c8a393b167f81b5b0d..b11cc8f71f02545bdaa94b62c4ed7c4615f1bc44 100644 (file)
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"

diff --git a/doc/po/es.po b/doc/po/es.po
index 96a8307f4de8b88839b1ab95962304cff9e0c585..18887f4c90f8b9b4df1c05ecf6cf949c4064e328 100644 (file)
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 97c7ee712e9b61c03daf59093079e20453d70f51..a1d1f505f787bca6e845278c2372f4f0317fd35a 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

diff --git a/doc/po/it.po b/doc/po/it.po
index 3d67b6837644d0af1ae79d642531130fe5ffd17b..8364e77e394f2580357c88a68241b74abf4be8c9 100644 (file)
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"

diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6d2e2fb9e54104fbc459c5338a2da3e8afe91374..a6cff54694e666ba727de1b1951c3724c224c47c 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2014-07-10 19:52+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"

diff --git a/doc/po/nl.po b/doc/po/nl.po
index ef87fa5f23a1eaaf45d35c842db45c0a974c31c1..9cbb156d23592005845997603d71df3dea27303c 100644 (file)
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.10.1-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.10.1-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2015-10-17 13:21+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "PO-Revision-Date: 2015-10-17 13:21+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"

diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9b87d2999a5a7f64fbbe128ffcf0b0b061496f4a..dc36760896201af773ae3dca96dbcea5b9d7e1b1 100644 (file)
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"

diff --git a/doc/po/pt.po b/doc/po/pt.po
index 70a75f8a2ce08b44c421a34e7e4634afe8b901d2..4952b672deb3ccff7017433361a5dc44c4ad2ac1 100644 (file)
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"

diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 72711ff44bbf4e255499b6e5188b4631c9d8487f..7a041471f904d46340960d1056dcd8b543a29b82 100644 (file)
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-01-25 18:05+0100\n"
+"POT-Creation-Date: 2016-02-04 22:52+0100\n"

 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"

diff --git a/po/es.po b/po/es.po
index 0327041f04298a740517fcdcf91ab7dbcf6c560f..77a43264cddd90a2e88398585e91e4d9c740d4e0 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -34,7 +34,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2016-02-02 14:30+0100\n"
+"POT-Creation-Date: 2016-01-25 18:05+0100\n"

 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"
 "PO-Revision-Date: 2016-01-26 01:51+0100\n"
 "Last-Translator: Manuel \"Venturi\" Porras Peralta <venturi@openmailbox."
 "org>\n"


@@ -314,36 +314,6 @@ msgstr "No tiene suficiente espacio libre en %s."
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 

-#: apt-private/private-install.cc
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"No se pudieron instalar algunos paquetes. Esto puede significar que\n"
-"usted pidió una situación imposible o, si está usando la distribución\n"
-"inestable, que algunos paquetes necesarios aún no se han creado o se\n"
-"han sacado de «Incoming»."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << std::endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << std::endl;
-#. }
-#.
-#: apt-private/private-install.cc
-msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente información puede ayudar a resolver la situación:"
-
-#: apt-private/private-install.cc
-msgid "Broken packages"
-msgstr "Paquetes rotos"
-

 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 #: apt-private/private-install.cc
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"


@@ -503,6 +473,20 @@ msgstr ""
 "Parece que «AutoRemover» destruyó algo y eso no debería haber pasado.\n"
 "Envíe un informe de errores al programa apt."
 
 "Parece que «AutoRemover» destruyó algo y eso no debería haber pasado.\n"
 "Envíe un informe de errores al programa apt."
 

+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "La siguiente información puede ayudar a resolver la situación:"
+

 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 #: apt-private/private-install.cc
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"


@@ -548,6 +532,22 @@ msgstr ""
 "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
 "especifique una solución)."
 
 "Dependencias incumplidas. Intente «apt-get -f install» sin paquetes (o "
 "especifique una solución)."
 

+#: apt-private/private-install.cc
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"No se pudieron instalar algunos paquetes. Esto puede significar que\n"
+"usted pidió una situación imposible o, si está usando la distribución\n"
+"inestable, que algunos paquetes necesarios aún no se han creado o se\n"
+"han sacado de «Incoming»."
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Paquetes rotos"
+

 #: apt-private/private-install.cc
 msgid "The following additional packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes adicionales:"
 #: apt-private/private-install.cc
 msgid "The following additional packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes adicionales:"


@@ -963,6 +963,59 @@ msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción «%s».\n"
 
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción «%s».\n"
 

+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque no se permite %s en "
+"los paquetes «%s»"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque no se puede encontrar "
+"el paquete %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
+"demasiado nuevo"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque la versión presentada "
+"del paquete %s no puede satisfacer los requisitos de versión"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
+"tiene ninguna versión presentada"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
+

 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 #: apt-private/private-source.cc
 #, c-format
 msgid "Unable to get build-dependency information for %s"


@@ -3902,46 +3955,6 @@ msgstr ""
 msgid "Calculating upgrade"
 msgstr "Calculando la actualización"
 
 msgid "Calculating upgrade"
 msgstr "Calculando la actualización"
 

-#~ msgid ""
-#~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-#~ "packages"
-#~ msgstr ""
-#~ "La dependencia %s para %s no puede satisfacerse porque no se permite %s "
-#~ "en los paquetes «%s»"
-
-#~ msgid ""
-#~ "%s dependency for %s cannot be satisfied because the package %s cannot be "
-#~ "found"
-#~ msgstr ""
-#~ "La dependencia %s para %s no puede satisfacerse porque no se puede "
-#~ "encontrar el paquete %s"
-
-#~ msgid ""
-#~ "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-#~ msgstr ""
-#~ "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s "
-#~ "es demasiado nuevo"
-
-#~ msgid ""
-#~ "%s dependency for %s cannot be satisfied because candidate version of "
-#~ "package %s can't satisfy version requirements"
-#~ msgstr ""
-#~ "La dependencia %s para %s no puede satisfacerse porque la versión "
-#~ "presentada del paquete %s no puede satisfacer los requisitos de versión"
-
-#~ msgid ""
-#~ "%s dependency for %s cannot be satisfied because package %s has no "
-#~ "candidate version"
-#~ msgstr ""
-#~ "La dependencia %s para %s no puede satisfacerse porque el paquete %s no "
-#~ "tiene ninguna versión presentada"
-
-#~ msgid "Failed to satisfy %s dependency for %s: %s"
-#~ msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
-
-#~ msgid "Build-dependencies for %s could not be satisfied."
-#~ msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
-

 #~ msgid "Problem unlinking %s"
 #~ msgstr "Se produjo un problema al desligar %s"
 
 #~ msgid "Problem unlinking %s"
 #~ msgstr "Se produjo un problema al desligar %s"