# HG changeset patch
# User SHiNE CsyFeK <csyfek@gmail.com>
# Date 1235539179 0
# Node ID 24741607dbf6ac0acb31cfdf6a87b54693b0d616
# Parent  c6e2af2208ad62d7c74fbc316b21ed14dd7351b4# Parent  7f736195a20b8fc562d58e247f45b28629a20953
propagate from branch 'im.pidgin.pidgin' (head f840352699c2a48d528c12e447b52af0a4137355)
            to branch 'im.pidgin.pidgin.openq' (head ecb808abf867fb33bcca401d4da6c03265d55824)

diff -r 7f736195a20b -r 24741607dbf6 libpurple/protocols/qq/ChangeLog
--- a/libpurple/protocols/qq/ChangeLog	Wed Feb 25 05:19:08 2009 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Wed Feb 25 05:19:39 2009 +0000
@@ -1,3 +1,6 @@
+2009.02.25 - flos <lonicerae(at)gmail.com>
+	* Changed text 'ZipCode' to 'Postal Code'
+
 2009.02.24 - flos <lonicerae(at)gmail.com>
 	* NEVER forget our COPYRIGHT, ;)
 
diff -r 7f736195a20b -r 24741607dbf6 libpurple/protocols/qq/buddy_memo.c
--- a/libpurple/protocols/qq/buddy_memo.c	Wed Feb 25 05:19:08 2009 +0000
+++ b/libpurple/protocols/qq/buddy_memo.c	Wed Feb 25 05:19:39 2009 +0000
@@ -77,7 +77,7 @@
 	N_("Telephone"),
 	N_("Address"),
 	N_("Email"),
-	N_("ZipCode"),
+	N_("Postal Code"),
 	N_("Note")
 };