Mercurial > pidgin

changeset 15201:83f0a2d3b441

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17991] This should reduce the number of questions about encoding errors we get. it also closes rh bug 219524 committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 14 Dec 2006 01:47:25 +0000
parents 6a647ede0a76
children b8ae75fa8d67
files libgaim/protocols/oscar/oscar.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/oscar/oscar.c	Thu Dec 14 01:06:18 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Thu Dec 14 01:47:25 2006 +0000
@@ -427,7 +427,7 @@
 	if (ret == NULL)
 		ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE);
 	if (ret == NULL)
-		ret = g_strdup(_("(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"));
+		ret = g_strdup(_("(There was an error receiving this message.  Either you and the buddy you are speaking to have a different encoding selected, or the buddy has a buggy client.)"));
 
 	return ret;
 }