Mercurial > pidgin.yaz

comparison libpurple/protocols/qq/ChangeLog @ 30865:1cdae196aac8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 660660e0e8c6
children 4deef745de87
comparison
equal deleted inserted replaced
30864:c9a57878ed17 30865:1cdae196aac8
231 * Support managing multi-connections according to simple.c 231 * Support managing multi-connections according to simple.c
232 232
233 2008.08.06 - ccpaging <ccpaging(at)gmail.com> 233 2008.08.06 - ccpaging <ccpaging(at)gmail.com>
234 * Rename names of variables, Group, to Room 234 * Rename names of variables, Group, to Room
235 * Functions of group_network merged into qq_network and qq_process 235 * Functions of group_network merged into qq_network and qq_process
236 * Canceled managing glist of group packet, add sub_cmdd and room_id to transaction 236 * Cancelled managing glist of group packet, add sub_cmdd and room_id to transaction
237 * Fixed error of demo group: 237 * Fixed error of demo group:
238 If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet. 238 If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
239 239
240 2008.08.04 - ccpaging <ccpaging(at)gmail.com> 240 2008.08.04 - ccpaging <ccpaging(at)gmail.com>
241 * Use new crypt/decrypt functions 241 * Use new crypt/decrypt functions