From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 8 Feb 2006 10:30:15 +0000 (+0000)
Subject: * merged with bubulle
X-Git-Tag: 0.7.24ubuntu1~271^2~1
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/48f0b1de6f858ef42cfedb1068e2251c6b0e445d?ds=inline;hp=--cc

* merged with bubulle


Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-174
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

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

48f0b1de6f858ef42cfedb1068e2251c6b0e445d
diff --cc debian/changelog
index 4f2ea848a,3c3fbb4a9..1f9823971
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,3 +1,34 @@@
 +apt (0.6.43.3) unstable; urgency=low
 +
++  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
++  	* ca.po: Completed to 512t. Closes: #351592
++	* eu.po: Completed to 512t. Closes: #350483
++	* ja.po: Completed to 512t. Closes: #349806
++	* pl.po: Completed to 512t. Closes: #349514
++	* sk.po: Completed to 512t. Closes: #349474
++	* gl.po: Completed to 512 strings 
++	         Closes: #349407
++	* vi.po: Completed to 512 strings
++	* sv.po: Completed to 512 strings
++	         Closes: #349210
++	* ru.po: Completed to 512 strings
++	         Closes: #349154
++	* da.po: Completed to 512 strings
++	         Closes: #349084
++	* fr.po: Completed to 512 strings
++	* LINGUAS: Add Welsh
++	* *.po: Updated from sources (512 strings)
++	* vi.po: Completed to 511 strings
++	         Closes: #348968
 +  * apt-pkg/deb/deblistparser.cc:
 +    - don't explode on a DepCompareOp in a Provides line, but warn about
 +      it and ignore it otherwise (thanks to James Troup for reporting it)
 +  * cmdline/apt-get.cc:
 +    - don't lock the lists directory in DoInstall, breaks --print-uri 
 +      (thanks to James Troup for reporting it)
 +
 + -- 
 +
  apt (0.6.43.2) unstable; urgency=low
  
    * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: