Mercurial > pidgin
view doc/Makefile.am @ 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 | 76a689608a83 |
children |
line wrap: on
line source
man_MANS = if ENABLE_GTK man_MANS += pidgin.1 endif if ENABLE_GNT man_MANS += finch.1 endif EXTRA_DIST = \ C-HOWTO.dox \ PERL-HOWTO.dox \ SIGNAL-HOWTO.dox \ TCL-HOWTO.dox \ TracFooter.html \ TracHeader.html \ account-signals.dox \ blist-signals.dox \ certificate-signals.dox \ cipher-signals.dox \ connection-signals.dox \ conversation-signals.dox \ core-signals.dox \ dbus-server-signals.dox \ funniest_home_convos.txt \ finch.1.in \ gtkaccount-signals.dox \ gtkblist-signals.dox \ gtkconv-signals.dox \ gtklog-signals.dox \ gtkimhtml-signals.dox \ gtkrc-2.0 \ imgstore-signals.dox \ jabber-signals.dox \ log-signals.dox \ notify-signals.dox \ pidgin.1.in \ plugin-i18n.dox \ plugin-ids.dox \ plugin-signals.dox \ savedstatus-signals.dox \ sound-signals.dox \ the_penguin.txt \ xfer-signals.dox