summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-07-31 13:21:31 +0000
committerChristian Perrier <bubulle@debian.org>2005-07-31 13:21:31 +0000
commit2a9f1f154b8c450b71efdb097f5444f49a4161e2 (patch)
treefb68b5f06efb992d9bb537b61e8ffae7d678ef2b /debian
parent26e38fa219148b6ac7c2729f194658fde791806e (diff)
Sync with Matt
Patches applied: * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog5
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1b09ab69d..78b400954 100644
--- 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