# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1166060845 0
# Node ID 83f0a2d3b44123fb3f036f8fb1a1089e7aeb5705
# Parent  6a647ede0a76c786b6f6bda20e797c6b59ba1d61
[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>

diff -r 6a647ede0a76 -r 83f0a2d3b441 libgaim/protocols/oscar/oscar.c
--- 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;
 }