merge with debian-sid

debian/changelog

@@ -8,13 +8,21 @@ apt (0.8.15.10) UNRELEASEDunstable; urgency=low
   * apt-pkg/aptconfiguration.cc:
     - parse dpkg --print-foreign-architectures correctly in
       case archs are separated by newline instead of space, too.
+  * doc/po/de.po:
+    - apply typo-fix from Michael Basse, thanks! (LP: #900770)
 
   [ Chris Leick ]
   * German manpage translation update
   * doc/*.xml:
     - find and fix a bunch of misspellings
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 14 Dec 2011 12:32:37 +0100
+  [ Program translation updates ]
+  * Dutch (Jeroen Schot). Closes: #652230
+  * Slovak (Ivan Masar). Closes: #652985
+  * Russian (Yuri Kozlov). Closes: #654844
+  * Hungarian (Gabor Kelemen). Closes: #655238
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 10 Jan 2012 13:38:58 +0100
 
 apt (0.8.15.9) unstable; urgency=low
 

doc/po/de.po

@@ -3965,7 +3965,7 @@ msgid ""
 "Download only; package files are only retrieved, not unpacked or installed.  "
 "Configuration Item: <literal>APT::Get::Download-Only</literal>."
 msgstr ""
-"Nur herunterladen; Paketdateien werde nur heruntergeladen, nicht entpackt "
+"Nur herunterladen; Paketdateien werden nur heruntergeladen, nicht entpackt "
 "oder installiert. Konfigurationselement: <literal>APT::Get::Download-Only</"
 "literal>."