Mercurial > pidgin
comparison libpurple/ft.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 | ce52e101844a |
children | 485eaf544bb0 |
comparison
equal
deleted
inserted
replaced
30431:c9a57878ed17 | 30432:1cdae196aac8 |
---|---|
750 g_return_val_if_fail(xfer != NULL, PURPLE_XFER_STATUS_UNKNOWN); | 750 g_return_val_if_fail(xfer != NULL, PURPLE_XFER_STATUS_UNKNOWN); |
751 | 751 |
752 return xfer->status; | 752 return xfer->status; |
753 } | 753 } |
754 | 754 |
755 /* FIXME: Rename with cancelled for 3.0.0. */ | |
755 gboolean | 756 gboolean |
756 purple_xfer_is_canceled(const PurpleXfer *xfer) | 757 purple_xfer_is_canceled(const PurpleXfer *xfer) |
757 { | 758 { |
758 g_return_val_if_fail(xfer != NULL, TRUE); | 759 g_return_val_if_fail(xfer != NULL, TRUE); |
759 | 760 |