Mercurial > pidgin
comparison libpurple/account.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 | 51d5ec7b1699 |
children | 8084631e2e84 |
comparison
equal
deleted
inserted
replaced
30431:c9a57878ed17 | 30432:1cdae196aac8 |
---|---|
1127 } | 1127 } |
1128 | 1128 |
1129 static void | 1129 static void |
1130 request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields) | 1130 request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields) |
1131 { | 1131 { |
1132 /* Disable the account as the user has canceled connecting */ | 1132 /* Disable the account as the user has cancelled connecting */ |
1133 purple_account_set_enabled(account, purple_core_get_ui(), FALSE); | 1133 purple_account_set_enabled(account, purple_core_get_ui(), FALSE); |
1134 } | 1134 } |
1135 | 1135 |
1136 | 1136 |
1137 void | 1137 void |