# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1305169122 0
# Node ID d034d1acfe03c5ea3e3580a64fbc5bac1ecc3e26
# Parent  7d75ffbde679950a693c0e0bb0c7c1616a615bd8# Parent  2f66104dab0cf67f0c0129c04adca2bc994af240
merge of '75fc33a55bbcdb1cd95b14f424826226c67018b0'
     and 'b9857c32002b782a67b23576214ef33234269032'

diff -r 7d75ffbde679 -r d034d1acfe03 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Thu May 12 02:58:18 2011 +0000
+++ b/pidgin/gtkdialogs.c	Thu May 12 02:58:42 2011 +0000
@@ -76,8 +76,6 @@
 	{"John 'rekkanoryo' Bailey",           NULL,                  NULL},
 	{"Ethan 'Paco-Paco' Blanton",          NULL,                  NULL},
 	{"Hylke Bons",                         N_("artist"),          "hylkebons@gmail.com"},
-	/* feel free to not translate this */
-	{N_("Ka-Hing Cheung"),                 NULL,                  NULL},
 	{"Sadrul Habib Chowdhury",             NULL,                  NULL},
 	{"Mark 'KingAnt' Doliner",             NULL,                  "mark@kingant.net"},
 	{"Casey Harkins",                      NULL,                  NULL},
@@ -113,6 +111,8 @@
 static const struct developer retired_developers[] = {
 	{"Herman Bloggs",               N_("win32 port"),          "herman@bluedigits.com"},
 	{"Thomas Butter",               NULL,                      NULL},
+	/* feel free to not translate this */
+	{N_("Ka-Hing Cheung"),                 NULL,                  NULL},
 	{"Jim Duchek",                  N_("maintainer"),          "jim@linuxpimps.com"},
 	{"Sean Egan",                   NULL,                      "sean.egan@gmail.com"},
 	{"Rob Flynn",                   N_("maintainer"),          NULL},