Mercurial > pidgin.yaz
view libpurple/protocols/mxit/splashscreen.h @ 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 | c2bc5f8071a2 |
children |
line wrap: on
line source
/* * MXit Protocol libPurple Plugin * * -- splash screens -- * * Andrew Victor <libpurple@mxit.com> * * (C) Copyright 2009 MXit Lifestyle (Pty) Ltd. * <http://www.mxitlifestyle.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MXIT_SPLASHSCREEN_H_ #define _MXIT_SPLASHSCREEN_H_ #define HANDLE_SPLASH1 "plas1.png" #define HANDLE_SPLASH2 "plas2.png" #define DEFAULT_SPLASH_POPUP FALSE /* disabled by default */ /* * Return the ID of the current splash-screen. */ const char* splash_current(struct MXitSession* session); /* * Indicate if splash-screen popups are enabled. */ gboolean splash_popup_enabled(struct MXitSession* session); /* * Save a new splash-screen. */ void splash_update(struct MXitSession* session, const char* splashId, const char* data, int datalen, gboolean clickable); /* * Remove the stored splash-screen (if it exists). */ void splash_remove(struct MXitSession* session); /* * Display the current splash-screen. */ void splash_display(struct MXitSession* session); #endif /* _MXIT_SPLASHSCREEN_H_ */