cpw.darkrain42.2.6.1: beade7ac: Normalize on 'cancelled'

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: beade7ac68d86ade412871d5d4aeb805b3952afb
Ancestor: f2c013c7d139f23e5982128711dccc3aef23c022
Author: darkrain42 at pidgin.im
Date: 2009-07-18T04:31:38
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/beade7ac68d86ade412871d5d4aeb805b3952afb

Modified files:
        libpurple/ft.c libpurple/protocols/qq/send_file.c

ChangeLog: 

Normalize on 'cancelled'

-------------- next part --------------
============================================================
--- libpurple/ft.c	88aea75e43da3b1c64f266752992350e9dd7a9af
+++ libpurple/ft.c	839de23a6344ec3d83e42fa0e94ee177add8fc5e
@@ -1161,7 +1161,7 @@ purple_xfer_cancel_local(PurpleXfer *xfe
 
 	if (purple_xfer_get_filename(xfer) != NULL)
 	{
-		msg = g_strdup_printf(_("You canceled the transfer of %s"),
+		msg = g_strdup_printf(_("You cancelled the transfer of %s"),
 							  purple_xfer_get_filename(xfer));
 	}
 	else
@@ -1224,12 +1224,12 @@ purple_xfer_cancel_remote(PurpleXfer *xf
 
 	if (purple_xfer_get_filename(xfer) != NULL)
 	{
-		msg = g_strdup_printf(_("%s canceled the transfer of %s"),
+		msg = g_strdup_printf(_("%s cancelled the transfer of %s"),
 				buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer));
 	}
 	else
 	{
-		msg = g_strdup_printf(_("%s canceled the file transfer"),
+		msg = g_strdup_printf(_("%s cancelled the file transfer"),
 				buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 	}
 	purple_xfer_conversation_write(xfer, msg, TRUE);
============================================================
--- libpurple/protocols/qq/send_file.c	65da36a758c08a92710d7cac6bf34c2d490ee252
+++ libpurple/protocols/qq/send_file.c	8c5ca8276047ac5fed56a754b0dcce11e2a60c5d
@@ -730,7 +730,7 @@ void qq_process_recv_file_cancel (guint8
 	*/
 	filename = g_path_get_basename(purple_xfer_get_local_filename(qd->xfer));
 	msg = g_strdup_printf
-		(_("%d canceled the transfer of %s"),
+		(_("%d cancelled the transfer of %s"),
 		 sender_uid, filename);
 
 	purple_notify_warning (gc, _("File Send"), msg, NULL);