comparison pidgin/gtkft.c @ 30865:1cdae196aac8

Standardize on "cancelled". QuLogic: so, canceled or cancelled? that patch on #12130 is pretty thorough... wabz: cancelled :D wabz: that cancelled thing actually bothered me in the past wabz: never quite enough to do such a patch :p elb: that's an en_US vs en_GB thing elb: both are correct, but canceled is more common in en_{US,CA} and cancelled in en_{GB,AU,NZ,etc.} elb: personally, I use cancelled QuLogic: yea, that's what I went for before, but I think I couldn't change any strings because we were frozen QuLogic: you all had to pick the spelling that was opposite from the guy's patch, didn't you... rekkanoryo: well, considering we're generally en_US in our strings, it should be canceled in our source elb: considering they're both correct, and while I'm anal retentive, I'm not anal retentive about that, I have no preference ;-) rekkanoryo: I don't really care either way, I just think that we should be consistently en_US or en_GB throughout elb: right elb: my point is, they're both correct for en_US elb: one 'l' is simply more common rekkanoryo: ah rekkanoryo: if they're both technically correct for en_US, then "cancelled" is my vote rekkanoryo: one 'l' always looks wrong to me elb: the dictionary claims they are Sorry, dwc. Closes #12130.

30864:c9a57878ed17

	if (time_remaining != NULL) {
		if (purple_xfer_is_completed(xfer)) {
			*time_remaining = g_strdup(_("Finished"));
		}
		else if (purple_xfer_is_canceled(xfer)) {
			*time_remaining = g_strdup(_("Canceled"));
		}
		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
			*time_remaining = g_strdup(_("Unknown"));
		}
		else if (kb_sent <= 0) {

	pixbuf = gtk_widget_render_icon(dialog->window,
									PIDGIN_STOCK_FILE_CANCELED,
									GTK_ICON_SIZE_MENU, NULL);

	if (purple_xfer_is_canceled(xfer))
		status = _("Canceled");
	else
		status = _("Failed");

	gtk_list_store_set(dialog->model, &data->iter,
	                   COLUMN_STATUS, pixbuf,

30865:1cdae196aac8

	if (time_remaining != NULL) {
		if (purple_xfer_is_completed(xfer)) {
			*time_remaining = g_strdup(_("Finished"));
		}
		else if (purple_xfer_is_canceled(xfer)) {
			*time_remaining = g_strdup(_("Cancelled"));
		}
		else if (purple_xfer_get_size(xfer) == 0 || (kb_sent > 0 && kbps == 0)) {
			*time_remaining = g_strdup(_("Unknown"));
		}
		else if (kb_sent <= 0) {

	pixbuf = gtk_widget_render_icon(dialog->window,
									PIDGIN_STOCK_FILE_CANCELED,
									GTK_ICON_SIZE_MENU, NULL);

	if (purple_xfer_is_canceled(xfer))
		status = _("Cancelled");
	else
		status = _("Failed");

	gtk_list_store_set(dialog->model, &data->iter,
	                   COLUMN_STATUS, pixbuf,