* merged with bubulle, changelog updates

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-119
   Merge with Michael and add update-po as a pre-req for binary

 * bubulle@debian.org--2005/apt--main--0--patch-120
   Re-generate all PO Files

 * bubulle@debian.org--2005/apt--main--0--patch-121
   Complete French translation

 * bubulle@debian.org--2005/apt--main--0--patch-122
   Correct typography in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-123
   Spelling fix for consistency in French translation

 * bubulle@debian.org--2005/apt--main--0--patch-124
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-125
   Fixed localization of y/n questions in German translation

 * bubulle@debian.org--2005/apt--main--0--patch-126
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-127
   Complete Tagalog translation / Add Changelog

 * bubulle@debian.org--2005/apt--main--0--patch-128
   Danish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-129
   Basque translation update

diff --cc debian/changelog
index a4e4030300135a7e4f1b3dc01d661ef0c48c800e,a4e4030300135a7e4f1b3dc01d661ef0c48c800e..a8c9e398bba77b4eb579039d2f50809d9d0952f6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,7 +1,15 @@@
  apt (0.6.42.2) unstable; urgency=low
  
--  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
      - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
++    - patch-119: add update-po as a pre-req for binary (closes: #329910)
++    - patch-121: Complete French translation
++    - patch-125: Fixed localization of y/n questions in German translation 
++                 (closes: #337078)
++    - patch-126: Swedish translation update (closes: #337163)
++    - patch-127: Complete Tagalog translation (closes: #337306)
++    - patch-128: Danish translation update (closes: #337949)
++    - patch-129: Basque translation update (closes: #338101)
    * cmdline/apt-get.cc:
      - bufix in FindSrc  (closes: #335213)
    * added armeb to archtable (closes: #333599)