pidgin: 6edfcd5c: Standardize on "cancelled".

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 6edfcd5c45dd91f7b29deaf9eedbf44ce09c0a9c
Parent:   8152c59e37077941bce9ab4317438f41754116be
Author:   qulogic at pidgin.im
Date:     08/22/10 21:41:31
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6edfcd5c45dd91f7b29deaf9eedbf44ce09c0a9c

Changelog: 

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.

Changes against parent 8152c59e37077941bce9ab4317438f41754116be

  patched  finch/gntft.c
  patched  finch/gntft.h
  patched  libpurple/account.c
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/network.h
  patched  libpurple/plugins/signals-test.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/oob.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/qq/ChangeLog
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/chat.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silcpurple.h
  patched  libpurple/protocols/silc10/chat.c
  patched  libpurple/protocols/silc10/ops.c
  patched  libpurple/protocols/silc10/silcpurple.h
  patched  libpurple/protocols/yahoo/yahoo_doodle.c
  patched  libpurple/protocols/yahoo/yahoo_doodle.h
  patched  pidgin/gtkft.c
  patched  pidgin/gtkft.h
  patched  pidgin/pidginstock.h
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po

-------------- next part --------------
============================================================
--- po/de.po	7a1bed92d52e638d4b83befa87925f23853eac35
+++ po/de.po	6800bc4debccf70ef936fabf5c76955f48c1267f
@@ -813,7 +813,7 @@ msgstr "Warte auf den Beginn der Dateiü
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Dateiübertragung"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Abgebrochen"
 
 msgid "Failed"
============================================================
--- po/fr.po	2102a5c39e084f63b89958ad4711a49116c5834b
+++ po/fr.po	a67aa24f9baf69a5ed8aecdbd2549201706ce9f1
@@ -821,7 +821,7 @@ msgstr "En attente de début de transfer
 msgid "Waiting for transfer to begin"
 msgstr "En attente de début de transfert"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulé"
 
 msgid "Failed"
@@ -16009,7 +16009,7 @@ msgstr "Vous n'avez pas les permissions 
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Impossible d'ouvrir %s pour l'écriture"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Échec du transfert de fichier. Annulation probable du correspondant."
 
============================================================
--- po/es.po	c6ea772e0d4954ceee0830e2ca6bf4a7541c63eb
+++ po/es.po	87d048fae74c7fba6ad9a2878406198d13896c3a
@@ -916,7 +916,7 @@ msgstr "Esperando el comienzo de la tran
 msgid "Waiting for transfer to begin"
 msgstr "Esperando el comienzo de la transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
============================================================
--- po/zh_CN.po	8009b4488d7118c88ef43b099f95baca5ad72f98
+++ po/zh_CN.po	c9a5efd52c7b2a6f08f70cbadca82df0570aaabf
@@ -777,7 +777,7 @@ msgstr "æ­£åœ¨ç­‰å¾…ä¼ é€å¼€å§‹"
 msgid "Waiting for transfer to begin"
 msgstr "æ­£åœ¨ç­‰å¾…ä¼ é€å¼€å§‹"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
@@ -15530,7 +15530,7 @@ msgstr "您没有权限卸载此程序ã€
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "æ— æ³•æ‰“å¼€ %s 写入！"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "æ–‡ä»¶ä¼ é€å¤±è´¥ï¼›å¯èƒ½å…¶ä¸­ä¸€ç«¯å–æ¶ˆäº†ä¼ é€ã€‚"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ko.po	e8f80dd2e1d7297e3d7d82ac0a11345d07970d2f
+++ po/ko.po	2fb703f25b375a8ca7d2891f28fa82992c3179e5
@@ -816,7 +816,7 @@ msgstr "ì „ì†¡ 시작을 ê¸°ë‹¤ë¦¬ê³  ìž
 msgid "Waiting for transfer to begin"
 msgstr "ì „ì†¡ 시작을 ê¸°ë‹¤ë¦¬ê³  있습니다."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "취소되었습니다."
 
 msgid "Failed"
@@ -16691,7 +16691,7 @@ msgstr "이 프로그램을 ì œê±°í•  ìˆ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "쓰기 모드에서 %s 을(를) 열 수 없습니다!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "파일 ì „ì†¡ì— 실패했습니다. 아마도 상대측에서 취소한 것 같습니다."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ru.po	f53f728b4d8fad3cfb93872959695625ad467578
+++ po/ru.po	cf443f9f0d1805c10cff33db9b5f8ed86e1f670d
@@ -807,7 +807,7 @@ msgstr "Ожидание начала п
 msgid "Waiting for transfer to begin"
 msgstr "Ожидание начала передачи"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отменено"
 
 msgid "Failed"
@@ -16446,7 +16446,7 @@ msgstr "У Вас нет прав на Ñ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не удалось открыть %s для записи!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне."
 
