/soc/2013/ankitkv/gobjectification: 08260d94d8dd: Merged default...

[Ankit Vani]

Changeset: 08260d94d8dd0156412e4b93b24ad64f54ee5a10
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-29 16:49 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/08260d94d8dd

Description:

Merged default branch

diffstat:

 pidgin/gtkdialogs.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -79,7 +79,6 @@ struct artist {
 static const struct developer developers[] = {
 	{"Daniel 'datallah' Atallah",          NULL,                  NULL},
 	{"Paul 'darkrain42' Aurich",           NULL,                  NULL},
-	{"John 'rekkanoryo' Bailey",           NULL,                  NULL},
 	{"Ethan 'Paco-Paco' Blanton",          NULL,                  NULL},
 	{"Hylke Bons",                         N_("artist"),          "hylkebons at gmail.com"},
 	{"Sadrul Habib Chowdhury",             NULL,                  NULL},
@@ -112,9 +111,11 @@ static const struct developer patch_writ
 
 /* Order: Alphabetical by Last Name */
 static const struct developer retired_developers[] = {
+	{"John 'rekkanoryo' Bailey",    NULL,                      NULL},
 	{"Herman Bloggs",               N_("win32 port"),          "herman at bluedigits.com"},
 	{"Thomas Butter",               NULL,                      NULL},
-	/* feel free to not translate this */
+	/* Translators: This is a person's name. For most languages we recommend
+	   not translating it. */
 	{N_("Ka-Hing Cheung"),          NULL,                      NULL},
 	{"Jim Duchek",                  N_("maintainer"),          "jim at linuxpimps.com"},
 	{"Sean Egan",                   NULL,                      "sean.egan at gmail.com"},