Mercurial > pidgin.yaz
changeset 28310:a7eac81575e7
Normalize on 'cancelled'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 18 Jul 2009 04:31:38 +0000 |
| parents | bd9df4e45904 |
| children | 1f329bdc91ab |
| files | libpurple/ft.c libpurple/protocols/qq/send_file.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/ft.c Wed Jul 15 04:04:12 2009 +0000 +++ b/libpurple/ft.c Sat Jul 18 04:31:38 2009 +0000 @@ -1161,7 +1161,7 @@ if (purple_xfer_get_filename(xfer) != NULL) { - msg = g_strdup_printf(_("You canceled the transfer of %s"), + msg = g_strdup_printf(_("You cancelled the transfer of %s"), purple_xfer_get_filename(xfer)); } else @@ -1224,12 +1224,12 @@ if (purple_xfer_get_filename(xfer) != NULL) { - msg = g_strdup_printf(_("%s canceled the transfer of %s"), + msg = g_strdup_printf(_("%s cancelled the transfer of %s"), buddy ? purple_buddy_get_alias(buddy) : xfer->who, purple_xfer_get_filename(xfer)); } else { - msg = g_strdup_printf(_("%s canceled the file transfer"), + msg = g_strdup_printf(_("%s cancelled the file transfer"), buddy ? purple_buddy_get_alias(buddy) : xfer->who); } purple_xfer_conversation_write(xfer, msg, TRUE);
--- a/libpurple/protocols/qq/send_file.c Wed Jul 15 04:04:12 2009 +0000 +++ b/libpurple/protocols/qq/send_file.c Sat Jul 18 04:31:38 2009 +0000 @@ -730,7 +730,7 @@ */ filename = g_path_get_basename(purple_xfer_get_local_filename(qd->xfer)); msg = g_strdup_printf - (_("%d canceled the transfer of %s"), + (_("%d cancelled the transfer of %s"), sender_uid, filename); purple_notify_warning (gc, _("File Send"), msg, NULL);