============================================================
--- libpurple/protocols/oscar/oscar.c	e0401bb339b554a4e558b4e2545a1523a9cc7ab8
+++ libpurple/protocols/oscar/oscar.c	e8c1ff08db1d603ba878a7bbfdac077b6abb35e5
@@ -1699,7 +1699,7 @@ incomingim_chan2(OscarData *od, FlapConn
 		}
 		else if (args->status == AIM_RENDEZVOUS_CANCEL)
 		{
-			/* The other user canceled a peer request */
+			/* The other user cancelled a peer request */
 			PeerConnection *conn;
 
 			conn = peer_connection_find_by_cookie(od, userinfo->bn, args->cookie);
@@ -4953,7 +4953,7 @@ oscar_close_directim(gpointer object, gp
 		peer_connection_destroy(conn, OSCAR_DISCONNECT_LOCAL_CLOSED, NULL);
 
 		/* OSCAR_DISCONNECT_LOCAL_CLOSED doesn't write anything to the convo
-		 * window. Let the user know that we canceled the Direct IM. */
+		 * window. Let the user know that we cancelled the Direct IM. */
 		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
 		purple_conversation_write(conv, NULL, _("You closed the connection."),
 				PURPLE_MESSAGE_SYSTEM, time(NULL));
============================================================
--- po/pl.po	7240a60ac583ba04ed99d1078a052cb114fcda2c
+++ po/pl.po	745373fe35f9d89a45424677a81e6b0975a90824
@@ -818,7 +818,7 @@ msgstr "Oczekiwanie na rozpoczęcie prze
 msgid "Waiting for transfer to begin"
 msgstr "Oczekiwanie na rozpoczęcie przesyłu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulowano"
 
 msgid "Failed"
============================================================
--- po/nl.po	ab86e0c299159a7405927086ef60207f29a5b6c5
+++ po/nl.po	0f58e8a39b726cc67ecc31317185ea72a11eaf11
@@ -804,7 +804,7 @@ msgstr "Wacht op starten van overdracht"
 msgid "Waiting for transfer to begin"
 msgstr "Wacht op starten van overdracht"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Geannuleerd"
 
 msgid "Failed"
============================================================
--- po/sv.po	14d55aac392bc99deb3e01b66846e4fe81c3ada0
+++ po/sv.po	c1e093cdc7a0e9b804b36e2d4f2f9bfc7c3a8510
@@ -797,7 +797,7 @@ msgstr "Väntar på att överföringen s
 msgid "Waiting for transfer to begin"
 msgstr "Väntar på att överföringen ska inledas"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbruten"
 
 msgid "Failed"
@@ -16135,7 +16135,7 @@ msgstr "Du har inte rättigheter att avi
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunde inte öppna %s för läsning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filöverföringen misslyckades, antagligen eftersom andra sidan avbröt."
 
============================================================
--- po/fi.po	6cb76165f59f2b888839f7b3529011ad90259da8
+++ po/fi.po	fca08b4a57c1c0b4468b2431ce2e26172092bfe8
@@ -802,7 +802,7 @@ msgstr "Odotetaan lähetyksen alkamista"
 msgid "Waiting for transfer to begin"
 msgstr "Odotetaan lähetyksen alkamista"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Peruutettu"
 
 msgid "Failed"
@@ -16262,7 +16262,7 @@ msgstr "Sinulla ei ole valtuuksia poista
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s:n avaaminen kirjoitusta varten epäonnistui!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tiedostonsiirto epäonnistui. Toinen osapuoli luultavasti katkaisi siirron."
 
@@ -17459,7 +17459,7 @@ msgstr "Sinulla ei ole valtuuksia poista
 #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
 #~ msgstr "Pyyntösi lähettää tiedosto (%s) one evätty tuttavan (%d) toimesta"
 
-#~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
+#~ msgid "The sending process of file[%s] has been cancelled by buddy[%d]"
 #~ msgstr "Tiedoston (%s) lähetys on peruutettu tuttavan (%d) toimesta"
 
 #~ msgid "Blink tray icon for unread..."
============================================================
--- po/sk.po	fe10f1139ae105cbb3cc671b2d50efb955e7b2a6
+++ po/sk.po	78159722791ecf3c92f4de39e45261edcdc3991c
@@ -803,7 +803,7 @@ msgstr "Čaká sa na začiatok prenosu"
 msgid "Waiting for transfer to begin"
 msgstr "Čaká sa na začiatok prenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušené"
 
 msgid "Failed"
@@ -16124,7 +16124,7 @@ msgstr "Nemáte oprávnenie na odinštal
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nepodarilo sa otvoriť %s pre zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Prenos súboru zlyhal; druhá strana ho asi zrušila."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/it.po	2140e5f9514f03578ea1034dec696aec6df8c960
+++ po/it.po	17d0a094cb63ea2e4d05763fbefabea89f4a39fc
@@ -808,7 +808,7 @@ msgstr "In attesa dell'inizio del trasfe
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annullato"
 
 msgid "Failed"
============================================================
--- po/da.po	102a5c92e44d4549c2a381039a8dd5ab740de61d
+++ po/da.po	db67b49200a05d38bb329eb4d24ba550a5253d8d
@@ -812,7 +812,7 @@ msgstr "Venter på at overførsel skal s
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overførsel skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Annulleret"
 
 msgid "Failed"
@@ -16489,7 +16489,7 @@ msgstr "Du har ikke tilladelse til at af
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kunne ikke åbne %s til skrivning!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Filoverførsel fejlede - den anden side har sikkert afbrudt."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ja.po	8760d2e0429f7133b4cd025340e2b177fd0ab919
+++ po/ja.po	2af7bd14ed5afcacaec18fb1ab48e9eba7f0a618
@@ -808,7 +808,7 @@ msgstr "転送開始を待っていまã
 msgid "Waiting for transfer to begin"
 msgstr "転送開始を待っています"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "キャンセルしました"
 
 msgid "Failed"
@@ -16759,7 +16759,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "書き込みモードで %s を開けません！"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。"
 
============================================================
--- po/bg.po	d48d5adfd3f5e0a391493aa49e5e8bbe09217e83
+++ po/bg.po	a3465ad479c8994c93a811e9403c834ed99d696a
@@ -820,7 +820,7 @@ msgstr "Изчакване пренасÑ
 msgid "Waiting for transfer to begin"
 msgstr "Изчакване пренасянето да започне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Отказан"
 
 msgid "Failed"
@@ -16574,7 +16574,7 @@ msgstr "Нямате права да дÐ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s не може да бъде отворен за запис!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването."
 
============================================================
--- po/zh_TW.po	5bf2020d1be1dd5f9edfd2c52bd739524d31abac
+++ po/zh_TW.po	dd3403836e365a0cc982c54b85a5fabb49db41ea
@@ -866,7 +866,7 @@ msgstr "等待開始傳輸檔案中..."
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
============================================================
--- po/hu.po	aa6d080b94e1c93382a6e856eae94288fc0fff59
+++ po/hu.po	f46467318478ab6c270bc307eaa744e4a0bc0dcf
@@ -804,7 +804,7 @@ msgstr "Várakozás az átvitel indulás
 msgid "Waiting for transfer to begin"
 msgstr "Várakozás az átvitel indulására"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Megszakítva"
 
 msgid "Failed"
============================================================
--- po/cs.po	7bbbfd4eb781c80d8d96f374c2f8dacbaac6dc85
+++ po/cs.po	cc38561cdf7008be3d08b41d08b0a2729bc2f3a8
@@ -793,7 +793,7 @@ msgstr "Čekám na začátek přenosu"
 msgid "Waiting for transfer to begin"
 msgstr "Čekám na začátek přenosu"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Zrušeno"
 
 msgid "Failed"
@@ -16042,7 +16042,7 @@ msgstr "Nemáte oprávnění k odinstala
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nemohu otevřít %s pro zápis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Přenos souboru selhal; druhá strana jej pravděpodobně přerušila."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ro.po	c64fe026bd32d79537c630918cdacdfde6bd94d7
+++ po/ro.po	d45a01a25278294830ba233bbe9d4c602f4b5264
@@ -807,7 +807,7 @@ msgstr "Se așteaptă începerea transfe
 msgid "Waiting for transfer to begin"
 msgstr "Se așteaptă începerea transferului"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Oprit"
 
 msgid "Failed"
============================================================
--- libpurple/ft.c	f67ecd8a7cc1b2507d7eb4480256a23fc0346ad0
+++ libpurple/ft.c	2572b6c6be0eb71ada789624391c89b1d8edb152
@@ -752,6 +752,7 @@ purple_xfer_get_status(const PurpleXfer 
 	return xfer->status;
 }
 
+/* FIXME: Rename with cancelled for 3.0.0. */
 gboolean
 purple_xfer_is_canceled(const PurpleXfer *xfer)
 {
============================================================
--- libpurple/ft.h	533ba87b5980edefb5b1c2e5ceb1d1da9c0a49d4
+++ libpurple/ft.h	df44a26ea5a93d77bc2fb85e83b0499cb6214b5a
@@ -58,8 +58,8 @@ typedef enum
 	PURPLE_XFER_STATUS_ACCEPTED,      /**< Receive accepted, but destination file not selected yet */
 	PURPLE_XFER_STATUS_STARTED,       /**< purple_xfer_start has been called. */
 	PURPLE_XFER_STATUS_DONE,          /**< The xfer completed successfully. */
-	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was canceled by us. */
-	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was canceled by the other end, or we couldn't connect. */
+	PURPLE_XFER_STATUS_CANCEL_LOCAL,  /**< The xfer was cancelled by us. */
+	PURPLE_XFER_STATUS_CANCEL_REMOTE  /**< The xfer was cancelled by the other end, or we couldn't connect. */
 } PurpleXferStatusType;
 
 /**
@@ -304,11 +304,12 @@ PurpleXferStatusType purple_xfer_get_sta
 PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer);
 
 /**
- * Returns true if the file transfer was canceled.
+ * Returns true if the file transfer was cancelled.
  *
  * @param xfer The file transfer.
  *
- * @return Whether or not the transfer was canceled.
+ * @return Whether or not the transfer was cancelled.
+ * FIXME: This should be renamed using cancelled for 3.0.0.
  */
 gboolean purple_xfer_is_canceled(const PurpleXfer *xfer);
 
============================================================
--- pidgin/gtkft.c	023a216dcfc8658affee6a1522c7f527213edb65
+++ pidgin/gtkft.c	2f4984b122e0afe34aafd7ec48684de8476fdc79
@@ -156,7 +156,7 @@ get_xfer_info_strings(PurpleXfer *xfer, 
 			*time_remaining = g_strdup(_("Finished"));
 		}
 		else if (purple_xfer_is_canceled(xfer)) {
-			*time_remaining = g_strdup(_("Canceled"));
+			*time_remaining = g_strdup(_("Cancelled"));
 		}
 		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
 			*time_remaining = g_strdup(_("Unknown"));
@@ -992,7 +992,7 @@ pidgin_xfer_dialog_cancel_xfer(PidginXfe
 									GTK_ICON_SIZE_MENU, NULL);
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
============================================================
--- pidgin/gtkft.h	2181d97fb42436ef97608262948dfe34846e8345
+++ pidgin/gtkft.h	0bc448cfd548120b8c689ab9968f156da81d6a16
@@ -88,10 +88,10 @@ void pidgin_xfer_dialog_remove_xfer(Pidg
 									 PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
  * @param dialog The file transfer dialog.
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									 PurpleXfer *xfer);
============================================================
--- po/sr.po	aa26aa2194282a3ca571b843e8c0a3a2a3782fff
+++ po/sr.po	7a745eee6580ecd645428b2139249df50b6d4dbd
@@ -791,7 +791,7 @@ msgstr "Чекам да пренос пÐ
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да пренос почне"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажи"
 
 msgid "Failed"
@@ -16453,7 +16453,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не могу да отворим %s за упис!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Неуспешан пренос датотеке; друга страна је вероватно отказала."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ca.po	74342a37c2b685b112240fa46e21c4389b7d9d11
+++ po/ca.po	fc9151d69652b7cc217e53527e93e356c4de445a
@@ -834,7 +834,7 @@ msgstr "S'està esperant a iniciar la tr
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -16326,7 +16326,7 @@ msgstr "No tens permís per desinstal.la
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
============================================================
--- po/am.po	6c542aa31b3c6118b7e5bc1651ae6253425c76e0
+++ po/am.po	c6abb3ad74e2770359ae553b0653708bfdf13ab8
@@ -812,7 +812,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ተወው"
 
 #, fuzzy
============================================================
--- libpurple/account.c	950ac1ab9a1d7557336d39b6542200633483cd2b
+++ libpurple/account.c	233bd035152e9144a71521e1ce7e8290a8db60cc
@@ -1129,7 +1129,7 @@ request_password_cancel_cb(PurpleAccount
 static void
 request_password_cancel_cb(PurpleAccount *account, PurpleRequestFields *fields)
 {
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
============================================================
--- po/he.po	df8611175b068a1e823663f4747a3502af56a541
+++ po/he.po	fa72dd6ef570ce8e73167126e630351e03973c55
@@ -781,7 +781,7 @@ msgstr "ממתין להעברה להתח
 msgid "Waiting for transfer to begin"
 msgstr "ממתין להעברה להתחיל"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "בוטל"
 
 msgid "Failed"
============================================================
--- po/pt_BR.po	6627e33d5e18a899c4971638e2d3a1589af74d26
+++ po/pt_BR.po	a8d5c87072d6cf72661fd5119cdd3baea8bf0fe9
@@ -804,7 +804,7 @@ msgstr "Esperando o começo da transferÃ
 msgid "Waiting for transfer to begin"
 msgstr "Esperando o começo da transferência"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelada"
 
 msgid "Failed"
@@ -16432,7 +16432,7 @@ msgstr "Você não tem permissão para d
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Não foi possível abrir %s para escrita!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Transferência de arquivo falhou; o outro lado provavelmente cancelou-a."
 
============================================================
--- po/hi.po	ab33f67d93add49ca822b5f47cbd8f25fc11c22d
+++ po/hi.po	ec9d87a8d3628723f6246913574e1c16c2272908
@@ -780,7 +780,7 @@ msgstr "हस्तांतरण कà
 msgid "Waiting for transfer to begin"
 msgstr "हस्तांतरण के शुरु होने की प्रतीक्षा करता है."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द"
 
 msgid "Failed"
============================================================
--- libpurple/plugins/signals-test.c	b083e7380bbb0119bc84b9b50ec861d9d9541f50
+++ libpurple/plugins/signals-test.c	9c3a20418b01cff809fbd3a789866f7fc3952ac2
@@ -592,12 +592,12 @@ ft_recv_cancel_cb(PurpleXfer *xfer, gpoi
 
 static void
 ft_recv_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file receive canceled\n");
+	purple_debug_misc("signals test", "file receive cancelled\n");
 }
 
 static void
 ft_send_cancel_cb(PurpleXfer *xfer, gpointer data) {
-	purple_debug_misc("signals test", "file send canceled\n");
+	purple_debug_misc("signals test", "file send cancelled\n");
 }
 
 static void
============================================================
--- libpurple/protocols/jabber/auth.c	1fd7a15cb3800f04166e65becc7c0e56f2688a35
+++ libpurple/protocols/jabber/auth.c	5e8b9d2dce41c65865f2af0cc8a39dfb48f673b4
@@ -123,7 +123,7 @@ auth_no_pass_cb(PurpleConnection *gc, Pu
 	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(purple_connection_get_account(gc), purple_core_get_ui(), FALSE);
 }
 #endif
============================================================
--- libpurple/protocols/jabber/oob.c	ae1a227467cd399da9dceb4878d80c4cdfd368b9
+++ libpurple/protocols/jabber/oob.c	21febd77dcfc1b208d841290a68bf8c206b7ccf8
@@ -185,7 +185,7 @@ static void jabber_oob_xfer_recv_denied(
 	jabber_oob_xfer_recv_error(xfer, "406");
 }
 
-static void jabber_oob_xfer_recv_canceled(PurpleXfer *xfer) {
+static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) {
 	jabber_oob_xfer_recv_error(xfer, "404");
 }
 
@@ -233,7 +233,7 @@ void jabber_oob_parse(JabberStream *js, 
 		purple_xfer_set_init_fnc(xfer,   jabber_oob_xfer_init);
 		purple_xfer_set_end_fnc(xfer,    jabber_oob_xfer_end);
 		purple_xfer_set_request_denied_fnc(xfer, jabber_oob_xfer_recv_denied);
-		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_canceled);
+		purple_xfer_set_cancel_recv_fnc(xfer, jabber_oob_xfer_recv_cancelled);
 		purple_xfer_set_read_fnc(xfer,   jabber_oob_xfer_read);
 		purple_xfer_set_start_fnc(xfer,  jabber_oob_xfer_start);
 
============================================================
--- po/pt.po	8f7d508769812a88585af6e75562f0d5009a88bf
+++ po/pt.po	8ec8a115b2b2e4822dd676341bc094292f0e84c3
@@ -843,7 +843,7 @@ msgstr "Esperando que a transferência c
 msgid "Waiting for transfer to begin"
 msgstr "Esperando que a transferência comece"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
@@ -17029,7 +17029,7 @@ msgstr "Não tem permissão para desinst
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Não foi possível abrir %s para escrita!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Tranferência de ficheiro falhou; o outro lado provavelmente cancelou-a."
 
============================================================
--- po/vi.po	f780eb758f252a1431f1a6fb0b3d0e562623d19d
+++ po/vi.po	f72b22bcc2c2d3ece7deef032fe9aac01d7e3b3e
@@ -805,7 +805,7 @@ msgstr "Đợi bắt đầu truyền"
 msgid "Waiting for transfer to begin"
 msgstr "Đợi bắt đầu truyền"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bị thôi"
 
 msgid "Failed"
============================================================
--- po/en_GB.po	92c345da82defe86a0d9b7b54aef931cb7342028
+++ po/en_GB.po	d4a55a50df9f1a5d13edb55e2364776a2c1fec7a
@@ -793,7 +793,7 @@ msgstr "Waiting for transfer to begin"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
============================================================
--- libpurple/network.h	cf756b2c66b01a82d14b24f5c9fb227db0602a71
+++ libpurple/network.h	74bdde99d8f3da7b9bda1da081319d6f0fc4a773
@@ -239,7 +239,7 @@ PurpleNetworkListenData *purple_network_
  * by passing in the return value from either purple_network_listen()
  * or purple_network_listen_range().
  *
- * @param listen_data This listener attempt will be canceled and
+ * @param listen_data This listener attempt will be cancelled and
  *        the struct will be freed.
  */
 void purple_network_listen_cancel(PurpleNetworkListenData *listen_data);
============================================================
--- po/mk.po	d02aabdd93ad46535dd32244c484b1e26bcdb3e8
+++ po/mk.po	6fa1af49c1df794e8d384cad05f3e7bd6227cf1f
@@ -806,7 +806,7 @@ msgstr "Чекам да започне Ð
 msgid "Waiting for transfer to begin"
 msgstr "Чекам да започне преносот"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Откажано"
 
 msgid "Failed"
@@ -16667,7 +16667,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Не можам да ја отворам %s за запишување!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Размената на датотека не успеа. Другата страна веројатно откажа."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/sl.po	150d1da3885c12ea66791fb7819d23f2b21f0bbe
+++ po/sl.po	7d1f4751bc0c210e046bddc0d4700079a5270477
@@ -812,7 +812,7 @@ msgstr "Čakanje na začetek prenosa"
 msgid "Waiting for transfer to begin"
 msgstr "Čakanje na začetek prenosa"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Preklicano"
 
 msgid "Failed"
============================================================
--- libpurple/protocols/silc/chat.c	5ae1c9fa80ffb1db19ffd8f87bf670e38ce4eecb
+++ libpurple/protocols/silc/chat.c	f676dc79de01ae522f1c92ac7129eee2c3cdd516
@@ -1395,7 +1395,7 @@ PurpleRoomlist *silcpurple_roomlist_get_
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1429,6 +1429,6 @@ void silcpurple_roomlist_cancel(PurpleRo
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
============================================================
--- libpurple/protocols/silc/ops.c	059a32c4558a3423b05562b96b38115840e5e8f6
+++ libpurple/protocols/silc/ops.c	30ab18780af11a53b6564a44c4e8ebfc1a296d78
@@ -1455,7 +1455,7 @@ silc_command_reply(SilcClient client, Si
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (error != SILC_STATUS_OK) {
============================================================
--- libpurple/protocols/silc/silcpurple.h	ff90e27accf4434be9ae415a7db51d128ac48491
+++ libpurple/protocols/silc/silcpurple.h	bcf02c313fbf4eae43623d3171690b1eebde81f5
@@ -85,7 +85,7 @@ typedef struct SilcPurpleStruct {
 	SilcMimeAssembler mimeass;
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
============================================================
--- po/en_CA.po	4aeefd8949f852e2ff18e5dcaed99b713769f5e5
+++ po/en_CA.po	2762b8765e143b6007355a6c252d8e5d6011d075
@@ -834,7 +834,7 @@ msgstr "Waiting for transfer to begin"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -17050,7 +17050,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- libpurple/protocols/msn/slplink.c	1f9104a14bb53e520506da7d1fc5c571306dba7a
+++ libpurple/protocols/msn/slplink.c	6523bac83d9d8380830984622c165471db345ee4
@@ -632,7 +632,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 		slpmsg = msn_slplink_message_find(slplink, header->session_id, header->id);
 		if (slpmsg == NULL)
 		{
-			/* Probably the transfer was canceled */
+			/* Probably the transfer was cancelled */
 			purple_debug_error("msn", "Couldn't find slpmsg\n");
 			return;
 		}
============================================================
--- po/lt.po	1b29c5ceb4437b3784ae8288f7b947bf313b7a74
+++ po/lt.po	73676e6be11ef335582ed95993b8ad8f5e99eee2
@@ -826,7 +826,7 @@ msgstr "Laukiama perdavimo pradžios"
 msgid "Waiting for transfer to begin"
 msgstr "Laukiama perdavimo pradžios"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Atšaukta"
 
 msgid "Failed"
============================================================
--- pidgin/pidginstock.h	9a5308fdb991f569f3c498f131fe107538d792c2
+++ pidgin/pidginstock.h	088036cf15c68c035f920e054132e404ba3c0046
@@ -44,7 +44,7 @@
 #define PIDGIN_STOCK_DOWNLOAD        "pidgin-download"
 #define PIDGIN_STOCK_EDIT            "pidgin-edit"
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
-#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
+#define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-cancelled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INFO            "pidgin-info"
============================================================
--- po/tr.po	3e6efa42417c7fed615dc58be0ae777894b00d97
+++ po/tr.po	61547ff549ff4526fce973533f2e6935578bcb97
@@ -805,7 +805,7 @@ msgstr "Aktarımın başlaması bekleniy
 msgid "Waiting for transfer to begin"
 msgstr "Aktarımın başlaması bekleniyor"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ä°ptal Edildi"
 
 msgid "Failed"
@@ -16367,7 +16367,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s yazma için açılamıyor!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Dosya transferi gerçekleştirilemedi; karşı taraf iptal etmiş olabilir."
 
============================================================
--- po/uk.po	f045c6151ef9eb02e92296f591d78252ecd2e6ad
+++ po/uk.po	3b870de44e1bbbd1042abeddc97368a1d219a775
@@ -809,7 +809,7 @@ msgstr "Очікування початÐ
 msgid "Waiting for transfer to begin"
 msgstr "Очікування початку передачі"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Скасовано"
 
 msgid "Failed"
============================================================
--- po/sq.po	008010147839dfb4bf5fe36038103a8119a9fc4d
+++ po/sq.po	8bd9ac128cec55860832807e06acc3d8942b8980
@@ -814,7 +814,7 @@ msgstr "Po pritet të fillojë shpërngu
 msgid "Waiting for transfer to begin"
 msgstr "Po pritet të fillojë shpërngulja"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anuluar"
 
 msgid "Failed"
============================================================
--- po/ka.po	edffca65445e517ec52a0ff14171941cad54855c
+++ po/ka.po	e500429b0fef15e499b3d5df4f174510fa5e373c
@@ -807,7 +807,7 @@ msgstr "ველოდები გაá
 msgid "Waiting for transfer to begin"
 msgstr "ველოდები გადატანის დაწყებას"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "გაუქმებულია"
 
 #, fuzzy
============================================================
--- libpurple/protocols/sametime/sametime.c	4cea362723d1ede4bfdb268ea705e3b48860aebe
+++ libpurple/protocols/sametime/sametime.c	600c368c9621bb7d077a7b997faaf5c416f63d8d
@@ -2133,7 +2133,7 @@ static void ft_incoming_cancel(PurpleXfe
 
 
 static void ft_incoming_cancel(PurpleXfer *xfer) {
-  /* incoming transfer rejected or canceled in-progress */
+  /* incoming transfer rejected or cancelled in-progress */
   struct mwFileTransfer *ft = xfer->data;
   if(ft) mwFileTransfer_reject(ft);
 }
============================================================
--- po/nb.po	91e28d0076b141aecd22f2cd1eb71893e7f38603
+++ po/nb.po	7f4757f98d84969fd5bd1c16d85971f88e472747
@@ -803,7 +803,7 @@ msgstr "Venter på at overføringen skal
 msgid "Waiting for transfer to begin"
 msgstr "Venter på at overføringen skal starte"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbrutt"
 
 msgid "Failed"
@@ -16208,7 +16208,7 @@ msgstr "Du har ikke rettigheter til å a
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Klarte ikke åpne %s for skriving!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Filoverføringen mislyktes - sannsynligvis avbrutt på den andre siden."
 
============================================================
--- po/az.po	bfabb1e2c43ecc9d016274b6d9d7948395534060
+++ po/az.po	6510044fcdf59f31d8f00492248fd7c1f1cda5ff
@@ -809,7 +809,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
@@ -16008,7 +16008,7 @@ msgstr ""
 #~ msgid "Invalid Groupname"
 #~ msgstr "Səhv istifadəçi adı."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Fayl transferi bacarılmadı, güman ki digər tərəfdən ləğv edildi."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/en_AU.po	23a11d479532a7c5bad97b9e2d5a1cc27c26e534
+++ po/en_AU.po	8688037ba5e73394cc8d47562a8de95fbfe84bb8
@@ -834,8 +834,8 @@ msgstr "Waiting for transfer to begin"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
-msgstr "Canceled"
+msgid "Cancelled"
+msgstr "Cancelled"
 
 msgid "Failed"
 msgstr "Failed"
@@ -2128,14 +2128,14 @@ msgid "You cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "You canceled the transfer of %s"
+msgstr "You cancelled the transfer of %s"
 
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
 #, fuzzy, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "%s cancelled the file transfer"
@@ -9265,7 +9265,7 @@ msgid "%d cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%s canceled the transfer of %s"
+msgstr "%s cancelled the transfer of %s"
 
 #, fuzzy, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -9346,7 +9346,7 @@ msgid "Place Closed"
 
 #, fuzzy
 msgid "Place Closed"
-msgstr "Canceled"
+msgstr "Cancelled"
 
 msgid "Microphone"
 msgstr ""
@@ -17062,8 +17062,8 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
+#~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
 #~ msgstr "Could not connect for transfer."
============================================================
--- po/et.po	eebdea6eb906692302f50b1e718ebb154ff5ae33
+++ po/et.po	07027bf56d29b20bbcbd60ce51993cfdec42687e
@@ -795,7 +795,7 @@ msgstr "Oodatakse ülekande algust"
 msgid "Waiting for transfer to begin"
 msgstr "Oodatakse ülekande algust"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Tühistatud"
 
 msgid "Failed"
@@ -16081,7 +16081,7 @@ msgstr ""
 #~ msgid "Password Change Successful"
 #~ msgstr "Paroolimuutmine õnnestus"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Tõrge ülekandmisel, ilmselt tühistas teine pool ülekande."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/gl.po	457e4f84413464b7e4adc0609f57c6060e78263f
+++ po/gl.po	9edea2fd2561dedea5555891739fe7d56a7a49e6
@@ -807,7 +807,7 @@ msgstr "Agardando o comezo da transferen
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Failed"
============================================================
--- po/gu.po	4a7744d4a7f135cfbc564352cb98e85d0f1ec02a
+++ po/gu.po	cd490fe05080c097f9068833e45a2b9dff854e60
@@ -789,7 +789,7 @@ msgstr "પરિવહન શરૂ થ
 msgid "Waiting for transfer to begin"
 msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "રદ થયેલ"
 
 msgid "Failed"
============================================================
--- po/my_MM.po	1ce9a10b9fd3e64d5c42fcce0442efe1470e6608
+++ po/my_MM.po	ad0997eb31d0407cea6eb5d254e4fafce5231a1a
@@ -834,7 +834,7 @@ msgstr "Waiting for transfer to begin"
 msgid "Waiting for transfer to begin"
 msgstr "Waiting for transfer to begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cancelled"
 
 msgid "Failed"
@@ -17057,7 +17057,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Could not open %s for writing!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "File transfer failed; other side probably cancelled."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/nn.po	b3cd76f7ac5ab6f45b80d925954344b9933fe79b
+++ po/nn.po	1ace8c0d14a511b3a6b1a5291040235b99165865
@@ -797,7 +797,7 @@ msgstr "Ventar på at overføringa skal 
 msgid "Waiting for transfer to begin"
 msgstr "Ventar på at overføringa skal begynna"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Avbroten"
 
 msgid "Failed"
============================================================
--- po/pa.po	e238f9fc3d4c0506bc972f4b39c51ed05c191f5f
+++ po/pa.po	5b49f461b575ac053d4b00960729d9c952c0764c
@@ -784,7 +784,7 @@ msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕ
 msgid "Waiting for transfer to begin"
 msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ਰੱਦ ਹੈ"
 
 msgid "Failed"
@@ -15891,7 +15891,7 @@ msgstr "ਤੁਹਾਨੂੰ ਇਹ ਐ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s ਨੂੰ ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ਫਾਇਲ ਸੰਚਾਰ ਅਸਫਲ ਹੈ; ਦੂਜੇ ਪਾਸੇ ਤੋਂ ਰੱਦ ਕੀਤਾ ਗਿਆ ਹੈ।"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/xh.po	cedbafa551a4d611eb4ded3cc7667db20fe063fe
+++ po/xh.po	f192acd1a1f459f07c7413457a5b9e443cbbcc83
@@ -843,7 +843,7 @@ msgstr "Ulindele ukuba ukudlulisa kuqali
 msgid "Waiting for transfer to begin"
 msgstr "Ulindele ukuba ukudlulisa kuqalise"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "IRhoxisiwe"
 
 msgid "Failed"
@@ -17192,7 +17192,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Akukwazekanga ukuvula i-%s malunga nokubhala!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ukudluliswa kwefayili akuphumelelanga; mhlawumbi elinye icala licinyiwe."
 
============================================================
--- po/te.po	7256793845a8d29b58aee14f5d9288f4fb474089
+++ po/te.po	a488f3a57ccaef5fb91b0ee7223ba44211ce1430
@@ -787,7 +787,7 @@ msgstr "ప్రారంభించà°
 msgid "Waiting for transfer to begin"
 msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ "
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "రద్దుచేయి"
 
 msgid "Failed"
============================================================
--- libpurple/protocols/yahoo/yahoo_doodle.c	4818980f13368988cab255516bdc4106d25065cc
+++ libpurple/protocols/yahoo/yahoo_doodle.c	d75e8392b7b33f3ad4a3070f844f6b11bd2f97ff
@@ -372,7 +372,7 @@ void yahoo_doodle_command_got_shutdown(P
 
 	/* TODO Ask if user wants to save picture before the session is closed */
 
-	wb->state = DOODLE_STATE_CANCELED;
+	wb->state = DOODLE_STATE_CANCELLED;
 	purple_whiteboard_destroy(wb);
 }
 
@@ -460,7 +460,7 @@ void yahoo_doodle_end(PurpleWhiteboard *
 
 	/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
 
-	if (gc && wb->state != DOODLE_STATE_CANCELED)
+	if (gc && wb->state != DOODLE_STATE_CANCELLED)
 		yahoo_doodle_command_send_shutdown(gc, wb->who);
 
 	g_free(ds->imv_key);
============================================================
--- libpurple/protocols/yahoo/yahoo_doodle.h	69fcb8deb22ff9a6531cc015893109591aa5e8d3
+++ libpurple/protocols/yahoo/yahoo_doodle.h	a92e2625b2b4ba9ea23c11933e808ffd5096ed0b
@@ -56,7 +56,7 @@
 #define DOODLE_STATE_REQUESTING  0
 #define DOODLE_STATE_REQUESTED   1
 #define DOODLE_STATE_ESTABLISHED 2
-#define DOODLE_STATE_CANCELED    3
+#define DOODLE_STATE_CANCELLED    3
 
 /* Doodle canvas dimensions */
 #define DOODLE_CANVAS_WIDTH  368
============================================================
--- po/bs.po	26ca24f2514e170feba8b5f63b2b50edabf0266e
+++ po/bs.po	e8e4af491998eefe22b3c26d4041b7afa04a7584
@@ -822,7 +822,7 @@ msgstr "Cekanje na pocetak transfera"
 msgid "Waiting for transfer to begin"
 msgstr "Cekanje na pocetak transfera"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkazano"
 
 msgid "Failed"
@@ -17049,7 +17049,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Nije bilo moguce otvoriti %s za pisanje!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer datoteke je neuspio; druga strana je vjerovatno odustala."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/el.po	5c7a157fbaa2e6c4f5a73ff5163d740f7bb17302
+++ po/el.po	9267c5c6c00bf9d8d1773f97b8ddbadb1f3a196d
@@ -804,7 +804,7 @@ msgstr "Αναμονή έναρξης μ
 msgid "Waiting for transfer to begin"
 msgstr "Αναμονή έναρξης μεταφοράς"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 msgid "Failed"
@@ -16284,7 +16284,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Αδύνατο το άνοιγμα του %s για εγγραφή!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά."
 
============================================================
# po/ku.po is binary
============================================================
--- po/ta.po	66e91e98a24e881469340d09d02e74eeeda46055
+++ po/ta.po	3bd37a38c398cb2aaea23a1bf1f6c397475cb759
@@ -795,7 +795,7 @@ msgstr "பரிமாற்றம் à
 msgid "Waiting for transfer to begin"
 msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "தவிர்க்கப்பட்டது"
 
 msgid "Failed"
@@ -16101,7 +16101,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s யை எழுதுவதற்காக திறக்கமுடியவில்லை!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "கோப்பு அனுப்புதலில் பிழை; ஒருவேளை மறுபக்கத்தில் தவிர்த்திருக்கலாம்."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/bn.po	f187f04d3e0e098d8678bdbfebdb1ee295381811
+++ po/bn.po	b18fc98ada1686b0d49f5a024e69be697ccfce58
@@ -843,7 +843,7 @@ msgstr "স্থানান্তর à
 msgid "Waiting for transfer to begin"
 msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 # mark6
============================================================
--- libpurple/protocols/oscar/family_icbm.c	f9520e8b749fcc5411cc03cd493022a1520ffc37
+++ libpurple/protocols/oscar/family_icbm.c	d47c7af073b498694d71876b40166191a9984946
@@ -1320,7 +1320,7 @@ static int incomingim_ch2(OscarData *od,
 
 	/*
 	 * Terminate connection/error code.  0x0001 means the other user
-	 * canceled the connection.
+	 * cancelled the connection.
 	 */
 	if (aim_tlv_gettlv(list2, 0x000b, 1))
 		args.errorcode = aim_tlv_get16(list2, 0x000b, 1);
============================================================
--- po/fa.po	c2a096eca0a3deaa213635f9b3e578b181d99c1a
+++ po/fa.po	b23ea26aa49a7324bcb1fc3c3ac7a4d13d7402a7
@@ -808,7 +808,7 @@ msgstr "در حال انتظار براÛ
 msgid "Waiting for transfer to begin"
 msgstr "در حال انتظار برای آغاز انتقال"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "صرف نظر شد"
 
 msgid "Failed"
@@ -16683,7 +16683,7 @@ msgstr "شما اجازه لازم برØ
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "نمی‌توان %s را برای نوشتن باز کرد!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "انتقال پرونده شکست خورد؛ احتمالاً طرف دیگر انصراف داده است."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- libpurple/protocols/oscar/oft.c	6ac400acf41f739c97b45a700fd1e74eb592ba44
+++ libpurple/protocols/oscar/oft.c	de45dfdd8f7dff08bf338c0fc958e0b97bbdf965
@@ -240,7 +240,7 @@ peer_oft_close(PeerConnection *conn)
 peer_oft_close(PeerConnection *conn)
 {
 	/*
-	 * If canceled by local user, and we're receiving a file, and
+	 * If cancelled by local user, and we're receiving a file, and
 	 * we're not connected/ready then send an ICBM cancel message.
 	 */
 	if ((purple_xfer_get_status(conn->xfer) == PURPLE_XFER_STATUS_CANCEL_LOCAL) &&
============================================================
--- po/ca at valencia.po	1bfd079c9b1d82ced2503889d0d8cec1a382ed98
+++ po/ca at valencia.po	792c65b72e3cb6669b162aee745b603efbe86c00
@@ -834,7 +834,7 @@ msgstr "S'està esperant a iniciar la tr
 msgid "Waiting for transfer to begin"
 msgstr "S'està esperant a iniciar la transferència"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "S'ha cancel·lat"
 
 msgid "Failed"
@@ -16324,7 +16324,7 @@ msgstr "No tens permís per desinstal.la
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "No s'ha pogut obrir %s per a escriure-hi."
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Ha fallat la transferència de fitxers. Probablement s'ha cancel·lat a "
 #~ "l'altra banda."
============================================================
--- po/th.po	ff0e9f4aadfc3754ce9b0a2a0e7bee5fc8597a42
+++ po/th.po	c60062b7cc0a23ded12aae4152b4f4f13fdf7b16
@@ -804,7 +804,7 @@ msgstr "กำลังรอการà¸
 msgid "Waiting for transfer to begin"
 msgstr "กำลังรอการรับส่งแฟ้ม"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ยกเลิก"
 
 msgid "Failed"
============================================================
--- po/eu.po	d15b5eeb0c53d07d4c807d4fd3d96c41c7152fad
+++ po/eu.po	e7aaa4d765b49decdfee4bdd4aac35f0113112f7
@@ -801,7 +801,7 @@ msgstr "Transferentzia hasteko zain"
 msgid "Waiting for transfer to begin"
 msgstr "Transferentzia hasteko zain"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Bertan behera utzi da"
 
 msgid "Failed"
@@ -16340,7 +16340,7 @@ msgstr "Ez daukazu aplikazio hau kentzek
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ezin izan da %s ireki idazteko!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr ""
 #~ "Fitxategi-transferentziak huts egin du; beste aldekoak beharbada bertan "
 #~ "behera utziko zuen."
============================================================
--- po/ne.po	2311adcd5b124ec3a33c9c8062a146194e12c377
+++ po/ne.po	dc31f3cf6be37b05f4c7ca54f0bd39d345869d6b
@@ -824,7 +824,7 @@ msgstr "स्थानान्तरà¤
 msgid "Waiting for transfer to begin"
 msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द गरियो"
 
 msgid "Failed"
@@ -17025,7 +17025,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ar.po	3bd2c50ec16abf258124db5a8ab756b1ff1ced60
+++ po/ar.po	09b031ad870201674d7c6cb3d830e08863d1b3a2
@@ -791,7 +791,7 @@ msgstr "في انتظار بدء النÙ
 msgid "Waiting for transfer to begin"
 msgstr "في انتظار بدء النقل"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "أُلغِيَ"
 
 msgid "Failed"
@@ -16584,7 +16584,7 @@ msgstr "لا تملك الصلاحيات
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لايمكن فتح %s للكتابة!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "فشل ارسال الملف: من المحتمل أن المستقبِل ألغى العملية."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/eo.po	cdc483e1a859620cabfec474e568b944321fef56
+++ po/eo.po	c291a2fa5e0d692eb1fe4626ffb2288f6dd92761
@@ -766,7 +766,7 @@ msgstr "Atendante la alŝutoeko"
 msgid "Waiting for transfer to begin"
 msgstr "Atendante la alŝutoeko"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Rezignita"
 
 msgid "Failed"
============================================================
--- po/dz.po	9a0c51067fcaa3084b4d84ae48d405558ed74c01
+++ po/dz.po	9c62524f664031bb552a158b8c6f3c8617bab8fe
@@ -818,7 +818,7 @@ msgstr "གནས་སོར་འགà½
 msgid "Waiting for transfer to begin"
 msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ཆ་མེད་བཏང་ཡི།"
 
 msgid "Failed"
@@ -16889,7 +16889,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "བྲིས་ནིའི་དོན་ལུ %s ཁ་ཕྱེ་མ་ཚུགས།"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ཡིག་སྣོད་གནས་སོར་འཐུས་ཤོར་བྱུང་ནུག ཕྱོགས་གཞན་མི་འདི་ཆ་མེད་བཏང་ཡི།"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- finch/gntft.c	203abd8edb065582713eca2052040dae8f8be16b
+++ finch/gntft.c	300cdfeb93f91e3f971648d6aba685dcdef3d252
@@ -386,7 +386,7 @@ finch_xfer_dialog_cancel_xfer(PurpleXfer
 	update_title_progress();
 
 	if (purple_xfer_is_canceled(xfer))
-		status = _("Canceled");
+		status = _("Cancelled");
 	else
 		status = _("Failed");
 
============================================================
--- finch/gntft.h	63e65c60c5990a49fab5d0909c1d12561eaedc85
+++ finch/gntft.h	d0cad7921e8665423888b36415afb63ac52390cc
@@ -72,9 +72,9 @@ void finch_xfer_dialog_remove_xfer(Purpl
 void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer);
 
 /**
- * Indicate in a file transfer dialog that a transfer was canceled.
+ * Indicate in a file transfer dialog that a transfer was cancelled.
  *
- * @param xfer   The file transfer that was canceled.
+ * @param xfer   The file transfer that was cancelled.
  */
 void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer);
 
============================================================
--- po/af.po	3f13909899d3bc58e9c5af08135cfa0ce0abf6af
+++ po/af.po	71f965f2ee4c64e9c97f97a639f42a26f97bbae4
@@ -802,7 +802,7 @@ msgstr "Wag vir oordrag om te begin"
 msgid "Waiting for transfer to begin"
 msgstr "Wag vir oordrag om te begin"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Gekanselleer"
 
 msgid "Failed"
@@ -15698,13 +15698,13 @@ msgstr "U het nie toestemming om hierdie
 #~ "afkomstig te wees.  Dit kan beteken dat u nie tans aan die diens gekoppel "
 #~ "is wat u dink nie."
 
-#~ msgid "You canceled the transfer of %s"
+#~ msgid "You cancelled the transfer of %s"
 #~ msgstr "U het die oordrag van %s gekanselleer"
 
-#~ msgid "%s canceled the transfer of %s"
+#~ msgid "%s cancelled the transfer of %s"
 #~ msgstr "%s het die oordrag van %s gekanselleer"
 
-#~ msgid "%s canceled the file transfer"
+#~ msgid "%s cancelled the file transfer"
 #~ msgstr "%s het die lêeroordrag gekanselleer"
 
 #~ msgid "Join/Part Hiding Configuration"
@@ -16292,7 +16292,7 @@ msgstr "U het nie toestemming om hierdie
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Kon nie %s vir skryf open nie!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Lêeroordrag het misluk; ander kant het waarskynlik gekanselleer."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/id.po	01c64eef3e862698f6ad8b697b1b9582f3f8818f
+++ po/id.po	f2a60483a15f7442d4410ab6c5140da945b26501
@@ -815,7 +815,7 @@ msgstr "Menunggu transfer untuk mulai"
 msgid "Waiting for transfer to begin"
 msgstr "Menunggu transfer untuk mulai"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Dibatalkan"
 
 msgid "Failed"
@@ -16769,7 +16769,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "%s tidak dapat dibuka untuk penulisan!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Transfer file gagal; sisi lainnya kemungkinan membatalkan."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/kn.po	0d58753b5383aaf935659a10f4c0c4da9ce42059
+++ po/kn.po	d0a80c4c45a58a559b3c03d2faaffd7df0a589f7
@@ -802,7 +802,7 @@ msgstr "ವರ್ಗಾವಣೆಯ ಪà
 msgid "Waiting for transfer to begin"
 msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ರದ್ದಾಗಿದೆ"
 
 msgid "Failed"
@@ -15930,7 +15930,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "ಬರೆಯುವದಕ್ಕಾಗಿ  %s ತೆರೆಯಲು ಆಗಲಿಲ್ಲ"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "ಕಡತ ವರ್ಗಾವಣೆ ವಿಫಲ ; ಬಹುಶ: ಆಚೆಯವರು ರದ್ದು ಮಾಡಿದರು"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/ps.po	0a33a8b74a6215e22db5376e2f4ea1494b6793b8
+++ po/ps.po	04b4c314de1a637644b1e292c361c04f603fe0ca
@@ -779,7 +779,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "فسخ شوه"
 
 msgid "Failed"
============================================================
--- po/zh_HK.po	a2fe537ef8461e925a72d01992fdc28b1d377c39
+++ po/zh_HK.po	970d049fee71f99fe64f3fea3c9c1085cc983f9d
@@ -868,7 +868,7 @@ msgstr "等待開始傳輸檔案中..."
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "已取消"
 
 msgid "Failed"
============================================================
--- libpurple/protocols/silc10/chat.c	1fb0d4dd8f2bc458afd07e250b999399a938417d
+++ libpurple/protocols/silc10/chat.c	ada930efabf7448689814ac64dd5ba801780814d
@@ -1417,7 +1417,7 @@ PurpleRoomlist *silcpurple_roomlist_get_
 	if (sg->roomlist)
 		purple_roomlist_unref(sg->roomlist);
 
-	sg->roomlist_canceled = FALSE;
+	sg->roomlist_cancelled = FALSE;
 
 	sg->roomlist = purple_roomlist_new(purple_connection_get_account(gc));
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", "channel", TRUE);
@@ -1451,6 +1451,6 @@ void silcpurple_roomlist_cancel(PurpleRo
 	if (sg->roomlist == list) {
 		purple_roomlist_unref(sg->roomlist);
 		sg->roomlist = NULL;
-		sg->roomlist_canceled = TRUE;
+		sg->roomlist_cancelled = TRUE;
 	}
 }
============================================================
--- libpurple/protocols/silc10/ops.c	538a6e95b16f19b0c893a566aed50e80fc69c272
+++ libpurple/protocols/silc10/ops.c	f4e1110872a958d61c16f845375a86639365c37a
@@ -1444,7 +1444,7 @@ silc_command_reply(SilcClient client, Si
 			int usercount;
 			PurpleRoomlistRoom *room;
 
-			if (sg->roomlist_canceled)
+			if (sg->roomlist_cancelled)
 				break;
 
 			if (!success) {
============================================================
--- libpurple/protocols/silc10/silcpurple.h	141ecf2e8e2daf228964503ea6c0d4aff82bfc21
+++ libpurple/protocols/silc10/silcpurple.h	74b30a75cfad806a9e650d75fe9fe7b9ffe8a79b
@@ -80,7 +80,7 @@ typedef struct SilcPurpleStruct {
 #endif
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
-	unsigned int roomlist_canceled    : 1;
+	unsigned int roomlist_cancelled   : 1;
 	unsigned int chpk                 : 1;
 } *SilcPurple;
 
============================================================
--- po/be at latin.po	b36cc5c5d83d6167e71f852cfa9d8c0bc628886b
+++ po/be at latin.po	2588ef9c99cd2db4f76d31c0b5122bd764e9f2b2
@@ -801,7 +801,7 @@ msgstr "Čakańnie pačatku pieradačy"
 msgid "Waiting for transfer to begin"
 msgstr "Čakańnie pačatku pieradačy"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anulavanaja"
 
 msgid "Failed"
@@ -16704,7 +16704,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Niemahčyma adčynić %s dziela zapisu!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Pamyłka pieradačy fajłu; aperacyja, mabyć, anulavanaja z taho boku."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/sr at latin.po	bfca4eaefccd93192f0cbe86cf71d629e54c9295
+++ po/sr at latin.po	b3014a63e9662d1071645780b6c8a470e2c24d2e
@@ -792,7 +792,7 @@ msgstr "Čekam da prenos počne"
 msgid "Waiting for transfer to begin"
 msgstr "Čekam da prenos počne"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Otkaži"
 
 msgid "Failed"
@@ -16471,7 +16471,7 @@ msgstr "Nemate ovlašćenja za deinstala
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Ne mogu da otvorim %s za upis!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Neuspešan prenos datoteke; druga strana je verovatno otkazala."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/lo.po	6743fe437dc02b4674c7b1c43b94439cc5fa21e9
+++ po/lo.po	a31ed4afe98859c5c1b20915f0328a8643b6b357
@@ -744,7 +744,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
============================================================
--- po/ur.po	615d1fcff2917a833c618cdd05741ae13abf766a
+++ po/ur.po	65f0cc5a32ad6491f3d1b2f1073d36846a72127c
@@ -815,7 +815,7 @@ msgstr "ٹرانسفر ہونے Ú©Û’ Ù„Ø
 msgid "Waiting for transfer to begin"
 msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr " منسوخ کیا گیا"
 
 msgid "Failed"
@@ -16800,7 +16800,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "لکھنے کے لئے %s کھول نہیں سکا!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "فائل ٹرانسفر ناکام ہوا؛یا ممکن ہے دوسری حانب منسوخ ہوا ہے۔"
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/si.po	f2a5d2503fd54be5a48379fefd77083b10450c12
+++ po/si.po	e88350eab9e62990481166c8a69aed449f1dab6e
@@ -757,7 +757,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "අහෝසි කරන්න"
 
 msgid "Failed"
============================================================
--- po/oc.po	d02bf9f9aad34d34b5fb18a1016479e9849b22c2
+++ po/oc.po	74482e9bf84e5764673f5b28622bdc79dd480d64
@@ -754,7 +754,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Anullat"
 
 msgid "Failed"
============================================================
--- libpurple/protocols/qq/ChangeLog	18bf33f0cc37a01a902116d1c8ea2827e490b3a7
+++ libpurple/protocols/qq/ChangeLog	96e5c5db83dd40be064824cad9ca0690f1928af9
@@ -233,7 +233,7 @@ 2008.08.06 - ccpaging <ccpaging(at)gmail
 2008.08.06 - ccpaging <ccpaging(at)gmail.com>
 	* Rename names of variables, Group, to Room
 	* Functions of group_network merged into qq_network and qq_process
-	* Canceled managing glist of group packet, add sub_cmdd and room_id  to transaction
+	* Cancelled managing glist of group packet, add sub_cmdd and room_id  to transaction
 	* Fixed error of demo group:
 		If 'room list' and 'room infor' are not setup, response received from server will emits 'room_id = 0' packet.
 
============================================================
--- po/ga.po	8b32d12a9399e0099cd51df32d86707c08d9db39
+++ po/ga.po	95eb4ceb9517bd67d48c94db0c9218183295c203
@@ -750,7 +750,7 @@ msgstr ""
 msgstr ""
 
 #, fuzzy
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Cealaithe"
 
 #, fuzzy
============================================================
--- po/mn.po	8336a920e263581f068a644be6d6cb09666bba44
+++ po/mn.po	6ff193387066564dc327dc57f83dbf5fc7935945
@@ -774,7 +774,7 @@ msgstr "Файл шилжүүлэлт э
 msgid "Waiting for transfer to begin"
 msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 msgid "Failed"
@@ -15602,7 +15602,7 @@ msgstr ""
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "Завсар хийхээр %sийг нээж чадсангүй!"
 
-#~ msgid "File transfer failed; other side probably canceled."
+#~ msgid "File transfer failed; other side probably cancelled."
 #~ msgstr "Файл дамжуулалт амжилттгүй боллоо."
 
 #~ msgid "Could not connect for transfer."
============================================================
--- po/km.po	ceb8cb263ed429c7a18c5b3443a596aba6d9acc1
+++ po/km.po	3983c9eccbfec176425657576ef8f0984b46f97b
@@ -777,7 +777,7 @@ msgstr "រង់ចាំ​ការâ€
 msgid "Waiting for transfer to begin"
 msgstr "រង់ចាំ​ការ​ផ្ទេរ​ចាប់ផ្ដើម"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "បានបោះបង់"
 
 msgid "Failed"
============================================================
--- po/sw.po	224b2d5c54002c1dde028e588e4a759b961a9a11
+++ po/sw.po	666a89ec5a9a963be4ebcb534c38dd47bc6e98f3
@@ -784,7 +784,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "Imeghairishwa"
 
 msgid "Failed"
============================================================
--- po/hy.po	a8b94ca121c3e1fd60a5b668453e6b2d80b80a23
+++ po/hy.po	a79fa9c56a6f265ba66ac738b75bd29abcbbb0a4
@@ -755,7 +755,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	3f58c82f738772bd8e63eb0520379cf888aadf39
+++ libpurple/protocols/jabber/auth_cyrus.c	de85c1d927c318ab37dbaae05f4823749ff6da3b
@@ -177,7 +177,7 @@ auth_no_pass_cb(PurpleConnection *gc, Pu
 	account = purple_connection_get_account(gc);
 	js = purple_connection_get_protocol_data(gc);
 
-	/* Disable the account as the user has canceled connecting */
+	/* Disable the account as the user has cancelled connecting */
 	purple_account_set_enabled(account, purple_core_get_ui(), FALSE);
 }
 
============================================================
--- po/ms_MY.po	3586040816c17c10cf0f374cbc9a331441dd0110
+++ po/ms_MY.po	23430d7560c7a6a754b873ae872d59a1ea742e59
@@ -741,7 +741,7 @@ msgstr ""
 msgid "Waiting for transfer to begin"
 msgstr ""
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr ""
 
 msgid "Failed"
============================================================
--- po/mr.po	b6ed3d7f515e25c50a168f208022927a02407dbc
+++ po/mr.po	e7b173957cf3df49676b86cdf0439614f9a6afa0
@@ -779,7 +779,7 @@ msgstr "स्थानांतर सà
 msgid "Waiting for transfer to begin"
 msgstr "स्थानांतर सुरू करण्याची प्रतिक्षा करत आहे"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "रद्द केले"
 
 msgid "Failed"
============================================================
--- po/or.po	6efd5e82f94a97219fe1eb4ad0e292225b802df6
+++ po/or.po	63c1f134bbcc337db17601fdbc0469c003707639
@@ -799,7 +799,7 @@ msgstr "ସ୍ଥାନାନ୍ତରà¬
 msgid "Waiting for transfer to begin"
 msgstr "ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ ହେବାକୁ ଅପେକ୍ଷା କରୁଛି"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "ବାତିଲ କରାଗଲା"
 
 msgid "Failed"
============================================================
--- po/bn_IN.po	80758b6dc435b07770dcc1a7bd10b7c788878398
+++ po/bn_IN.po	e11d6472e7b927adc48ad9a1bbca0ed7e2a9a4d8
@@ -795,7 +795,7 @@ msgstr "পরিবহণ আরম্à
 msgid "Waiting for transfer to begin"
 msgstr "পরিবহণ আরম্ভে অপেক্ষা চলছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল করা হয়েছে"
 
 msgid "Failed"
============================================================
--- po/as.po	f48c5178e6f5890571e7934285a46ca7483d07f6
+++ po/as.po	799099973190fe061aaa5221307b41f693a4e150
@@ -789,7 +789,7 @@ msgstr "বিনিময়ৰ আৰমà
 msgid "Waiting for transfer to begin"
 msgstr "বিনিময়ৰ আৰম্ভত অপেক্ষা কৰা হৈছে"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "বাতিল কৰা হৈছে"
 
 msgid "Failed"
============================================================
--- po/ml.po	8c6db947debca176b089b076c1d92337c6d43a8a
+++ po/ml.po	49a9c98dae92d6628dbc0121176ac2be3ed56bf2
@@ -788,7 +788,7 @@ msgstr "ഇടപാടു് ആരംà
 msgid "Waiting for transfer to begin"
 msgstr "ഇടപാടു് ആരംഭിക്കുന്നതിനായി കാത്തിരിക്കുന്നു"
 
-msgid "Canceled"
+msgid "Cancelled"
 msgstr "റദ്ദാക്കിയിരിക്കുന്നു"
 
 msgid "Failed"