comparison libpurple/plugins/signals-test.c @ 30432:1cdae196aac8

Standardize on "cancelled". QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough... wabz: cancelled :D wabz: that cancelled thing actually bothered me in the past wabz: never quite enough to do such a patch :p elb: that's an en_US vs en_GB thing elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.} elb: personally, I use cancelled QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you... rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-) rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout elb: right elb: my point is, they're both correct for en_US elb: one 'l' is simply more common rekkanoryo: ah rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote rekkanoryo: one 'l' always looks wrong to me elb: the dictionary claims they are Sorry, dwc. Closes #12130.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 23 Aug 2010 01:41:31 +0000
parents 91ac03a72875
children
comparison
equal deleted inserted replaced
30431:c9a57878ed17 30432:1cdae196aac8
590 purple_debug_misc("signals test", "file send started\n"); 590 purple_debug_misc("signals test", "file send started\n");
591 } 591 }
592 592
593 static void 593 static void
594 ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) { 594 ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) {
595 purple_debug_misc("signals test", "file receive canceled\n"); 595 purple_debug_misc("signals test", "file receive cancelled\n");
596 } 596 }
597 597
598 static void 598 static void
599 ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) { 599 ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) {
600 purple_debug_misc("signals test", "file send canceled\n"); 600 purple_debug_misc("signals test", "file send cancelled\n");
601 } 601 }
602 602
603 static void 603 static void
604 ft_recv_complete_cb(PurpleXfer *xfer, gpointer data) { 604 ft_recv_complete_cb(PurpleXfer *xfer, gpointer data) {
605 purple_debug_misc("signals test", "file receive completed\n"); 605 purple_debug_misc("signals test", "file receive completed\n");