pidgin/pidgin

Merging, I guess?
release-2.x.y
2014-11-03, Richard Laager
c05804b2619a
Merging, I guess?
--- a/pidgin/gtkdialogs.c Mon Nov 03 11:21:05 2014 -0600
+++ b/pidgin/gtkdialogs.c Mon Nov 03 11:25:23 2014 -0600
@@ -244,7 +244,7 @@
{N_("Serbian Latin"), "sr@latin", "Miloš Popović", "gpopac@gmail.com"},
{N_("Sinhala"), "si", "Yajith Ajantha Dayarathna", "yajith@gmail.com"},
{N_("Sinhala"), "si", "Danishka Navin", "snavin@redhat.com"},
- {N_("Swedish"), "sv", "Peter Hjalmarsson", "xake@telia.com"},
+ {N_("Swedish"), "sv", "Josef Andersson", "josef.andersson@gmail.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"},
@@ -253,7 +253,10 @@
{N_("Tatar"), "tt", "ILDAR Valeev", "v_ildar@bk.ru"},
{N_("Ukranian"), "uk", "Oleksandr Kovalenko", "alx.kovalenko@gmail.com"},
{N_("Urdu"), "ur", "RKVS Raman", "rkvsraman@gmail.com"},
- {N_("Uzbek"), "uz", "Akmal Khushvakov", "uzbadmin@gmail.com"},
+ {N_("Uzbek"), "uz",
+ /* Translators: This is a person's name. For most languages we recommend
+ not translating it. */
+ N_("Akmal Khushvakov"), "uzbadmin@gmail.com"},
{N_("Vietnamese"), "vi", "Nguyễn Vũ Hưng", "vuhung16plus@gmail.com"},
{N_("Simplified Chinese"), "zh_CN", "Aron Xu", "happyaron.xu@gmail.com"},
{N_("Hong Kong Chinese"), "zh_HK", "Abel Cheung", "abelindsay@gmail.com"},
@@ -335,6 +338,7 @@
{N_("Slovenian"), "sl", "Matjaz Horvat", NULL},
{N_("Serbian"), "sr", "Danilo Šegan", "dsegan@gmx.net"},
{N_("Serbian"), "sr", "Aleksandar Urosevic", "urke@users.sourceforge.net"},
+ {N_("Swedish"), "sv", "Peter Hjalmarsson", "xake@telia.com"},
{N_("Swedish"), "sv", "Tore Lundqvist", NULL},
{N_("Swedish"), "sv", "Christian Rose", NULL},
{N_("Telugu"), "te", "Mr. Subbaramaih", "info.gist@cdac.in"},