* merged with mainline, finalized changelog

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-183
   Brazilian Portuguese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-184
   Italian translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-186
   Simplified Chinese translation update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-136
   * merged with bubulle

diff --combined debian/changelog
index b6f2a5d0c2b2fb900887a549e77cee5ebf424e46,cffe9eaa6aa377c81d2931763470736f3994a0d0..64c743a7f32497f50b170baadc57e4f5af6f573d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,22 +1,22 @@@
  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
+   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
+     * 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
+     * vi.po: Completed to 511 strings  Closes: #348968
+     * zh_CN.po: Completed to 512t. Closes: #353936
+     * it.po: Completed to 512t. Closes: #352803
+     * pt_BR.po: Completed to 512t. Closes: #352419
      * 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)
@@@ -26,7 -28,7 +28,7 @@@
    * cmdline/apt-get.cc: only run the list-cleaner if a update was 
      successfull
  
-- -- 
++ -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
  
  apt (0.6.43.2) unstable; urgency=low