Mercurial > pidgin.yaz
comparison libpurple/ft.h @ 30865: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 | 2a1e4a000e87 |
children | 44f53d3fc54f |
comparison
equal
deleted
inserted
replaced
30864:c9a57878ed17 | 30865:1cdae196aac8 |
---|---|
56 PURPLE_XFER_STATUS_UNKNOWN = 0, /**< Unknown, the xfer may be null. */ | 56 PURPLE_XFER_STATUS_UNKNOWN = 0, /**< Unknown, the xfer may be null. */ |
57 PURPLE_XFER_STATUS_NOT_STARTED, /**< It hasn't started yet. */ | 57 PURPLE_XFER_STATUS_NOT_STARTED, /**< It hasn't started yet. */ |
58 PURPLE_XFER_STATUS_ACCEPTED, /**< Receive accepted, but destination file not selected yet */ | 58 PURPLE_XFER_STATUS_ACCEPTED, /**< Receive accepted, but destination file not selected yet */ |
59 PURPLE_XFER_STATUS_STARTED, /**< purple_xfer_start has been called. */ | 59 PURPLE_XFER_STATUS_STARTED, /**< purple_xfer_start has been called. */ |
60 PURPLE_XFER_STATUS_DONE, /**< The xfer completed successfully. */ | 60 PURPLE_XFER_STATUS_DONE, /**< The xfer completed successfully. */ |
61 PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was canceled by us. */ | 61 PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was cancelled by us. */ |
62 PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was canceled by the other end, or we couldn't connect. */ | 62 PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was cancelled by the other end, or we couldn't connect. */ |
63 } PurpleXferStatusType; | 63 } PurpleXferStatusType; |
64 | 64 |
65 /** | 65 /** |
66 * File transfer UI operations. | 66 * File transfer UI operations. |
67 * | 67 * |
302 * @return The status. | 302 * @return The status. |
303 */ | 303 */ |
304 PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer); | 304 PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer); |
305 | 305 |
306 /** | 306 /** |
307 * Returns true if the file transfer was canceled. | 307 * Returns true if the file transfer was cancelled. |
308 * | 308 * |
309 * @param xfer The file transfer. | 309 * @param xfer The file transfer. |
310 * | 310 * |
311 * @return Whether or not the transfer was canceled. | 311 * @return Whether or not the transfer was cancelled. |
312 * FIXME: This should be renamed using cancelled for 3.0.0. | |
312 */ | 313 */ |
313 gboolean purple_xfer_is_canceled(const PurpleXfer *xfer); | 314 gboolean purple_xfer_is_canceled(const PurpleXfer *xfer); |
314 | 315 |
315 /** | 316 /** |
316 * Returns the completed state for a file transfer. | 317 * Returns the completed state for a file transfer. |