Mercurial > pidgin.yaz
changeset 32117:2a47dc416d07
merge of '64f4eb5c598356fe1b8b9bc376faa66641096eda'
and '7a3b366378bf6f406686d54b6ca590831f18d2b1'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 13 Jun 2011 17:28:01 +0000 |
| parents | 3a3af6ad3166 (diff) ad08d4383d78 (current diff) |
| children | 7675022d2312 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 13 17:27:49 2011 +0000 +++ b/ChangeLog Mon Jun 13 17:28:01 2011 +0000 @@ -1,9 +1,12 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.8.1 (MM/DD/YYYY): - libpurple: - * media: Actually use the specified TCP port from the TURN configuration to - create a TCP relay candidate. + libpurple: + * media: Actually use the specified TCP port from the TURN configuration to + create a TCP relay candidate. + + Plugins: + * The Evolution Integration plugin compiles again. version 2.8.0 (06/07/2011): General:
--- a/libpurple/protocols/mxit/profile.c Mon Jun 13 17:27:49 2011 +0000 +++ b/libpurple/protocols/mxit/profile.c Mon Jun 13 17:28:01 2011 +0000 @@ -322,9 +322,9 @@ purple_notify_searchresults_button_add( results, PURPLE_NOTIFY_BUTTON_INVITE, mxit_search_results_add_cb ); if ( searchType == CP_SUGGEST_FRIENDS ) - text = g_strdup_printf( _( "You have %i suggested friends." ), maxResults ); + text = g_strdup_printf( dngettext( PACKAGE, "You have %i suggested friend.", "You have %i suggested friends.", maxResults ), maxResults ); else - text = g_strdup_printf( _( "We found %i contacts that match your search." ), maxResults ); + text = g_strdup_printf( dngettext( PACKAGE, "We found %i contact that matches your search.", "We found %i contacts that match your search.", maxResults ), maxResults ); purple_notify_searchresults( session->con, NULL, text, NULL, results, NULL, NULL );