Mercurial > pidgin.yaz
annotate pidgin/gtkmedia.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 | 7921a53b94b3 |
children |
rev | line source |
---|---|
25550 | 1 /** |
26601
00f13da82914
Fix doxygen tags.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
26455
diff
changeset
|
2 * @file gtkmedia.h Pidgin Media API |
00f13da82914
Fix doxygen tags.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
26455
diff
changeset
|
3 * @ingroup pidgin |
00f13da82914
Fix doxygen tags.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
26455
diff
changeset
|
4 */ |
00f13da82914
Fix doxygen tags.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
26455
diff
changeset
|
5 |
00f13da82914
Fix doxygen tags.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
26455
diff
changeset
|
6 /* Pidgin |
25550 | 7 * |
8 * Pidgin is the legal property of its developers, whose names are too numerous | |
9 * to list here. Please refer to the COPYRIGHT file distributed with this | |
10 * source distribution. | |
11 * | |
12 * This program is free software; you can redistribute it and/or modify | |
13 * it under the terms of the GNU General Public License as published by | |
14 * the Free Software Foundation; either version 2 of the License, or | |
15 * (at your option) any later version. | |
16 * | |
17 * This program is distributed in the hope that it will be useful, | |
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 * GNU General Public License for more details. | |
21 * | |
22 * You should have received a copy of the GNU General Public License | |
23 * along with this program; if not, write to the Free Software | |
28420
7921a53b94b3
Oops, Elliott correctly pointed out this was wrong...
Paul Aurich <paul@darkrain42.org>
parents:
28399
diff
changeset
|
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
25550 | 25 */ |
26 | |
27 #ifndef __GTKMEDIA_H_ | |
28 #define __GTKMEDIA_H_ | |
29 | |
30 G_BEGIN_DECLS | |
31 | |
26145
685c8f5f85c7
Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26131
diff
changeset
|
32 void pidgin_medias_init(void); |
685c8f5f85c7
Separate PidginMedia from PidginConversation.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26131
diff
changeset
|
33 |
25550 | 34 G_END_DECLS |
35 | |
36 #endif /* __GTKMEDIA_H_ */ |