Mercurial > pidgin.yaz
view libpurple/protocols/oscar/Makefile.am @ 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 | 420907755a2f |
children | 809dac0c47ce |
line wrap: on
line source
EXTRA_DIST = \ COPYING \ AUTHORS \ Makefile.mingw pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) OSCARSOURCES = \ authorization.c \ bstream.c \ clientlogin.c \ encoding.c \ family_admin.c \ family_alert.c \ family_auth.c \ family_bart.c \ family_bos.c \ family_buddy.c \ family_chat.c \ family_chatnav.c \ family_icq.c \ family_icbm.c \ family_locate.c \ family_oservice.c \ family_popup.c \ family_feedbag.c \ family_stats.c \ family_userlookup.c \ flap_connection.c \ misc.c \ msgcookie.c \ odc.c \ oft.c \ oscar.c \ oscar.h \ oscarcommon.h \ oscar_data.c \ peer.c \ peer.h \ peer_proxy.c \ rxhandlers.c \ snac.c \ snactypes.h \ tlv.c \ userinfo.c \ util.c \ visibility.c AM_CFLAGS = $(st) libaim_la_LDFLAGS = -module -avoid-version libicq_la_LDFLAGS = -module -avoid-version if STATIC_OSCAR st = -DPURPLE_STATIC_PRPL noinst_LTLIBRARIES = liboscar.la liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c liboscar_la_CFLAGS = $(AM_CFLAGS) else st = pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la liboscar_la_SOURCES = $(OSCARSOURCES) liboscar_la_LIBADD = $(GLIB_LIBS) libaim_la_SOURCES = libaim.c libaim_la_LIBADD = liboscar.la libicq_la_SOURCES = libicq.c libicq_la_LIBADD = liboscar.la endif AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(GLIB_CFLAGS) \ $(DEBUG_CFLAGS)