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 gtkdnd-hints.h GTK+ Drag-and-Drop arrow hints * @ingroup 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, 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_DND_HINTS_H_ #define _PIDGIN_DND_HINTS_H_ #include <glib.h> #include <gtk/gtk.h> /** * Conversation drag-and-drop arrow types. */ typedef enum { HINT_ARROW_UP, /**< Up arrow. */ HINT_ARROW_DOWN, /**< Down arrow. */ HINT_ARROW_LEFT, /**< Left arrow. */ HINT_ARROW_RIGHT /**< Right arrow. */ } DndHintWindowId; /** * Conversation drag-and-drop arrow positions. */ typedef enum { HINT_POSITION_RIGHT, /**< Position to the right of a tab. */ HINT_POSITION_LEFT, /**< Position to the left of a tab. */ HINT_POSITION_TOP, /**< Position above a tab. */ HINT_POSITION_BOTTOM, /**< Position below a tab. */ HINT_POSITION_CENTER /**< Position in the center of a tab. */ } DndHintPosition; /** * Shows a drag-and-drop hint at the specified location. * * @param id The ID of the hint to show. * @param x The X location to show it at. * @param y The Y location to show it at. */ void dnd_hints_show(DndHintWindowId id, gint x, gint y); /** * Hides the specified drag-and-drop hint. * * @param id The ID of the hint to hide. */ void dnd_hints_hide(DndHintWindowId id); /** * Hides all drag-and-drop hints. */ void dnd_hints_hide_all(void); /** * Shows a drag-and-drop hint relative to a widget. * * @param id The ID of the hint. * @param widget The widget that the hint is relative to. * @param horiz The horizontal relative position. * @param vert The vertical relative position. */ void dnd_hints_show_relative(DndHintWindowId id, GtkWidget *widget, DndHintPosition horiz, DndHintPosition vert); #endif /* _PIDGIN_DND_HINTS_H_ */