pidgin: ec51c8bb: Show multiple translators under the same...
qulogic at pidgin.im
qulogic at pidgin.im
Thu Feb 23 04:06:35 EST 2012
----------------------------------------------------------------------
Revision: ec51c8bbb35b5c7f64a36575aa1bb8ec30b6b5ad
Parent: ee920e05a804090fe2352eb525958a78616407f3
Author: qulogic at pidgin.im
Date: 02/23/12 01:23:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ec51c8bbb35b5c7f64a36575aa1bb8ec30b6b5ad
Changelog:
Show multiple translators under the same language entry.
Changes against parent ee920e05a804090fe2352eb525958a78616407f3
patched pidgin/gtkdialogs.c
-------------- next part --------------
============================================================
--- pidgin/gtkdialogs.c 73dd2f6f84bb37e96714d83c0c441701eb769b45
+++ pidgin/gtkdialogs.c 0ce6ae971f4f4b93028ea97208deacc16c277ca9
@@ -142,33 +142,34 @@ static const struct developer retired_pa
{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 at gmail.com"},
- {N_("Afrikaans"), "af", "Friedel Wolff", "friedel at translate.org.za"},
+ {NULL, NULL, "Friedel Wolff", "friedel at translate.org.za"},
{N_("Arabic"), "ar", "Khaled Hosny", "khaledhosny at eglug.org"},
{N_("Assamese"), "as", "Amitakhya Phukan", "aphukan at fedoraproject.org"},
{N_("Belarusian Latin"), "be at latin", "Ihar Hrachyshka", "ihar.hrachyshka at gmail.com"},
{N_("Bulgarian"), "bg", "Vladimira Girginova", "missing at here.is"},
- {N_("Bulgarian"), "bg", "Vladimir (Kaladan) Petkov", "kaladan at gmail.com"},
+ {NULL, NULL, "Vladimir (Kaladan) Petkov", "kaladan at gmail.com"},
{N_("Bengali"), "bn", "Israt Jahan", "israt at ankur.org.bd"},
- {N_("Bengali"), "bn", "Jamil Ahmed", "jamil at bengalinux.org"},
- {N_("Bengali"), "bn", "Samia Nimatullah", "mailsamia2001 at yahoo.com"},
+ {NULL, NULL, "Jamil Ahmed", "jamil at bengalinux.org"},
+ {NULL, NULL, "Samia Nimatullah", "mailsamia2001 at yahoo.com"},
{N_("Bengali-India"), "bn_IN", "Runa Bhattacharjee", "runab at fedoraproject.org"},
{N_("Bosnian"), "bs", "Lejla Hadzialic", "lejlah at gmail.com"},
{N_("Catalan"), "ca", "Josep Puigdemont", "josep.puigdemont at gmail.com"},
{N_("Valencian-Catalan"), "ca at valencia", "Toni Hermoso", "toniher at softcatala.org"},
- {N_("Valencian-Catalan"), "ca at valencia", "Josep Puigdemont", "tradgnome at softcatala.org"},
+ {NULL, NULL, "Josep Puigdemont", "tradgnome at softcatala.org"},
{N_("Czech"), "cs", "David Vachulka", "david at konstrukce-cad.com"},
{N_("Danish"), "da", "Morten Brix Pedersen", "morten at wtf.dk"},
- {N_("Danish"), "da", "Peter Bach", "bach.peter at gmail.com"},
+ {NULL, NULL, "Peter Bach", "bach.peter at gmail.com"},
{N_("German"), "de", "Bj?rn Voigt", "bjoern at cs.tu-berlin.de"},
- {N_("German"), "de", "Jochen Kemnade", "jochenkemnade at web.de"},
+ {NULL, NULL, "Jochen Kemnade", "jochenkemnade at web.de"},
{N_("Dzongkha"), "dz", "Norbu", "nor_den at hotmail.com"},
- {N_("Dzongkha"), "dz", "Jurmey Rabgay", "jur_gay at yahoo.com"},
- {N_("Dzongkha"), "dz", "Wangmo Sherpa", "rinwanshe at yahoo.com"},
+ {NULL, NULL, "Jurmey Rabgay", "jur_gay at yahoo.com"},
+ {NULL, NULL, "Wangmo Sherpa", "rinwanshe at yahoo.com"},
{N_("Greek"), "el", "Katsaloulis Panayotis", "panayotis at panayotis.com"},
- {N_("Greek"), "el", "Bouklis Panos", "panos at echidna-band.com"},
+ {NULL, NULL, "Bouklis Panos", "panos at echidna-band.com"},
{N_("Australian English"), "en_AU", "Peter Lawler", "trans at six-by-nine.com.au"},
{N_("British English"), "en_GB", "Phil Hannent", "phil at hannent.co.uk"},
{N_("Canadian English"), "en_CA", "Adam Weinberger", "adamw at gnome.org"},
@@ -177,18 +178,18 @@ static const struct translator translato
{N_("Estonian"), "et", "Ivar Smolin", "okul at linux.ee"},
{N_("Basque"), "eu", "Mikel Pascual Aldabaldetreku", "mikel.paskual at gmail.com"},
{N_("Persian"), "fa", "Elnaz Sarbar", "elnaz at farsiweb.info"},
- {N_("Persian"), "fa", "Meelad Zakaria", "meelad at farsiweb.info"},
- {N_("Persian"), "fa", "Roozbeh Pournader ", "roozbeh at farsiweb.info"},
+ {NULL, NULL, "Meelad Zakaria", "meelad at farsiweb.info"},
+ {NULL, NULL, "Roozbeh Pournader ", "roozbeh at farsiweb.info"},
{N_("Finnish"), "fi", "Timo Jyrinki", "timo.jyrinki at iki.fi"},
{N_("French"), "fr", "?ric Boumaour", "zongo_fr at users.sourceforge.net"},
{N_("Irish"), "ga", "Aaron Kearns", "ajkearns6 at gmail.com"},
{N_("Galician"), "gl", "Mar Castro", "mariamarcp at gmail.com"},
- {N_("Galician"), "gl", "Frco. Javier Rial", "fjrial at cesga.es"},
+ {NULL, NULL, "Frco. Javier Rial", "fjrial at cesga.es"},
{N_("Gujarati"), "gu", "Ankit Patel", "ankit_patel at users.sf.net"},
- {N_("Gujarati"), "gu", N_("Gujarati Language Team"), "indianoss-gujarati at lists.sourceforge.net"},
+ {NULL, NULL, N_("Gujarati Language Team"), "indianoss-gujarati at lists.sourceforge.net"},
{N_("Hebrew"), "he", "Shalom Craimer", "scraimer at gmail.com"},
{N_("Hindi"), "hi", "Sangeeta Kumari", "sangeeta_0975 at yahoo.com"},
- {N_("Hindi"), "hi", "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
+ {NULL, NULL, "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
{N_("Croatian"), "hr", "Sabina Drempeti?", "bina91991 at googlemail.com"},
{N_("Hungarian"), "hu", "Kelemen G?bor", "kelemeng at gnome.hu"},
{N_("Armenian"), "hy", "David Avsharyan", "avsharyan at gmail.com"},
@@ -200,15 +201,15 @@ static const struct translator translato
{N_("Kannada"), "kn", N_("Kannada Translation team"), "translation at sampada.info"},
{N_("Korean"), "ko", "Sushizang", "sushizang at empal.com"},
{N_("Kurdish"), "ku", "Erdal Ronahi", "erdal.ronahi at gmail.com"},
- {N_("Kurdish"), "ku", "Amed ?. Jiyan", "amedcj at hotmail.com"},
- {N_("Kurdish"), "ku", "Rizoy? Xerz?", "rizoxerzi at hotmail.com"},
+ {NULL, NULL, "Amed ?. Jiyan", "amedcj at hotmail.com"},
+ {NULL, NULL, "Rizoy? Xerz?", "rizoxerzi at hotmail.com"},
{N_("Lao"), "lo", "Anousak Souphavah", "anousak at gmail.com"},
{N_("Maithili"), "mai", "Sangeeta Kumari", "sangeeta_0975 at yahoo.com"},
- {N_("Maithili"), "mai", "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
+ {NULL, NULL, "Rajesh Ranjan", "rajeshkajha at yahoo.com"},
{N_("Meadow Mari"), "mhr", "David Preece", "davidpreece1 at gmail.com"},
{N_("Macedonian"), "mk", "Arangel Angov ", "arangel at linux.net.mk"},
- {N_("Macedonian"), "mk", "Ivana Kirkovska", "ivana.kirkovska at gmail.com"},
- {N_("Macedonian"), "mk", "Jovan Naumovski", "jovan at lugola.net"},
+ {NULL, NULL, "Ivana Kirkovska", "ivana.kirkovska at gmail.com"},
+ {NULL, NULL, "Jovan Naumovski", "jovan at lugola.net"},
{N_("Malayalam"), "ml", "Ani Peter", "apeter at redhat.com"},
{N_("Mongolian"), "mn", "gooyo", NULL},
{N_("Marathi"), "mr", "Sandeep Shedmake", "sandeep.shedmake at gmail.com"},
@@ -225,20 +226,20 @@ static const struct translator translato
{N_("Portuguese-Brazil"), "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores at gmail.com"},
{N_("Pashto"), "ps", "Kashif Masood", "masudmails at yahoo.com"},
{N_("Romanian"), "ro", "Mi?u Moldovan", "dumol at gnome.org"},
- {N_("Romanian"), "ro", "Andrei Popescu", "andreimpopescu at gmail.com"},
+ {NULL, NULL, "Andrei Popescu", "andreimpopescu at gmail.com"},
{N_("Russian"), "ru", "????? ??????????", "samant.ua at mail.ru"},
{N_("Slovak"), "sk", "Jozef K??er", "quickparser at gmail.com"},
- {N_("Slovak"), "sk", "loptosko", "loptosko at gmail.com"},
+ {NULL, NULL, "loptosko", "loptosko at gmail.com"},
{N_("Slovenian"), "sl", "Martin Srebotnjak", "miles at filmsi.net"},
{N_("Albanian"), "sq", "Besnik Bleta", "besnik at programeshqip.org"},
{N_("Serbian"), "sr", "Milo? Popovi?", "gpopac at gmail.com"},
{N_("Serbian Latin"), "sr at latin", "Milo? Popovi?", "gpopac at gmail.com"},
{N_("Sinhala"), "si", "Danishka Navin", "snavin at redhat.com"},
- {N_("Sinhala"), "si", "Yajith Ajantha Dayarathna", "yajith at gmail.com"},
+ {NULL, NULL, "Yajith Ajantha Dayarathna", "yajith at gmail.com"},
{N_("Swedish"), "sv", "Peter Hjalmarsson", "xake at telia.com"},
{N_("Swahili"), "sw", "Paul Msegeya", "msegeya at gmail.com"},
{N_("Tamil"), "ta", "I. Felix", "ifelix25 at gmail.com"},
- {N_("Tamil"), "ta", "Viveka Nathan K", "vivekanathan at users.sourceforge.net"},
+ {NULL, NULL, "Viveka Nathan K", "vivekanathan at users.sourceforge.net"},
{N_("Telugu"), "te", "Krishnababu Krottapalli", "krottapalli at ymail.com"},
{N_("Thai"), "th", "Isriya Paireepairit", "markpeak at gmail.com"},
{N_("Turkish"), "tr", "Serdar Soytetir", "tulliana at gmail.com"},
@@ -247,10 +248,10 @@ static const struct translator translato
{N_("Vietnamese"), "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list at lists.sf.net"},
{N_("Simplified Chinese"), "zh_CN", "Aron Xu", "happyaron.xu at gmail.com"},
{N_("Hong Kong Chinese"), "zh_HK", "Abel Cheung", "abelindsay at gmail.com"},
- {N_("Hong Kong Chinese"), "zh_HK", "Ambrose C. Li", "acli at ada.dhs.org"},
- {N_("Hong Kong Chinese"), "zh_HK", "Paladin R. Liu", "paladin at ms1.hinet.net"},
+ {NULL, NULL, "Ambrose C. Li", "acli at ada.dhs.org"},
+ {NULL, NULL, "Paladin R. Liu", "paladin at ms1.hinet.net"},
{N_("Traditional Chinese"), "zh_TW", "Ambrose C. Li", "acli at ada.dhs.org"},
- {N_("Traditional Chinese"), "zh_TW", "Paladin R. Liu", "paladin at ms1.hinet.net"},
+ {NULL, NULL, "Paladin R. Liu", "paladin at ms1.hinet.net"},
{NULL, NULL, NULL, NULL}
};
@@ -260,67 +261,71 @@ static const struct translator past_tran
{N_("Arabic"), "ar", "Mohamed Magdy", "alnokta at yahoo.com"},
{N_("Bulgarian"), "bg", "Hristo Todorov", NULL},
{N_("Bengali"), "bn", "INDRANIL DAS GUPTA", "indradg at l2c2.org"},
- {N_("Bengali"), "bn", "Tisa Nafisa", "tisa_nafisa at yahoo.com"},
+ {NULL, NULL, "Tisa Nafisa", "tisa_nafisa at 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 at volny.cz"},
- {N_("German"), "de", "Daniel Seifert, Karsten Weiss", NULL},
+ {NULL, NULL, "Miloslav Trmac", "mitr at volny.cz"},
+ {N_("German"), "de", "Daniel Seifert", NULL},
+ {NULL, NULL, "Karsten Weiss", NULL},
{N_("British English"), "en_GB", "Luke Ross", "luke at 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 at zundan.com"},
- {N_("Basque"), "eu", "Hizkuntza Politikarako Sailburuordetza", "hizkpol at ej-gv.es"},
+ {NULL, NULL, "Hizkuntza Politikarako Sailburuordetza", "hizkpol at 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 at 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 at gmail.com"},
- {N_("Bokm?l Norwegian"), "nb", "Petter Johan Olsen", NULL},
- {N_("Bokm?l Norwegian"), "nb", "Espen Stefansen", "espenas at gmail.com"},
+ {NULL, NULL, "Petter Johan Olsen", NULL},
+ {NULL, NULL, "Espen Stefansen", "espenas at gmail.com"},
{N_("Dutch, Flemish"), "nl", "Vincent van Adrighem", "V.vanAdrighem at dirck.mine.nu"},
{N_("Polish"), "pl", "Emil Nowak", "emil5 at go2.pl"},
- {N_("Polish"), "pl", "Pawe? Godlewski", "pawel at bajk.pl"},
- {N_("Polish"), "pl", "Krzysztof Foltman", "krzysztof at foltman.com"},
- {N_("Polish"), "pl", "Piotr Makowski", NULL},
- {N_("Polish"), "pl", "Przemys?aw Su?ek", NULL},
+ {NULL, NULL, "Pawe? Godlewski", "pawel at bajk.pl"},
+ {NULL, NULL, "Krzysztof Foltman", "krzysztof at 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 at gmail.com"},
{N_("Russian"), "ru", "Dmitry Beloglazov", "dmaa at 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 at gmx.net"},
- {N_("Serbian"), "sr", "Aleksandar Urosevic", "urke at users.sourceforge.net"},
+ {NULL, NULL, "Aleksandar Urosevic", "urke at 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 at 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 at 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 at linux.net.cn"},
+ {N_("Traditional Chinese"), "zh_TW", "Hashao", NULL},
+ {NULL, NULL, "Rocky S. Lee", NULL},
{NULL, NULL, NULL, NULL}
};
@@ -347,18 +352,17 @@ add_translators(GString *str, const stru
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));
}
}
}
More information about the Commits
mailing list