Sync with Matt

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-105
   Merge from bubulle@debian.org--2005/apt--main--0

diff --git a/debian/changelog b/debian/changelog
index 1b09ab69dc01b98b9ebfb41682a72ccf60b2fbd8..78b400954882ccf6df4bbbc91df9b76613bcedfb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ apt (0.6.40) unstable; urgency=low
 
   * Patch from Jordi Mallach to mark some additional strings for translation
   * Updated Catalan translation from Jordi Mallach
+  * Merge from bubulle@debian.org--2005/apt--main--0:
+    - Update pot and merge with *.po
+    - Updated French translation, including apt-key.fr.8
 
- -- Matt Zimmerman <mdz@ubuntu.com>  Wed, 27 Jul 2005 13:00:04 -0700
+ -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 28 Jul 2005 11:57:32 -0700
 
 apt (0.6.39) unstable; urgency=low