changeset 32545:efb369d5ff29

Show multiple translators under the same language entry.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 23 Feb 2012 06:23:50 +0000
parents 130f0c87a85d
children 5558d0751d75
files pidgin/gtkdialogs.c
diffstat 1 files changed, 74 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdialogs.c	Thu Feb 23 06:16:46 2012 +0000
+++ b/pidgin/gtkdialogs.c	Thu Feb 23 06:23:50 2012 +0000
@@ -142,33 +142,34 @@
 	{NULL, NULL, NULL}
 };
 
-/* Order: Code, then Alphabetical by Last Name */
+/* Order: Code, then Alphabetical by Last Name
+   Use NULL language and code for secondary translators. */
 static const struct translator translators[] = {
 	{N_("Afrikaans"),           "af", "Samuel Murray", "afrikaans@gmail.com"},
-	{N_("Afrikaans"),           "af", "Friedel Wolff", "friedel@translate.org.za"},
+	{NULL,                      NULL, "Friedel Wolff", "friedel@translate.org.za"},
 	{N_("Arabic"),              "ar", "Khaled Hosny", "khaledhosny@eglug.org"},
 	{N_("Assamese"),            "as", "Amitakhya Phukan", "aphukan@fedoraproject.org"},
 	{N_("Belarusian Latin"),    "be@latin", "Ihar Hrachyshka", "ihar.hrachyshka@gmail.com"},
 	{N_("Bulgarian"),           "bg", "Vladimira Girginova", "missing@here.is"},
-	{N_("Bulgarian"),           "bg", "Vladimir (Kaladan) Petkov", "kaladan@gmail.com"},
+	{NULL,                      NULL, "Vladimir (Kaladan) Petkov", "kaladan@gmail.com"},
 	{N_("Bengali"),             "bn", "Israt Jahan", "israt@ankur.org.bd"},
-	{N_("Bengali"),             "bn", "Jamil Ahmed", "jamil@bengalinux.org"},
-	{N_("Bengali"),             "bn", "Samia Nimatullah", "mailsamia2001@yahoo.com"},
+	{NULL,                      NULL, "Jamil Ahmed", "jamil@bengalinux.org"},
+	{NULL,                      NULL, "Samia Nimatullah", "mailsamia2001@yahoo.com"},
 	{N_("Bengali-India"),       "bn_IN", "Runa Bhattacharjee", "runab@fedoraproject.org"},
 	{N_("Bosnian"),             "bs", "Lejla Hadzialic", "lejlah@gmail.com"},
 	{N_("Catalan"),             "ca", "Josep Puigdemont", "josep.puigdemont@gmail.com"},
 	{N_("Valencian-Catalan"),   "ca@valencia", "Toni Hermoso", "toniher@softcatala.org"},
-	{N_("Valencian-Catalan"),   "ca@valencia", "Josep Puigdemont", "tradgnome@softcatala.org"},
+	{NULL,                      NULL, "Josep Puigdemont", "tradgnome@softcatala.org"},
 	{N_("Czech"),               "cs", "David Vachulka", "david@konstrukce-cad.com"},
 	{N_("Danish"),              "da", "Morten Brix Pedersen", "morten@wtf.dk"},
-	{N_("Danish"),              "da", "Peter Bach", "bach.peter@gmail.com"},
+	{NULL,                      NULL, "Peter Bach", "bach.peter@gmail.com"},
 	{N_("German"),              "de", "Björn Voigt", "bjoern@cs.tu-berlin.de"},
-	{N_("German"),              "de", "Jochen Kemnade", "jochenkemnade@web.de"},
+	{NULL,                      NULL, "Jochen Kemnade", "jochenkemnade@web.de"},
 	{N_("Dzongkha"),            "dz", "Norbu", "nor_den@hotmail.com"},
-	{N_("Dzongkha"),            "dz", "Jurmey Rabgay", "jur_gay@yahoo.com"},
-	{N_("Dzongkha"),            "dz", "Wangmo Sherpa", "rinwanshe@yahoo.com"},
+	{NULL,                      NULL, "Jurmey Rabgay", "jur_gay@yahoo.com"},
+	{NULL,                      NULL, "Wangmo Sherpa", "rinwanshe@yahoo.com"},
 	{N_("Greek"),               "el", "Katsaloulis Panayotis", "panayotis@panayotis.com"},
-	{N_("Greek"),               "el", "Bouklis Panos", "panos@echidna-band.com"},
+	{NULL,                      NULL, "Bouklis Panos", "panos@echidna-band.com"},
 	{N_("Australian English"),  "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"},
 	{N_("British English"),     "en_GB", "Phil Hannent", "phil@hannent.co.uk"},
 	{N_("Canadian English"),    "en_CA", "Adam Weinberger", "adamw@gnome.org"},
@@ -177,18 +178,18 @@
 	{N_("Estonian"),            "et", "Ivar Smolin", "okul@linux.ee"},
 	{N_("Basque"),              "eu", "Mikel Pascual Aldabaldetreku", "mikel.paskual@gmail.com"},
 	{N_("Persian"),             "fa", "Elnaz Sarbar", "elnaz@farsiweb.info"},
-	{N_("Persian"),             "fa", "Meelad Zakaria", "meelad@farsiweb.info"},
-	{N_("Persian"),             "fa", "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
+	{NULL,                      NULL, "Meelad Zakaria", "meelad@farsiweb.info"},
+	{NULL,                      NULL, "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
 	{N_("Finnish"),             "fi", "Timo Jyrinki", "timo.jyrinki@iki.fi"},
 	{N_("French"),              "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"},
 	{N_("Irish"),               "ga", "Aaron Kearns", "ajkearns6@gmail.com"},
 	{N_("Galician"),            "gl", "Mar Castro", "mariamarcp@gmail.com"},
-	{N_("Galician"),            "gl", "Frco. Javier Rial", "fjrial@cesga.es"},
+	{NULL,                      NULL, "Frco. Javier Rial", "fjrial@cesga.es"},
 	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
-	{N_("Gujarati"),            "gu", N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
+	{NULL,                      NULL, N_("Gujarati Language Team"), "indianoss-gujarati@lists.sourceforge.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
-	{N_("Hindi"),               "hi", "Rajesh Ranjan", "rajeshkajha@yahoo.com"},
+	{NULL,                      NULL, "Rajesh Ranjan", "rajeshkajha@yahoo.com"},
 	{N_("Croatian"),            "hr", "Sabina Drempetić", "bina91991@googlemail.com"},
 	{N_("Hungarian"),           "hu", "Kelemen Gábor", "kelemeng@gnome.hu"},
 	{N_("Armenian"),            "hy", "David Avsharyan", "avsharyan@gmail.com"},
@@ -200,15 +201,15 @@
 	{N_("Kannada"),             "kn", N_("Kannada Translation team"), "translation@sampada.info"},
 	{N_("Korean"),              "ko", "Sushizang", "sushizang@empal.com"},
 	{N_("Kurdish"),             "ku", "Erdal Ronahi", "erdal.ronahi@gmail.com"},
-	{N_("Kurdish"),             "ku", "Amed Ç. Jiyan", "amedcj@hotmail.com"},
-	{N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
+	{NULL,                      NULL, "Amed Ç. Jiyan", "amedcj@hotmail.com"},
+	{NULL,                      NULL, "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
 	{N_("Lao"),                 "lo", "Anousak Souphavah", "anousak@gmail.com"},
 	{N_("Maithili"),            "mai", "Sangeeta Kumari", "sangeeta_0975@yahoo.com"},
-	{N_("Maithili"),            "mai", "Rajesh Ranjan", "rajeshkajha@yahoo.com"},
+	{NULL,                      NULL, "Rajesh Ranjan", "rajeshkajha@yahoo.com"},
 	{N_("Meadow Mari"),         "mhr", "David Preece", "davidpreece1@gmail.com"},
 	{N_("Macedonian"),          "mk", "Arangel Angov ", "arangel@linux.net.mk"},
-	{N_("Macedonian"),          "mk", "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
-	{N_("Macedonian"),          "mk", "Jovan Naumovski", "jovan@lugola.net"},
+	{NULL,                      NULL, "Ivana Kirkovska", "ivana.kirkovska@gmail.com"},
+	{NULL,                      NULL, "Jovan Naumovski", "jovan@lugola.net"},
 	{N_("Malayalam"),           "ml", "Ani Peter", "apeter@redhat.com"},
 	{N_("Mongolian"),           "mn", "gooyo", NULL},
 	{N_("Marathi"),             "mr", "Sandeep Shedmake", "sandeep.shedmake@gmail.com"},
@@ -225,20 +226,20 @@
 	{N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
 	{N_("Romanian"),            "ro", "Mișu Moldovan", "dumol@gnome.org"},
-	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
+	{NULL,                      NULL, "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
-	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
+	{NULL,                      NULL, "loptosko", "loptosko@gmail.com"},
 	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "miles@filmsi.net"},
 	{N_("Albanian"),            "sq", "Besnik Bleta", "besnik@programeshqip.org"},
 	{N_("Serbian"),             "sr", "Miloš Popović", "gpopac@gmail.com"},
 	{N_("Serbian Latin"),       "sr@latin", "Miloš Popović", "gpopac@gmail.com"},
 	{N_("Sinhala"),             "si", "Danishka Navin", "snavin@redhat.com"},
-	{N_("Sinhala"),             "si", "Yajith Ajantha Dayarathna", "yajith@gmail.com"},
+	{NULL,                      NULL, "Yajith Ajantha Dayarathna", "yajith@gmail.com"},
 	{N_("Swedish"),             "sv", "Peter Hjalmarsson", "xake@telia.com"},
 	{N_("Swahili"),             "sw", "Paul Msegeya", "msegeya@gmail.com"},
 	{N_("Tamil"),               "ta", "I. Felix", "ifelix25@gmail.com"},
-	{N_("Tamil"),               "ta", "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
+	{NULL,                      NULL, "Viveka Nathan K", "vivekanathan@users.sourceforge.net"},
 	{N_("Telugu"),              "te", "Krishnababu Krottapalli", "krottapalli@ymail.com"},
 	{N_("Thai"),                "th", "Isriya Paireepairit", "markpeak@gmail.com"},
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
@@ -247,10 +248,10 @@
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
 	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu@gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay@gmail.com"},
-	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli@ada.dhs.org"},
-	{N_("Hong Kong Chinese"),   "zh_HK", "Paladin R. Liu", "paladin@ms1.hinet.net"},
+	{NULL,                      NULL, "Ambrose C. Li", "acli@ada.dhs.org"},
+	{NULL,                      NULL, "Paladin R. Liu", "paladin@ms1.hinet.net"},
 	{N_("Traditional Chinese"), "zh_TW", "Ambrose C. Li", "acli@ada.dhs.org"},
-	{N_("Traditional Chinese"), "zh_TW", "Paladin R. Liu", "paladin@ms1.hinet.net"},
+	{NULL,                      NULL, "Paladin R. Liu", "paladin@ms1.hinet.net"},
 	{NULL, NULL, NULL, NULL}
 };
 
@@ -260,67 +261,71 @@
 	{N_("Arabic"),              "ar", "Mohamed Magdy", "alnokta@yahoo.com"},
 	{N_("Bulgarian"),           "bg", "Hristo Todorov", NULL},
 	{N_("Bengali"),             "bn", "INDRANIL DAS GUPTA", "indradg@l2c2.org"},
-	{N_("Bengali"),             "bn", "Tisa Nafisa", "tisa_nafisa@yahoo.com"},
+	{NULL,                      NULL, "Tisa Nafisa", "tisa_nafisa@yahoo.com"},
 	{N_("Catalan"),             "ca", "JM Pérez Cáncer", NULL},
-	{N_("Catalan"),             "ca", "Robert Millan", NULL},
+	{NULL,                      NULL, "Robert Millan", NULL},
 	{N_("Czech"),               "cs", "Honza Král", NULL},
-	{N_("Czech"),               "cs", "Miloslav Trmac", "mitr@volny.cz"},
-	{N_("German"),              "de", "Daniel Seifert, Karsten Weiss", NULL},
+	{NULL,                      NULL, "Miloslav Trmac", "mitr@volny.cz"},
+	{N_("German"),              "de", "Daniel Seifert", NULL},
+	{NULL,                      NULL, "Karsten Weiss", NULL},
 	{N_("British English"),     "en_GB", "Luke Ross", "luke@lukeross.name"},
 	{N_("Spanish"),             "es", "JM Pérez Cáncer", NULL},
-	{N_("Spanish"),             "es", "Nicolás Lichtmaier", NULL},
-	{N_("Spanish"),             "es", "Amaya Rodrigo", NULL},
-	{N_("Spanish"),             "es", "Alejandro G Villar", NULL},
+	{NULL,                      NULL, "Nicolás Lichtmaier", NULL},
+	{NULL,                      NULL, "Amaya Rodrigo", NULL},
+	{NULL,                      NULL, "Alejandro G Villar", NULL},
 	{N_("Basque"),              "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
-	{N_("Basque"),              "eu", "Hizkuntza Politikarako Sailburuordetza", "hizkpol@ej-gv.es"},
+	{NULL,                      NULL, "Hizkuntza Politikarako Sailburuordetza", "hizkpol@ej-gv.es"},
 	{N_("Finnish"),             "fi", "Arto Alakulju", NULL},
-	{N_("Finnish"),             "fi", "Tero Kuusela", NULL},
+	{NULL,                      NULL, "Tero Kuusela", NULL},
 	{N_("French"),              "fr", "Sébastien François", NULL},
-	{N_("French"),              "fr", "Stéphane Pontier", NULL},
-	{N_("French"),              "fr", "Stéphane Wirtel", NULL},
-	{N_("French"),              "fr", "Loïc Jeannin", NULL},
+	{NULL,                      NULL, "Stéphane Pontier", NULL},
+	{NULL,                      NULL, "Stéphane Wirtel", NULL},
+	{NULL,                      NULL, "Loïc Jeannin", NULL},
 	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", NULL},
 	{N_("Hebrew"),              "he", "Pavel Bibergal", NULL},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", NULL},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", NULL},
 	{N_("Italian"),             "it", "Salvatore di Maggio", NULL},
 	{N_("Japanese"),            "ja", "Takashi Aihana", NULL},
-	{N_("Japanese"),            "ja", "Ryosuke Kutsuna", NULL},
-	{N_("Japanese"),            "ja", "Taku Yasui", NULL},
-	{N_("Japanese"),            "ja", "Junichi Uekawa", NULL},
+	{NULL,                      NULL, "Ryosuke Kutsuna", NULL},
+	{NULL,                      NULL, "Taku Yasui", NULL},
+	{NULL,                      NULL, "Junichi Uekawa", NULL},
 	{N_("Georgian"),            "ka", "Temuri Doghonadze", NULL},
-	{N_("Korean"),              "ko", "Sang-hyun S, A Ho-seok Lee", NULL},
-	{N_("Korean"),              "ko", "Kyeong-uk Son", NULL},
+	{N_("Korean"),              "ko", "Sang-hyun S", NULL},
+	{NULL,                      NULL, "A Ho-seok Lee", NULL},
+	{NULL,                      NULL, "Kyeong-uk Son", NULL},
 	{N_("Lithuanian"),          "lt", "Laurynas Biveinis", "laurynas.biveinis@gmail.com"},
-	{N_("Lithuanian"),          "lt", "Gediminas Čičinskas", NULL},
-	{N_("Lithuanian"),          "lt", "Andrius Štikonas", NULL},
+	{NULL,                      NULL, "Gediminas Čičinskas", NULL},
+	{NULL,                      NULL, "Andrius Štikonas", NULL},
 	{N_("Macedonian"),          "mk", "Tomislav Markovski", NULL},
 	{N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
-	{N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
-	{N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
+	{NULL,                      NULL, "Petter Johan Olsen", NULL},
+	{NULL,                      NULL, "Espen Stefansen", "espenas@gmail.com"},
 	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
 	{N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
-	{N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
-	{N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
-	{N_("Polish"),              "pl", "Piotr Makowski", NULL},
-	{N_("Polish"),              "pl", "Przemysław Sułek", NULL},
+	{NULL,                      NULL, "Paweł Godlewski", "pawel@bajk.pl"},
+	{NULL,                      NULL, "Krzysztof Foltman", "krzysztof@foltman.com"},
+	{NULL,                      NULL, "Piotr Makowski", NULL},
+	{NULL,                      NULL, "Przemysław Sułek", NULL},
 	{N_("Portuguese-Brazil"),   "pt_BR", "Maurício de Lemos Rodrigues Collares Neto", "mauricioc@gmail.com"},
 	{N_("Russian"),             "ru", "Dmitry Beloglazov", "dmaa@users.sf.net"},
-	{N_("Russian"),             "ru", "Alexandre Prokoudine", NULL},
-	{N_("Russian"),             "ru", "Sergey Volozhanin", NULL},
+	{NULL,                      NULL, "Alexandre Prokoudine", NULL},
+	{NULL,                      NULL, "Sergey Volozhanin", NULL},
 	{N_("Slovak"),              "sk", "Daniel Režný", NULL},
-	{N_("Slovak"),              "sk", "helix84", NULL},
-	{N_("Slovak"),              "sk", "Richard Golier", NULL},
+	{NULL,                      NULL, "helix84", NULL},
+	{NULL,                      NULL, "Richard Golier", NULL},
 	{N_("Slovenian"),           "sl", "Matjaz Horvat", NULL},
 	{N_("Serbian"),             "sr", "Danilo Šegan", "dsegan@gmx.net"},
-	{N_("Serbian"),             "sr", "Aleksandar Urosevic", "urke@users.sourceforge.net"},
+	{NULL,                      NULL, "Aleksandar Urosevic", "urke@users.sourceforge.net"},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", NULL},
-	{N_("Swedish"),             "sv", "Christian Rose", NULL},
+	{NULL,                      NULL, "Christian Rose", NULL},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist@cdac.in"},
 	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", NULL},
-	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
-	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
-	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
+	{N_("Simplified Chinese"),  "zh_CN", "Hashao", NULL},
+	{NULL,                      NULL, "Rocky S. Lee", NULL},
+	{NULL,                      NULL, "Funda Wang", "fundawang@linux.net.cn"},
+	{N_("Traditional Chinese"), "zh_TW", "Hashao", NULL},
+	{NULL,                      NULL, "Rocky S. Lee", NULL},
 	{NULL, NULL, NULL, NULL}
 };
 
@@ -347,18 +352,17 @@
 static void
 add_translators(GString *str, const struct translator *list)
 {
-	for (; list->language != NULL; list++) {
+	for (; list->name != NULL; list++) {
+		if (list->language && list->abbr) {
+			g_string_append_printf(str, "<dt>%s (%s)</dt>",
+			                       _(list->language), list->abbr);
+		}
 		if (list->email != NULL) {
-			g_string_append_printf(str, "<dt>%s (%s)</dt><dd><a href=\"mailto:%s\">%s</a></dd>",
-			                       _(list->language),
-			                       list->abbr,
+			g_string_append_printf(str, "<dd><a href=\"mailto:%s\">%s</a></dd>",
 			                       list->email,
 			                       _(list->name));
 		} else {
-			g_string_append_printf(str, "<dt>%s (%s)</dt><dd>%s</dd>",
-			                       _(list->language),
-			                       list->abbr,
-			                       _(list->name));
+			g_string_append_printf(str, "<dd>%s</dd>", _(list->name));
 		}
 	}
 }