From: Michael Vogt Date: Thu, 10 Feb 2011 16:51:44 +0000 (+0100) Subject: merged from lp:~mvo/apt/mvo X-Git-Tag: 0.8.11.2~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1dda80929fcd62c287a84f1ecc1277fc39890efe?hp=--cc merged from lp:~mvo/apt/mvo --- 1dda80929fcd62c287a84f1ecc1277fc39890efe diff --cc debian/changelog index deb4d3161,986b6f876..bc7092bb0 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,15 +1,29 @@@ + apt (0.8.12) UNRELEASED; urgency=low + + [ Michael Vogt ] + * merged lp:~evfool/apt/fix641673: + - String-fix in the source and the translations for the grammatical + mistake reported in bug LP: #641673, thanks to Robert Roth + * merged lp:~evfool/apt/fix418552: + - Grammar fix for bug LP: #418552, thanks to Robert Roth + - -- Michael Vogt Thu, 10 Feb 2011 17:37:56 +0100 ++ -- Michael Vogt Thu, 10 Feb 2011 17:51:16 +0100 + -apt (0.8.11) UNRELEASED; urgency=low +apt (0.8.11.1) unstable; urgency=low + + [ Stefan Lippers-Hollmann ] + * cmdline/apt-key: + - fix root test which prevented setting of trustdb-name + which lets gpg fail if it adds/remove keys from trusted.gpg + as it tries to open the (maybe) not existent /root/.gnupg + + [ David Kalnischkies ] + * debian/apt.symbols: + - add more arch dependent symbols + + -- Michael Vogt Wed, 09 Feb 2011 17:49:59 +0100 + +apt (0.8.11) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/depcache.cc: diff --cc po/es.po index c688f8d21,163cf9432..2cabf3b8e --- a/po/es.po +++ b/po/es.po @@@ -3268,10 -3195,8 +3268,10 @@@ msgstr "No se pudo encontrar ningún pa #: apt-pkg/cacheset.cc:467 #, c-format - msgid "Can't select versions from package '%s' as it purely virtual" + msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "No se pueden seleccionar distintas versiones del paquete «%s» porque es puramente virtual" +msgstr "" +"No se pueden seleccionar distintas versiones del paquete «%s» porque es " +"puramente virtual" #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 #, c-format