/pidgin/main: c05804b2619a: Merging, I guess?

[Richard Laager]

Changeset: c05804b2619af640e3d665af9f4519c0444f1cea
Author:	 Richard Laager <rlaager at pidgin.im>
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 at latin", "Miloš Popović", "gpopac at gmail.com"},
 	{N_("Sinhala"),             "si", "Yajith Ajantha Dayarathna", "yajith at gmail.com"},
 	{N_("Sinhala"),             "si", "Danishka Navin", "snavin at redhat.com"},
-	{N_("Swedish"),             "sv", "Peter Hjalmarsson", "xake at telia.com"},
+	{N_("Swedish"),             "sv", "Josef Andersson", "josef.andersson at gmail.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"},
@@ -253,7 +253,10 @@ static const struct translator translato
 	{N_("Tatar"),               "tt", "ILDAR Valeev", "v_ildar at bk.ru"},
 	{N_("Ukranian"),            "uk", "Oleksandr Kovalenko", "alx.kovalenko at gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman at gmail.com"},
-	{N_("Uzbek"),               "uz", "Akmal Khushvakov", "uzbadmin at gmail.com"},
+	{N_("Uzbek"),               "uz",
+	/* Translators: This is a person's name. For most languages we recommend
+	   not translating it. */
+                                          N_("Akmal Khushvakov"), "uzbadmin at gmail.com"},
 	{N_("Vietnamese"),          "vi", "Nguyá»
n VÅ© HÆ°ng", "vuhung16plus at gmail.com"},
 	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu at gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay at gmail.com"},
@@ -335,6 +338,7 @@ static const struct translator past_tran
 	{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"},
+	{N_("Swedish"),             "sv", "Peter Hjalmarsson", "xake at telia.com"},
 	{N_("Swedish"),             "sv", "Tore Lundqvist", NULL},
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Telugu"),              "te", "Mr. Subbaramaih", "info.gist at cdac.in"},