Mercurial > pidgin.yaz
view pidgin/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 | 23b3627ecec3 |
children | 812c1cc9661c |
line wrap: on
line source
EXTRA_DIST = \ getopt.c \ getopt.h \ getopt1.c \ Makefile.mingw \ pidgin.pc.in \ pidgin-uninstalled.pc.in \ win32/IdleTracker/Makefile.mingw \ win32/IdleTracker/idletrack.c \ win32/IdleTracker/idletrack.h \ win32/MinimizeToTray.h \ win32/MinimizeToTray.c \ win32/pidgin_dll_rc.rc.in \ win32/pidgin_exe_rc.rc.in \ win32/gtkdocklet-win32.c \ win32/gtkwin32dep.c \ win32/gtkwin32dep.h \ win32/resource.h \ win32/untar.c \ win32/untar.h \ win32/winpidgin.c \ win32/wspell.c \ win32/wspell.h \ win32/nsis/generate_gtk_zip.sh \ win32/nsis/rpm2zip.sh \ win32/nsis/pixmaps/pidgin-header.bmp \ win32/nsis/pixmaps/pidgin-intro.bmp \ win32/nsis/pixmaps/pidgin-install.ico \ win32/nsis/available.lst \ win32/nsis/pidgin-installer.nsi \ win32/nsis/pidgin-plugin.nsh \ win32/nsis/create_nsis_translations.pl \ win32/nsis/nsis_translations.desktop.in if ENABLE_GTK pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pidgin.pc SUBDIRS = pixmaps plugins bin_PROGRAMS = pidgin pidgin_SOURCES = \ pidginstock.c \ gtkaccount.c \ gtkblist.c \ gtkblist-theme.c \ gtkblist-theme-loader.c \ gtkcellrendererexpander.c \ gtkcertmgr.c \ gtkconn.c \ gtkconv.c \ gtkdebug.c \ gtkdialogs.c \ gtkdnd-hints.c \ gtkdocklet.c \ gtkdocklet-gtk.c \ gtkeventloop.c \ gtkft.c \ gtkicon-theme.c \ gtkicon-theme-loader.c \ gtkidle.c \ gtkimhtml.c \ gtkimhtmltoolbar.c \ gtklog.c \ gtkmain.c \ gtkmedia.c \ gtkmenutray.c \ gtknotify.c \ gtkplugin.c \ gtkpluginpref.c \ gtkpounce.c \ gtkprefs.c \ gtkprivacy.c \ gtkrequest.c \ gtkroomlist.c \ gtksavedstatuses.c \ gtkscrollbook.c \ gtksession.c \ gtksmiley.c \ gtksound.c \ gtksourceiter.c \ gtksourceundomanager.c \ gtksourceview-marshal.c \ gtkstatus-icon-theme.c \ gtkstatusbox.c \ gtkthemes.c \ gtkutils.c \ gtkwhiteboard.c \ minidialog.c \ pidgintooltip.c pidgin_headers = \ gtkaccount.h \ gtkblist.h \ gtkblist-theme.h \ gtkblist-theme-loader.h \ gtkcellrendererexpander.h \ gtkcertmgr.h \ gtkconn.h \ gtkconv.h \ gtkconvwin.h \ gtkdebug.h \ gtkdialogs.h \ gtkdnd-hints.h \ gtkdocklet.h \ gtkeventloop.h \ gtkft.h \ gtkicon-theme.h \ gtkicon-theme-loader.h \ gtkidle.h \ gtkgaim-compat.h \ gtkimhtml.h \ gtkimhtmltoolbar.h \ gtklog.h \ gtkmedia.h \ gtkmenutray.h \ gtknickcolors.h \ gtknotify.h \ gtkplugin.h \ gtkpluginpref.h \ gtkprefs.h \ gtkprivacy.h \ gtkpounce.h \ gtkrequest.h \ gtkroomlist.h \ gtksavedstatuses.h \ gtkscrollbook.h \ gtksession.h \ gtksmiley.h \ gtksound.h \ gtksourceiter.h \ gtksourceundomanager.h \ gtksourceview-marshal.h \ gtkstatus-icon-theme.h \ gtkstatusbox.h \ pidginstock.h \ gtkthemes.h \ gtkutils.h \ gtkwhiteboard.h \ minidialog.h \ pidgintooltip.h \ pidgin.h pidginincludedir=$(includedir)/pidgin pidgininclude_HEADERS = \ $(pidgin_headers) pidgin_DEPENDENCIES = @LIBOBJS@ pidgin_LDFLAGS = -export-dynamic pidgin_LDADD = \ @LIBOBJS@ \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(GSTREAMER_LIBS) \ $(XSS_LIBS) \ $(SM_LIBS) \ $(INTLLIBS) \ $(GTKSPELL_LIBS) \ $(STARTUP_NOTIFICATION_LIBS) \ $(LIBXML_LIBS) \ $(GTK_LIBS) \ $(top_builddir)/libpurple/libpurple.la if USE_INTERNAL_LIBGADU INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU endif AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ -DLIBDIR=\"$(libdir)/pidgin/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple/ \ -I$(top_builddir) \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ $(GSTREAMER_CFLAGS) \ $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GTKSPELL_CFLAGS) \ $(STARTUP_NOTIFICATION_CFLAGS) \ $(LIBXML_CFLAGS) \ $(INTGG_CFLAGS) endif # ENABLE_GTK