Mercurial > pidgin
view libpurple/protocols/silc/wb.h @ 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 | cb1ea9f878f5 |
children |
line wrap: on
line source
/* silcpurple.h Author: Pekka Riikonen <priikone@silcnet.org> Copyright (C) 2005 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ #ifndef SILCPURPLE_WB_H #define SILCPURPLE_WB_H #include "silcpurple.h" #include "whiteboard.h" PurpleWhiteboard * silcpurple_wb_init(SilcPurple sg, SilcClientEntry client_entry); PurpleWhiteboard * silcpurple_wb_init_ch(SilcPurple sg, SilcChannelEntry channel); void silcpurple_wb_receive(SilcClient client, SilcClientConnection conn, SilcClientEntry sender, SilcMessagePayload payload, SilcMessageFlags flags, const unsigned char *message, SilcUInt32 message_len); void silcpurple_wb_receive_ch(SilcClient client, SilcClientConnection conn, SilcClientEntry sender, SilcChannelEntry channel, SilcMessagePayload payload, SilcMessageFlags flags, const unsigned char *message, SilcUInt32 message_len); void silcpurple_wb_start(PurpleWhiteboard *wb); void silcpurple_wb_end(PurpleWhiteboard *wb); void silcpurple_wb_get_dimensions(const PurpleWhiteboard *wb, int *width, int *height); void silcpurple_wb_set_dimensions(PurpleWhiteboard *wb, int width, int height); void silcpurple_wb_get_brush(const PurpleWhiteboard *wb, int *size, int *color); void silcpurple_wb_set_brush(PurpleWhiteboard *wb, int size, int color); void silcpurple_wb_send(PurpleWhiteboard *wb, GList *draw_list); void silcpurple_wb_clear(PurpleWhiteboard *wb); #endif /* SILCPURPLE_WB_H */