# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1183274116 0
# Node ID 8ee1f173253cdea198df950d57319d7f1b13c6d8
# Parent  238086459dc48be40365875c4cc9a0d1895346e6# Parent  bf026a5800dbe059d13bed0ccec1f35bb78489fc
merge of '414f0770611139752d484f4831cb59038456c9bf'
     and 'ac9248515df0eeec749075d5b6242b285cf57967'

diff -r 238086459dc4 -r 8ee1f173253c libpurple/protocols/qq/im.c
--- a/libpurple/protocols/qq/im.c	Sun Jul 01 03:15:43 2007 +0000
+++ b/libpurple/protocols/qq/im.c	Sun Jul 01 07:15:16 2007 +0000
@@ -573,7 +573,7 @@
 		read_packet_b(data, &cursor, len, &reply);
 		if (reply != QQ_SEND_IM_REPLY_OK) {
 			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Send IM fail\n");
-			purple_notify_error(gc, _("Server ACK"), _("Send IM fail\n"), NULL);
+			purple_notify_error(gc, _("Server ACK"), _("Failed to send IM."), NULL);
 		}
 		else
 			purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM ACK OK\n");
diff -r 238086459dc4 -r 8ee1f173253c pidgin/plugins/spellchk.c