# HG changeset patch # User Elliott Sales de Andrade # Date 1282527691 0 # Node ID 1cdae196aac8a1edffe4b2260340c3caa49b854b # Parent c9a57878ed178f865772c2957dbce15d29fe9615 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. diff -r c9a57878ed17 -r 1cdae196aac8 finch/gntft.c --- a/finch/gntft.c Mon Aug 23 00:53:55 2010 +0000 +++ b/finch/gntft.c Mon Aug 23 01:41:31 2010 +0000 @@ -386,7 +386,7 @@ update_title_progress(); if (purple_xfer_is_canceled(xfer)) - status = _("Canceled"); + status = _("Cancelled"); else status = _("Failed"); diff -r c9a57878ed17 -r 1cdae196aac8 finch/gntft.h --- a/finch/gntft.h Mon Aug 23 00:53:55 2010 +0000 +++ b/finch/gntft.h Mon Aug 23 01:41:31 2010 +0000 @@ -72,9 +72,9 @@ 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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/account.c --- a/libpurple/account.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/account.c Mon Aug 23 01:41:31 2010 +0000 @@ -1129,7 +1129,7 @@ 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); } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/ft.c --- a/libpurple/ft.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/ft.c Mon Aug 23 01:41:31 2010 +0000 @@ -752,6 +752,7 @@ return xfer->status; } +/* FIXME: Rename with cancelled for 3.0.0. */ gboolean purple_xfer_is_canceled(const PurpleXfer *xfer) { diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/ft.h --- a/libpurple/ft.h Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/ft.h Mon Aug 23 01:41:31 2010 +0000 @@ -58,8 +58,8 @@ 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_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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/network.h --- a/libpurple/network.h Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/network.h Mon Aug 23 01:41:31 2010 +0000 @@ -239,7 +239,7 @@ * 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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/plugins/signals-test.c --- a/libpurple/plugins/signals-test.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/plugins/signals-test.c Mon Aug 23 01:41:31 2010 +0000 @@ -592,12 +592,12 @@ 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 diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/jabber/auth.c --- a/libpurple/protocols/jabber/auth.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/jabber/auth.c Mon Aug 23 01:41:31 2010 +0000 @@ -123,7 +123,7 @@ 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 diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/jabber/auth_cyrus.c --- a/libpurple/protocols/jabber/auth_cyrus.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Mon Aug 23 01:41:31 2010 +0000 @@ -177,7 +177,7 @@ 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); } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/jabber/oob.c --- a/libpurple/protocols/jabber/oob.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/jabber/oob.c Mon Aug 23 01:41:31 2010 +0000 @@ -185,7 +185,7 @@ 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 @@ 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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/msn/slplink.c --- a/libpurple/protocols/msn/slplink.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/msn/slplink.c Mon Aug 23 01:41:31 2010 +0000 @@ -632,7 +632,7 @@ 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; } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/oscar/family_icbm.c --- a/libpurple/protocols/oscar/family_icbm.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Mon Aug 23 01:41:31 2010 +0000 @@ -1320,7 +1320,7 @@ /* * 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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/oscar/oft.c --- a/libpurple/protocols/oscar/oft.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/oscar/oft.c Mon Aug 23 01:41:31 2010 +0000 @@ -240,7 +240,7 @@ 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) && diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Aug 23 01:41:31 2010 +0000 @@ -1699,7 +1699,7 @@ } 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 @@ 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)); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/qq/ChangeLog --- a/libpurple/protocols/qq/ChangeLog Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/qq/ChangeLog Mon Aug 23 01:41:31 2010 +0000 @@ -233,7 +233,7 @@ 2008.08.06 - ccpaging * 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. diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/sametime/sametime.c --- a/libpurple/protocols/sametime/sametime.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Aug 23 01:41:31 2010 +0000 @@ -2133,7 +2133,7 @@ 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); } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc/chat.c --- a/libpurple/protocols/silc/chat.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc/chat.c Mon Aug 23 01:41:31 2010 +0000 @@ -1395,7 +1395,7 @@ 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 @@ if (sg->roomlist == list) { purple_roomlist_unref(sg->roomlist); sg->roomlist = NULL; - sg->roomlist_canceled = TRUE; + sg->roomlist_cancelled = TRUE; } } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc/ops.c --- a/libpurple/protocols/silc/ops.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc/ops.c Mon Aug 23 01:41:31 2010 +0000 @@ -1455,7 +1455,7 @@ int usercount; PurpleRoomlistRoom *room; - if (sg->roomlist_canceled) + if (sg->roomlist_cancelled) break; if (error != SILC_STATUS_OK) { diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc/silcpurple.h --- a/libpurple/protocols/silc/silcpurple.h Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc/silcpurple.h Mon Aug 23 01:41:31 2010 +0000 @@ -85,7 +85,7 @@ 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; diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc10/chat.c --- a/libpurple/protocols/silc10/chat.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc10/chat.c Mon Aug 23 01:41:31 2010 +0000 @@ -1417,7 +1417,7 @@ 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 @@ if (sg->roomlist == list) { purple_roomlist_unref(sg->roomlist); sg->roomlist = NULL; - sg->roomlist_canceled = TRUE; + sg->roomlist_cancelled = TRUE; } } diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc10/ops.c --- a/libpurple/protocols/silc10/ops.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc10/ops.c Mon Aug 23 01:41:31 2010 +0000 @@ -1444,7 +1444,7 @@ int usercount; PurpleRoomlistRoom *room; - if (sg->roomlist_canceled) + if (sg->roomlist_cancelled) break; if (!success) { diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/silc10/silcpurple.h --- a/libpurple/protocols/silc10/silcpurple.h Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/silc10/silcpurple.h Mon Aug 23 01:41:31 2010 +0000 @@ -80,7 +80,7 @@ #endif unsigned int detaching : 1; unsigned int resuming : 1; - unsigned int roomlist_canceled : 1; + unsigned int roomlist_cancelled : 1; unsigned int chpk : 1; } *SilcPurple; diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/yahoo/yahoo_doodle.c --- a/libpurple/protocols/yahoo/yahoo_doodle.c Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.c Mon Aug 23 01:41:31 2010 +0000 @@ -372,7 +372,7 @@ /* 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 @@ /* 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); diff -r c9a57878ed17 -r 1cdae196aac8 libpurple/protocols/yahoo/yahoo_doodle.h --- a/libpurple/protocols/yahoo/yahoo_doodle.h Mon Aug 23 00:53:55 2010 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.h Mon Aug 23 01:41:31 2010 +0000 @@ -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 diff -r c9a57878ed17 -r 1cdae196aac8 pidgin/gtkft.c --- a/pidgin/gtkft.c Mon Aug 23 00:53:55 2010 +0000 +++ b/pidgin/gtkft.c Mon Aug 23 01:41:31 2010 +0000 @@ -156,7 +156,7 @@ *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 @@ GTK_ICON_SIZE_MENU, NULL); if (purple_xfer_is_canceled(xfer)) - status = _("Canceled"); + status = _("Cancelled"); else status = _("Failed"); diff -r c9a57878ed17 -r 1cdae196aac8 pidgin/gtkft.h --- a/pidgin/gtkft.h Mon Aug 23 00:53:55 2010 +0000 +++ b/pidgin/gtkft.h Mon Aug 23 01:41:31 2010 +0000 @@ -88,10 +88,10 @@ 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); diff -r c9a57878ed17 -r 1cdae196aac8 pidgin/pidginstock.h --- a/pidgin/pidginstock.h Mon Aug 23 00:53:55 2010 +0000 +++ b/pidgin/pidginstock.h Mon Aug 23 01:41:31 2010 +0000 @@ -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" diff -r c9a57878ed17 -r 1cdae196aac8 po/af.po --- a/po/af.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/af.po Mon Aug 23 01:41:31 2010 +0000 @@ -802,7 +802,7 @@ 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 @@ #~ "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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/am.po --- a/po/am.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/am.po Mon Aug 23 01:41:31 2010 +0000 @@ -812,7 +812,7 @@ msgstr "" #, fuzzy -msgid "Canceled" +msgid "Cancelled" msgstr "ተወው" #, fuzzy diff -r c9a57878ed17 -r 1cdae196aac8 po/ar.po --- a/po/ar.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ar.po Mon Aug 23 01:41:31 2010 +0000 @@ -791,7 +791,7 @@ msgid "Waiting for transfer to begin" msgstr "في انتظار بدء النقل" -msgid "Canceled" +msgid "Cancelled" msgstr "أُلغِيَ" msgid "Failed" @@ -16584,7 +16584,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/as.po --- a/po/as.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/as.po Mon Aug 23 01:41:31 2010 +0000 @@ -789,7 +789,7 @@ msgid "Waiting for transfer to begin" msgstr "বিনিময়ৰ আৰম্ভত অপেক্ষা কৰা হৈছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল কৰা হৈছে" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/az.po --- a/po/az.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/az.po Mon Aug 23 01:41:31 2010 +0000 @@ -809,7 +809,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" @@ -16008,7 +16008,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/be@latin.po --- a/po/be@latin.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/be@latin.po Mon Aug 23 01:41:31 2010 +0000 @@ -801,7 +801,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/bg.po --- a/po/bg.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/bg.po Mon Aug 23 01:41:31 2010 +0000 @@ -820,7 +820,7 @@ msgid "Waiting for transfer to begin" msgstr "Изчакване пренасянето да започне" -msgid "Canceled" +msgid "Cancelled" msgstr "Отказан" msgid "Failed" @@ -16574,7 +16574,7 @@ #~ 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 "" #~ "Неуспешен пренос на файла. Получателят вероятно е отказал получаването." diff -r c9a57878ed17 -r 1cdae196aac8 po/bn.po --- a/po/bn.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/bn.po Mon Aug 23 01:41:31 2010 +0000 @@ -843,7 +843,7 @@ msgid "Waiting for transfer to begin" msgstr "স্থানান্তর শুরু করার জন্য অপেক্ষা করা হচ্ছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল করা হয়েছে" # mark6 diff -r c9a57878ed17 -r 1cdae196aac8 po/bn_IN.po --- a/po/bn_IN.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/bn_IN.po Mon Aug 23 01:41:31 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "পরিবহণ আরম্ভে অপেক্ষা চলছে" -msgid "Canceled" +msgid "Cancelled" msgstr "বাতিল করা হয়েছে" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/bs.po --- a/po/bs.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/bs.po Mon Aug 23 01:41:31 2010 +0000 @@ -822,7 +822,7 @@ msgid "Waiting for transfer to begin" msgstr "Cekanje na pocetak transfera" -msgid "Canceled" +msgid "Cancelled" msgstr "Otkazano" msgid "Failed" @@ -17049,7 +17049,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ca.po --- a/po/ca.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ca.po Mon Aug 23 01:41:31 2010 +0000 @@ -834,7 +834,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ca@valencia.po --- a/po/ca@valencia.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ca@valencia.po Mon Aug 23 01:41:31 2010 +0000 @@ -834,7 +834,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/cs.po --- a/po/cs.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/cs.po Mon Aug 23 01:41:31 2010 +0000 @@ -793,7 +793,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/da.po --- a/po/da.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/da.po Mon Aug 23 01:41:31 2010 +0000 @@ -812,7 +812,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/de.po --- a/po/de.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/de.po Mon Aug 23 01:41:31 2010 +0000 @@ -813,7 +813,7 @@ msgid "Waiting for transfer to begin" msgstr "Warte auf den Beginn der Dateiübertragung" -msgid "Canceled" +msgid "Cancelled" msgstr "Abgebrochen" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/dz.po --- a/po/dz.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/dz.po Mon Aug 23 01:41:31 2010 +0000 @@ -818,7 +818,7 @@ msgid "Waiting for transfer to begin" msgstr "གནས་སོར་འགོ་བཙུགས་ནིའི་དོན་ལུ་བསྒུག་དོ།" -msgid "Canceled" +msgid "Cancelled" msgstr "ཆ་མེད་བཏང་ཡི།" msgid "Failed" @@ -16889,7 +16889,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/el.po --- a/po/el.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/el.po Mon Aug 23 01:41:31 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Αναμονή έναρξης μεταφοράς" -msgid "Canceled" +msgid "Cancelled" msgstr "Ακυρώθηκε" msgid "Failed" @@ -16284,7 +16284,7 @@ #~ 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 "" #~ "Αποτυχία μεταφοράς αρχείου. Πιθανώς να ακυρώθηκε από την άλλη πλευρά." diff -r c9a57878ed17 -r 1cdae196aac8 po/en_AU.po --- a/po/en_AU.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/en_AU.po Mon Aug 23 01:41:31 2010 +0000 @@ -834,8 +834,8 @@ 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 @@ #, 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 @@ #, 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 "Group Title: %s
" @@ -9346,7 +9346,7 @@ #, fuzzy msgid "Place Closed" -msgstr "Canceled" +msgstr "Cancelled" msgid "Microphone" msgstr "" @@ -17062,8 +17062,8 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/en_CA.po --- a/po/en_CA.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/en_CA.po Mon Aug 23 01:41:31 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" @@ -17050,7 +17050,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/en_GB.po --- a/po/en_GB.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/en_GB.po Mon Aug 23 01:41:31 2010 +0000 @@ -793,7 +793,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/eo.po --- a/po/eo.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/eo.po Mon Aug 23 01:41:31 2010 +0000 @@ -766,7 +766,7 @@ msgid "Waiting for transfer to begin" msgstr "Atendante la alŝutoeko" -msgid "Canceled" +msgid "Cancelled" msgstr "Rezignita" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/es.po --- a/po/es.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/es.po Mon Aug 23 01:41:31 2010 +0000 @@ -916,7 +916,7 @@ msgid "Waiting for transfer to begin" msgstr "Esperando el comienzo de la transferencia" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelado" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/et.po --- a/po/et.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/et.po Mon Aug 23 01:41:31 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "Oodatakse ülekande algust" -msgid "Canceled" +msgid "Cancelled" msgstr "Tühistatud" msgid "Failed" @@ -16081,7 +16081,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/eu.po --- a/po/eu.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/eu.po Mon Aug 23 01:41:31 2010 +0000 @@ -801,7 +801,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/fa.po --- a/po/fa.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/fa.po Mon Aug 23 01:41:31 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "در حال انتظار برای آغاز انتقال" -msgid "Canceled" +msgid "Cancelled" msgstr "صرف نظر شد" msgid "Failed" @@ -16683,7 +16683,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/fi.po --- a/po/fi.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/fi.po Mon Aug 23 01:41:31 2010 +0000 @@ -802,7 +802,7 @@ msgid "Waiting for transfer to begin" msgstr "Odotetaan lähetyksen alkamista" -msgid "Canceled" +msgid "Cancelled" msgstr "Peruutettu" msgid "Failed" @@ -16262,7 +16262,7 @@ #~ 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 @@ #~ 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..." diff -r c9a57878ed17 -r 1cdae196aac8 po/fr.po --- a/po/fr.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/fr.po Mon Aug 23 01:41:31 2010 +0000 @@ -821,7 +821,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ga.po --- a/po/ga.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ga.po Mon Aug 23 01:41:31 2010 +0000 @@ -750,7 +750,7 @@ msgstr "" #, fuzzy -msgid "Canceled" +msgid "Cancelled" msgstr "Cealaithe" #, fuzzy diff -r c9a57878ed17 -r 1cdae196aac8 po/gl.po --- a/po/gl.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/gl.po Mon Aug 23 01:41:31 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Agardando o comezo da transferencia" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelado" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/gu.po --- a/po/gu.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/gu.po Mon Aug 23 01:41:31 2010 +0000 @@ -789,7 +789,7 @@ msgid "Waiting for transfer to begin" msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ" -msgid "Canceled" +msgid "Cancelled" msgstr "રદ થયેલ" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/he.po --- a/po/he.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/he.po Mon Aug 23 01:41:31 2010 +0000 @@ -781,7 +781,7 @@ msgid "Waiting for transfer to begin" msgstr "ממתין להעברה להתחיל" -msgid "Canceled" +msgid "Cancelled" msgstr "בוטל" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/hi.po --- a/po/hi.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/hi.po Mon Aug 23 01:41:31 2010 +0000 @@ -780,7 +780,7 @@ msgid "Waiting for transfer to begin" msgstr "हस्तांतरण के शुरु होने की प्रतीक्षा करता है." -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/hu.po --- a/po/hu.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/hu.po Mon Aug 23 01:41:31 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Várakozás az átvitel indulására" -msgid "Canceled" +msgid "Cancelled" msgstr "Megszakítva" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/hy.po --- a/po/hy.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/hy.po Mon Aug 23 01:41:31 2010 +0000 @@ -755,7 +755,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/id.po --- a/po/id.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/id.po Mon Aug 23 01:41:31 2010 +0000 @@ -815,7 +815,7 @@ msgid "Waiting for transfer to begin" msgstr "Menunggu transfer untuk mulai" -msgid "Canceled" +msgid "Cancelled" msgstr "Dibatalkan" msgid "Failed" @@ -16769,7 +16769,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/it.po --- a/po/it.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/it.po Mon Aug 23 01:41:31 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "In attesa dell'inizio del trasferimento" -msgid "Canceled" +msgid "Cancelled" msgstr "Annullato" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ja.po --- a/po/ja.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ja.po Mon Aug 23 01:41:31 2010 +0000 @@ -808,7 +808,7 @@ msgid "Waiting for transfer to begin" msgstr "転送開始を待っています" -msgid "Canceled" +msgid "Cancelled" msgstr "キャンセルしました" msgid "Failed" @@ -16759,7 +16759,7 @@ #~ 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 "" #~ "ファイル転送が失敗しました。おそらく向こう側がキャンセルしたのでしょう。" diff -r c9a57878ed17 -r 1cdae196aac8 po/ka.po --- a/po/ka.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ka.po Mon Aug 23 01:41:31 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "ველოდები გადატანის დაწყებას" -msgid "Canceled" +msgid "Cancelled" msgstr "გაუქმებულია" #, fuzzy diff -r c9a57878ed17 -r 1cdae196aac8 po/km.po --- a/po/km.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/km.po Mon Aug 23 01:41:31 2010 +0000 @@ -777,7 +777,7 @@ msgid "Waiting for transfer to begin" msgstr "រង់ចាំ​ការ​ផ្ទេរ​ចាប់ផ្ដើម" -msgid "Canceled" +msgid "Cancelled" msgstr "បានបោះបង់" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/kn.po --- a/po/kn.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/kn.po Mon Aug 23 01:41:31 2010 +0000 @@ -802,7 +802,7 @@ msgid "Waiting for transfer to begin" msgstr "ವರ್ಗಾವಣೆಯ ಪ್ರಾರಂಭಕ್ಕಾಗಿ ನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ" -msgid "Canceled" +msgid "Cancelled" msgstr "ರದ್ದಾಗಿದೆ" msgid "Failed" @@ -15930,7 +15930,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ko.po --- a/po/ko.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ko.po Mon Aug 23 01:41:31 2010 +0000 @@ -816,7 +816,7 @@ msgid "Waiting for transfer to begin" msgstr "전송 시작을 기다리고 있습니다." -msgid "Canceled" +msgid "Cancelled" msgstr "취소되었습니다." msgid "Failed" @@ -16691,7 +16691,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ku.po --- a/po/ku.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ku.po Mon Aug 23 01:41:31 2010 +0000 @@ -828,7 +828,7 @@ msgid "Waiting for transfer to begin" msgstr "Li benda destpêkirina transferê ye" -msgid "Canceled" +msgid "Cancelled" msgstr "Hate Betalkirin" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/lo.po --- a/po/lo.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/lo.po Mon Aug 23 01:41:31 2010 +0000 @@ -744,7 +744,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/lt.po --- a/po/lt.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/lt.po Mon Aug 23 01:41:31 2010 +0000 @@ -826,7 +826,7 @@ msgid "Waiting for transfer to begin" msgstr "Laukiama perdavimo pradžios" -msgid "Canceled" +msgid "Cancelled" msgstr "Atšaukta" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/mk.po --- a/po/mk.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/mk.po Mon Aug 23 01:41:31 2010 +0000 @@ -806,7 +806,7 @@ msgid "Waiting for transfer to begin" msgstr "Чекам да започне преносот" -msgid "Canceled" +msgid "Cancelled" msgstr "Откажано" msgid "Failed" @@ -16667,7 +16667,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ml.po --- a/po/ml.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ml.po Mon Aug 23 01:41:31 2010 +0000 @@ -788,7 +788,7 @@ msgid "Waiting for transfer to begin" msgstr "ഇടപാടു് ആരംഭിക്കുന്നതിനായി കാത്തിരിക്കുന്നു" -msgid "Canceled" +msgid "Cancelled" msgstr "റദ്ദാക്കിയിരിക്കുന്നു" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/mn.po --- a/po/mn.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/mn.po Mon Aug 23 01:41:31 2010 +0000 @@ -774,7 +774,7 @@ msgid "Waiting for transfer to begin" msgstr "Файл шилжүүлэлт эхлүүлэхийг хүлээж байна" -msgid "Canceled" +msgid "Cancelled" msgstr "Цуцлагдсан" msgid "Failed" @@ -15602,7 +15602,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/mr.po --- a/po/mr.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/mr.po Mon Aug 23 01:41:31 2010 +0000 @@ -779,7 +779,7 @@ msgid "Waiting for transfer to begin" msgstr "स्थानांतर सुरू करण्याची प्रतिक्षा करत आहे" -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द केले" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ms_MY.po --- a/po/ms_MY.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ms_MY.po Mon Aug 23 01:41:31 2010 +0000 @@ -741,7 +741,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/my_MM.po --- a/po/my_MM.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/my_MM.po Mon Aug 23 01:41:31 2010 +0000 @@ -834,7 +834,7 @@ msgid "Waiting for transfer to begin" msgstr "Waiting for transfer to begin" -msgid "Canceled" +msgid "Cancelled" msgstr "Cancelled" msgid "Failed" @@ -17057,7 +17057,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/nb.po --- a/po/nb.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/nb.po Mon Aug 23 01:41:31 2010 +0000 @@ -803,7 +803,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ne.po --- a/po/ne.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ne.po Mon Aug 23 01:41:31 2010 +0000 @@ -824,7 +824,7 @@ msgid "Waiting for transfer to begin" msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको" -msgid "Canceled" +msgid "Cancelled" msgstr "रद्द गरियो" msgid "Failed" @@ -17025,7 +17025,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/nl.po --- a/po/nl.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/nl.po Mon Aug 23 01:41:31 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "Wacht op starten van overdracht" -msgid "Canceled" +msgid "Cancelled" msgstr "Geannuleerd" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/nn.po --- a/po/nn.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/nn.po Mon Aug 23 01:41:31 2010 +0000 @@ -797,7 +797,7 @@ msgid "Waiting for transfer to begin" msgstr "Ventar på at overføringa skal begynna" -msgid "Canceled" +msgid "Cancelled" msgstr "Avbroten" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/oc.po --- a/po/oc.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/oc.po Mon Aug 23 01:41:31 2010 +0000 @@ -754,7 +754,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "Anullat" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/or.po --- a/po/or.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/or.po Mon Aug 23 01:41:31 2010 +0000 @@ -799,7 +799,7 @@ msgid "Waiting for transfer to begin" msgstr "ସ୍ଥାନାନ୍ତରଣ ଆରମ୍ଭ ହେବାକୁ ଅପେକ୍ଷା କରୁଛି" -msgid "Canceled" +msgid "Cancelled" msgstr "ବାତିଲ କରାଗଲା" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/pa.po --- a/po/pa.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/pa.po Mon Aug 23 01:41:31 2010 +0000 @@ -784,7 +784,7 @@ msgid "Waiting for transfer to begin" msgstr "ਭੇਜਣ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਉਡੀਕ ਜਾਰੀ" -msgid "Canceled" +msgid "Cancelled" msgstr "ਰੱਦ ਹੈ" msgid "Failed" @@ -15891,7 +15891,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/pl.po --- a/po/pl.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/pl.po Mon Aug 23 01:41:31 2010 +0000 @@ -818,7 +818,7 @@ msgid "Waiting for transfer to begin" msgstr "Oczekiwanie na rozpoczęcie przesyłu" -msgid "Canceled" +msgid "Cancelled" msgstr "Anulowano" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ps.po --- a/po/ps.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ps.po Mon Aug 23 01:41:31 2010 +0000 @@ -779,7 +779,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "فسخ شوه" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/pt.po --- a/po/pt.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/pt.po Mon Aug 23 01:41:31 2010 +0000 @@ -843,7 +843,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/pt_BR.po --- a/po/pt_BR.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/pt_BR.po Mon Aug 23 01:41:31 2010 +0000 @@ -804,7 +804,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/ro.po --- a/po/ro.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ro.po Mon Aug 23 01:41:31 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Se așteaptă începerea transferului" -msgid "Canceled" +msgid "Cancelled" msgstr "Oprit" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ru.po --- a/po/ru.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ru.po Mon Aug 23 01:41:31 2010 +0000 @@ -807,7 +807,7 @@ msgid "Waiting for transfer to begin" msgstr "Ожидание начала передачи" -msgid "Canceled" +msgid "Cancelled" msgstr "Отменено" msgid "Failed" @@ -16446,7 +16446,7 @@ #~ 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 "" #~ "Не удалось произвести передачу файлов; вероятно, отменили на той стороне." diff -r c9a57878ed17 -r 1cdae196aac8 po/si.po --- a/po/si.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/si.po Mon Aug 23 01:41:31 2010 +0000 @@ -757,7 +757,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "අහෝසි කරන්න" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/sk.po --- a/po/sk.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sk.po Mon Aug 23 01:41:31 2010 +0000 @@ -803,7 +803,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/sl.po --- a/po/sl.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sl.po Mon Aug 23 01:41:31 2010 +0000 @@ -812,7 +812,7 @@ msgid "Waiting for transfer to begin" msgstr "Čakanje na začetek prenosa" -msgid "Canceled" +msgid "Cancelled" msgstr "Preklicano" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/sq.po --- a/po/sq.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sq.po Mon Aug 23 01:41:31 2010 +0000 @@ -814,7 +814,7 @@ msgid "Waiting for transfer to begin" msgstr "Po pritet të fillojë shpërngulja" -msgid "Canceled" +msgid "Cancelled" msgstr "Anuluar" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/sr.po --- a/po/sr.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sr.po Mon Aug 23 01:41:31 2010 +0000 @@ -791,7 +791,7 @@ msgid "Waiting for transfer to begin" msgstr "Чекам да пренос почне" -msgid "Canceled" +msgid "Cancelled" msgstr "Откажи" msgid "Failed" @@ -16453,7 +16453,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/sr@latin.po --- a/po/sr@latin.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sr@latin.po Mon Aug 23 01:41:31 2010 +0000 @@ -792,7 +792,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/sv.po --- a/po/sv.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sv.po Mon Aug 23 01:41:31 2010 +0000 @@ -797,7 +797,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/sw.po --- a/po/sw.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/sw.po Mon Aug 23 01:41:31 2010 +0000 @@ -784,7 +784,7 @@ msgid "Waiting for transfer to begin" msgstr "" -msgid "Canceled" +msgid "Cancelled" msgstr "Imeghairishwa" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ta.po --- a/po/ta.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ta.po Mon Aug 23 01:41:31 2010 +0000 @@ -795,7 +795,7 @@ msgid "Waiting for transfer to begin" msgstr "பரிமாற்றம் ஆரம்பமாவதற்காக காத்திருக்கிறது" -msgid "Canceled" +msgid "Cancelled" msgstr "தவிர்க்கப்பட்டது" msgid "Failed" @@ -16101,7 +16101,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/te.po --- a/po/te.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/te.po Mon Aug 23 01:41:31 2010 +0000 @@ -787,7 +787,7 @@ msgid "Waiting for transfer to begin" msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ " -msgid "Canceled" +msgid "Cancelled" msgstr "రద్దుచేయి" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/th.po --- a/po/th.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/th.po Mon Aug 23 01:41:31 2010 +0000 @@ -804,7 +804,7 @@ msgid "Waiting for transfer to begin" msgstr "กำลังรอการรับส่งแฟ้ม" -msgid "Canceled" +msgid "Cancelled" msgstr "ยกเลิก" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/tr.po --- a/po/tr.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/tr.po Mon Aug 23 01:41:31 2010 +0000 @@ -805,7 +805,7 @@ 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 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/uk.po --- a/po/uk.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/uk.po Mon Aug 23 01:41:31 2010 +0000 @@ -809,7 +809,7 @@ msgid "Waiting for transfer to begin" msgstr "Очікування початку передачі" -msgid "Canceled" +msgid "Cancelled" msgstr "Скасовано" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/ur.po --- a/po/ur.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/ur.po Mon Aug 23 01:41:31 2010 +0000 @@ -815,7 +815,7 @@ msgid "Waiting for transfer to begin" msgstr "ٹرانسفر ہونے کے لئے انتظار کررہا ہے" -msgid "Canceled" +msgid "Cancelled" msgstr " منسوخ کیا گیا" msgid "Failed" @@ -16800,7 +16800,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/vi.po --- a/po/vi.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/vi.po Mon Aug 23 01:41:31 2010 +0000 @@ -805,7 +805,7 @@ msgid "Waiting for transfer to begin" msgstr "Đợi bắt đầu truyền" -msgid "Canceled" +msgid "Cancelled" msgstr "Bị thôi" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/xh.po --- a/po/xh.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/xh.po Mon Aug 23 01:41:31 2010 +0000 @@ -843,7 +843,7 @@ msgid "Waiting for transfer to begin" msgstr "Ulindele ukuba ukudlulisa kuqalise" -msgid "Canceled" +msgid "Cancelled" msgstr "IRhoxisiwe" msgid "Failed" @@ -17192,7 +17192,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/zh_CN.po --- a/po/zh_CN.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/zh_CN.po Mon Aug 23 01:41:31 2010 +0000 @@ -777,7 +777,7 @@ msgid "Waiting for transfer to begin" msgstr "正在等待传送开始" -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed" @@ -15530,7 +15530,7 @@ #~ 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." diff -r c9a57878ed17 -r 1cdae196aac8 po/zh_HK.po --- a/po/zh_HK.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/zh_HK.po Mon Aug 23 01:41:31 2010 +0000 @@ -868,7 +868,7 @@ msgid "Waiting for transfer to begin" msgstr "等待開始傳輸檔案中..." -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed" diff -r c9a57878ed17 -r 1cdae196aac8 po/zh_TW.po --- a/po/zh_TW.po Mon Aug 23 00:53:55 2010 +0000 +++ b/po/zh_TW.po Mon Aug 23 01:41:31 2010 +0000 @@ -866,7 +866,7 @@ msgid "Waiting for transfer to begin" msgstr "等待開始傳輸檔案中..." -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed"