Mon, 23 Aug 2010 01:41:31 +0000
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.
/** * @file gtksmiley.h GTK+ Custom Smiley API * @ingroup pidgin * @since 2.5.0 */ /* pidgin * * Pidgin is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * 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 PIDGIN_GTKSMILEY_H #define PIDGIN_GTKSMILEY_H #include "smiley.h" typedef struct _PidginSmiley PidginSmiley; /** * Add a PurpleSmiley to the GtkIMHtmlSmiley's list to be able to use it * in pidgin * * @param smiley The smiley to be added. */ void pidgin_smiley_add_to_list(PurpleSmiley *smiley); /** * Delete a PurpleSmiley from the GtkIMHtmlSmiley's list * * @param smiley The smiley to be deleted. */ void pidgin_smiley_del_from_list(PurpleSmiley *smiley); /** * Load the GtkIMHtml list */ void pidgin_smileys_init(void); /** * Uninit the GtkIMHtml list */ void pidgin_smileys_uninit(void); /** * Returns a GSList with the GtkIMHtmlSmiley of each custom smiley * * @constreturn A GtkIMHmlSmiley list */ GSList *pidgin_smileys_get_all(void); /****************************************************************************** * Smiley Manager *****************************************************************************/ /** * Displays the Smiley Manager Window */ void pidgin_smiley_manager_show(void); /** * Shows an editor for a smiley. * * @param widget The parent widget to be linked or @c NULL * @param smiley The PurpleSmiley to be edited, or @c NULL for a new smiley * @return The smiley add dialog * * @see pidgin_smiley_editor_set_shortcut * @see pidgin_smiley_editor_set_image */ PidginSmiley *pidgin_smiley_edit(GtkWidget *widget, PurpleSmiley *smiley); /** * Set the shortcut in a smiley add dialog * * @param editor A smiley editor dialog (created by pidgin_smiley_edit) * @param shortcut The shortcut to set */ void pidgin_smiley_editor_set_shortcut(PidginSmiley *editor, const gchar *shortcut); /** * Set the image in a smiley add dialog * * @param editor A smiley editor dialog * @param image A GdkPixbuf image */ void pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image); /** * Sets the image data in a smiley add dialog * * @param editor A smiley editor dialog * @param data A pointer to smiley's data * @param datasize The size of smiley's data * * @since 2.6.0 */ void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize); #endif /* PIDGIN_GTKSMILEY_H */