X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4f5bd4471049f89c4ce52864e62f54aadf1804d4..d77f118854b7fcd1552272c97a3ddf02080f94c6:/debian/changelog?ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index 2f7e5f872..83135ec08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ apt (0.6.44.1exp1) experimental; urgency=low
   * added support for i18n of the package descriptions
   * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch
   * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental
+  * merged patch from Otavio (thanks!) to better support translations
+    that need the full language-code (like pt_BR)
   
- -- Michael Vogt <mvo@debian.org>  Wed,  1 Mar 2006 13:34:15 +0100
+ -- Michael Vogt <mvo@debian.org>  Tue,  6 Jun 2006 19:31:31 +0200
 
 apt (0.6.44.1) unstable; urgency=low
 
@@ -313,7 +315,6 @@ apt (0.6.38) unstable; urgency=low
   
  -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
 
->>>>>>> MERGE-SOURCE
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81