merged from lp:~mvo/apt/mvo

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc debian/changelog
index deb4d31613a0a439530f85d626695db516a21b4a,986b6f87615a5f3f36cf7f5b4cb9e01107429b79..bc7092bb009fb5cc3d34b8a4db32eaee010e0e44
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,15 +1,29 @@@
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Feb 2011 17:37:56 +0100
+ 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
+ 
 -apt (0.8.11) UNRELEASED; urgency=low
++ -- Michael Vogt <mvo@debian.org>  Thu, 10 Feb 2011 17:51:16 +0100
+ 
 +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 <mvo@debian.org>  Wed, 09 Feb 2011 17:49:59 +0100
 +
 +apt (0.8.11) unstable; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/depcache.cc:

diff --cc po/ar.po
Simple merge

diff --cc po/ast.po
Simple merge

diff --cc po/bg.po
Simple merge

diff --cc po/bs.po
Simple merge

diff --cc po/ca.po
Simple merge

diff --cc po/cs.po
Simple merge

diff --cc po/cy.po
Simple merge

diff --cc po/da.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/dz.po
Simple merge

diff --cc po/el.po
Simple merge

diff --cc po/es.po
index c688f8d2149c3f32c1d328c4b22576864711218e,163cf94327e0334b16d91b044f1667678c3be5f9..2cabf3b8e37aa2583a2cdbc4ffd033c8fb57382f
--- 1/po/es.po
--- 2/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

diff --cc po/eu.po
Simple merge

diff --cc po/fi.po
Simple merge

diff --cc po/fr.po
Simple merge

diff --cc po/gl.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/km.po
Simple merge

diff --cc po/ko.po
Simple merge

diff --cc po/ku.po
Simple merge

diff --cc po/lt.po
Simple merge

diff --cc po/mr.po
Simple merge

diff --cc po/nb.po
Simple merge

diff --cc po/ne.po
Simple merge

diff --cc po/nl.po
Simple merge

diff --cc po/nn.po
Simple merge

diff --cc po/pl.po
Simple merge

diff --cc po/pt.po
Simple merge

diff --cc po/pt_BR.po
Simple merge

diff --cc po/ro.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sk.po
Simple merge

diff --cc po/sl.po
Simple merge

diff --cc po/sv.po
Simple merge

diff --cc po/th.po
Simple merge

diff --cc po/tl.po
Simple merge

diff --cc po/uk.po
Simple merge

diff --cc po/vi.po
Simple merge

diff --cc po/zh_CN.po
Simple merge

diff --cc po/zh_TW.po
Simple merge

diff --cc test/integration/framework
Simple merge