/pidgin/main: c05804b2619a: Merging, I guess?
Richard Laager <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: c05804b2619af640e3d665af9f4519c0444f1cea Author: Richard Laager <[email protected]> Date: 2014-11-03 11:25 -0600 Branch: release-2.x.y URL: https://hg.pidgin.im/pidgin/main/rev/c05804b2619a Description: Merging, I guess? diffstat: pidgin/gtkdialogs.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (32 lines): diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c +++ b/pidgin/gtkdialogs.c @@ -244,7 +244,7 @@ static const struct translator translato {N_("Serbian Latin"), "sr@latin", "MiloÅ¡ PopoviÄ", "[email protected]"}, {N_("Sinhala"), "si", "Yajith Ajantha Dayarathna", "[email protected]"}, {N_("Sinhala"), "si", "Danishka Navin", "[email protected]"}, - {N_("Swedish"), "sv", "Peter Hjalmarsson", "[email protected]"}, + {N_("Swedish"), "sv", "Josef Andersson", "[email protected]"}, {N_("Swahili"), "sw", "Paul Msegeya", "[email protected]"}, {N_("Tamil"), "ta", "I. Felix", "[email protected]"}, {N_("Tamil"), "ta", "Viveka Nathan K", "[email protected]"}, @@ -253,7 +253,10 @@ static const struct translator translato {N_("Tatar"), "tt", "ILDAR Valeev", "[email protected]"}, {N_("Ukranian"), "uk", "Oleksandr Kovalenko", "[email protected]"}, {N_("Urdu"), "ur", "RKVS Raman", "[email protected]"}, - {N_("Uzbek"), "uz", "Akmal Khushvakov", "[email protected]"}, + {N_("Uzbek"), "uz", + /* Translators: This is a person's name. For most languages we recommend + not translating it. */ + N_("Akmal Khushvakov"), "[email protected]"}, {N_("Vietnamese"), "vi", "Nguyá» n VÅ© HÆ°ng", "[email protected]"}, {N_("Simplified Chinese"), "zh_CN", "Aron Xu", "[email protected]"}, {N_("Hong Kong Chinese"), "zh_HK", "Abel Cheung", "[email protected]"}, @@ -335,6 +338,7 @@ static const struct translator past_tran {N_("Slovenian"), "sl", "Matjaz Horvat", NULL}, {N_("Serbian"), "sr", "Danilo Å egan", "[email protected]"}, {N_("Serbian"), "sr", "Aleksandar Urosevic", "[email protected]"}, + {N_("Swedish"), "sv", "Peter Hjalmarsson", "[email protected]"}, {N_("Swedish"), "sv", "Tore Lundqvist", NULL}, {N_("Swedish"), "sv", "Christian Rose", NULL}, {N_("Telugu"), "te", "Mr. Subbaramaih", "[email protected]"},