From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 10 Jan 2006 15:51:33 +0000 (+0000)
Subject: * merged from bubulle
X-Git-Tag: 0.7.24ubuntu1~275^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/610a00396d7bb5c9412cdecdc645be2f54a7188b

* merged from bubulle


Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-152
   Updated Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-153
   Close the right bug for Slovak translation

 * bubulle@debian.org--2005/apt--main--0--patch-154
   French manpages translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-156
   Better makefile for more up-to-date PO and POT

 * bubulle@debian.org--2005/apt--main--0--patch-157
   Run make uupdate-po

 * bubulle@debian.org--2005/apt--main--0--patch-158
   Fix spaces errors in some translations

 * bubulle@debian.org--2005/apt--main--0--patch-159
   Patch to allow "make apt-all.pot" work in the baz archive

 * philippe.batailler@free.fr--2005/apt--main--0--patch-6
   Change apt.ent.fr

 * philippe.batailler@free.fr--2005/apt--main--0--patch-7
   Update manpages
---

610a00396d7bb5c9412cdecdc645be2f54a7188b
diff --cc debian/changelog
index 694d91b68,694d91b68..5e14a92f9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,3 +1,17 @@@
++apt (0.6.43.2) unstable; urgency=low
++
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
++    - en_GB.po, de.po: fix spaces errors in "Ign " translations
++      Closes: #347258
++    - makefile: make update-po a pre-requisite of clean target so
++	        that POT and PO files are always up-to-date
++    - sv.po: Completed to 511t. Closes: #346450
++    - sk.po: Completed to 511t. Closes: #346369
++    - fr.po: Completed to 511t
++    - *.po: Updated from sources (511 strings)
++
++ --
++
  apt (0.6.43.1) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: