* merged with bubulle

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-96
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-97
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-98
   Update PO files with the POT

 * bubulle@debian.org--2005/apt--main--0--patch-99
   Added Galician translation

 * bubulle@debian.org--2005/apt--main--0--patch-100
   Completed Danish translation

 * bubulle@debian.org--2005/apt--main--0--patch-101
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-102
   Merge with Michael Vogt's archive

 * bubulle@debian.org--2005/apt--main--0--patch-103
   Update the POT files and all PO files to resync with recent code

 * bubulle@debian.org--2005/apt--main--0--patch-104
   French translation completed

diff --cc debian/changelog
index 9194b8a,9194b8a..ac1e0e6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,8 -5,8 +5,13 @@@ apt (0.6.41.1) unstable; urgency=lo
    * allow cdrom failures and fallback to other sources in that case
      (closes: #44135)
    * better error text when dpkg-source fails 
--
-- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 13:45:53 +0200
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
++    - patch-99: Added Galician translation
++    - patch-100: Completed Danish translation (Closes: #325686)
++    - patch-104: French translation completed
++  * applied frensh man-page update (thanks to Philippe Batailler)
++  
++ -- 
  
  apt (0.6.41) unstable; urgency=low