Mercurial > pidgin.yaz
view pidgin/win32/untar.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 | 322b92e28005 |
children | 5876584828e8 |
line wrap: on
line source
/* * untar.h * * Author: Herman Bloggs <hermanator12002@yahoo.com> * Date: April, 2003 * Description: untar.c header */ #ifndef _UNTAR_H_ #define _UNTAR_H_ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ typedef enum _untar_opt { UNTAR_LISTING = (1 << 0), UNTAR_QUIET = (1 << 1), UNTAR_VERBOSE = (1 << 2), UNTAR_FORCE = (1 << 3), UNTAR_ABSPATH = (1 << 4), UNTAR_CONVERT = (1 << 5) } untar_opt; int untar(const char *filename, const char *destdir, untar_opt options); #ifdef __cplusplus } #endif /* __cplusplus */ #endif