Mercurial > pidgin
view libpurple/protocols/silc/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 | e33a91b8b8f6 |
children |
line wrap: on
line source
EXTRA_DIST = \ Makefile.mingw \ README \ TODO pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) SILCSOURCES = \ buddy.c \ chat.c \ ft.c \ ops.c \ pk.c \ silc.c \ silcpurple.h \ util.c \ wb.c \ wb.h AM_CFLAGS = $(st) libsilcpurple_la_LDFLAGS = -module -avoid-version if STATIC_SILC st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS) noinst_LTLIBRARIES = libsilcpurple.la libsilcpurple_la_SOURCES = $(SILCSOURCES) libsilcpurple_la_CFLAGS = $(AM_CFLAGS) libsilcpurple_la_LIBADD = $(SILC_LIBS) else st = $(SILC_CFLAGS) pkg_LTLIBRARIES = libsilcpurple.la libsilcpurple_la_SOURCES = $(SILCSOURCES) libsilcpurple_la_LIBADD = $(GLIB_LIBS) $(SILC_LIBS) endif AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) \ $(SILC_CFLAGS)