/pidgin/main: 773fad37337e: Manual merge from the release-2.x.y ...

[Mark Doliner]

Changeset: 773fad37337ece53e092a573ef1ab221429fa14a
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-02-20 00:48 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/773fad37337e

Description:

Manual merge from the release-2.x.y branch.

I didn't copy any of the changes from de.po.

diffstat:

 finch/gntlog.c      |  2 +-
 pidgin/gtkdialogs.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/finch/gntlog.c b/finch/gntlog.c
--- a/finch/gntlog.c
+++ b/finch/gntlog.c
@@ -248,7 +248,7 @@ static void populate_log_tree(FinchLogVi
 									NULL);
 			gnt_tree_set_expanded(GNT_TREE(lv->tree), month, FALSE);
 
-			strncpy(prev_top_month, month, sizeof(prev_top_month));
+			g_strlcpy(prev_top_month, month, sizeof(prev_top_month));
 		}
 
 		/* sub */
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -228,7 +228,7 @@ static const struct translator translato
 	{N_("Oriya"),               "or", "Manoj Kumar Giri", "giri.manojkr at gmail.com"},
 	{N_("Punjabi"),             "pa", "Amanpreet Singh Alam", "aalam at users.sf.net"},
 	{N_("Polish"),              "pl", "Piotr DrÄ
g", "piotrdrag at gmail.com"},
-	{N_("Portuguese"),          "pt", "Paulo Ribeiro", NULL},
+	{N_("Portuguese"),          "pt", "Paulo Ribeiro", "paulo at diffraction.pt"},
 	{N_("Portuguese-Brazil"),   "pt_BR", "Renato Silva", "br.renatosilva at gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails at yahoo.com"},
 	{N_("Romanian"),            "ro", "Mișu Moldovan", "dumol at gnome.org"},