Mercurial > pidgin
view .mtn-ignore @ 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 | 88a4a5a0fafa |
children | 1deda5d6733b |
line wrap: on
line source
(.*/)?\.svn .*/?Makefile(\.in)?$ .*/?Makefile\.am\.mingw$ (.*/)?TAGS$ .*/?.*\.pc$ .*/perl/common/[^/]+\.c$ .*/perl/common/blib.* .*/perl/common/pm_to_blib$ .*\.bs$ .*\.def$ .*\.dll$ .*\.exe$ .*\.loT$ intltool-.* Doxyfile(\.mingw)?$ aclocal.m4 autogen.args compile config.cache config.guess config.h$ config.h.in config.log config.status config.sub configure$ finch/finch$ finch/libgnt/gntmarshal.c finch/libgnt/gntmarshal.h depcomp doc/finch.1$ doc/pidgin.1$ doc/html package_revision.h package_revision_raw.txt pidgin.apspec$ pidgin.desktop$ pidgin.spec$ pidgin-.*.tar.gz pidgin-.*.tar.bz2 pidgin-*.*.*-dbgsym$ pidgin-*.*.*-dbgsym.zip$ pidgin-*.*.*-win32bin$ pidgin-*.*.*-win32-bin.zip$ pidgin/pidgin$ pidgin/pixmaps/emotes/default/24/theme pidgin/pixmaps/emotes/none/theme pidgin/pixmaps/emotes/small/16/theme pidgin/plugins/musicmessaging/music-messaging-bindings.c pidgin/plugins/perl/common/Makefile.PL$ pidgin/plugins/perl/common/Makefile.old pidgin/win32/pidgin_dll_rc.rc$ pidgin/win32/pidgin_exe_rc.rc$ pidgin/win32/nsis/gtk-runtime-*.*.*.*.zip pidgin/win32/nsis/gtk_runtime_stage$ pidgin/win32/nsis/pidgin-translations.nsh$ pidgin/win32/nsis/langmacros.nsh pidgin/win32/nsis/nsis_translations.desktop pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/translations install-sh libpurple/dbus-bindings.c libpurple/dbus-signals.c libpurple/dbus-types.c libpurple/dbus-types.h libpurple/example/nullclient libpurple/gconf/purple.schemas$ libpurple/marshallers.[ch] libpurple/plugins/dbus-example-bindings.c libpurple/plugins/perl/common/Makefile.PL$ libpurple/plugins/perl/common/Makefile.old libpurple/plugins/perl/common/const-c.inc libpurple/plugins/perl/common/const-xs.inc libpurple/plugins/perl/common/lib libpurple/purple.h$ libpurple/purple-client-bindings.c libpurple/purple-client-bindings.h libpurple/purple-client-example libpurple/tests/check_libpurple libpurple/tests/libpurple.. libpurple/version.h$ libpurple/win32/libpurplerc.rc$ libtool local.mak ltmain.sh missing mkinstalldirs po/Makefile.in.in po/POTFILES$ po/missing po/notexist po/pidgin.pot po/stamp-it stamp-h1 win32-install-dir(\.release)? VERSION$