Mercurial > pidgin.yaz
changeset 10816:c94f40ffcafb
[gaim-migrate @ 12471]
rlaager reverted objectionable spacing changes
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Mon, 11 Apr 2005 15:26:51 +0000 |
| parents | 65c818fb218e |
| children | 80e4354d118c |
| files | src/connection.c src/gtkdialogs.c src/protocols/gg/gg.c src/protocols/irc/msgs.c src/protocols/msn/notification.c src/protocols/napster/napster.c src/protocols/oscar/oscar.c src/protocols/rendezvous/rendezvous.c src/protocols/toc/toc.c |
| diffstat | 9 files changed, 54 insertions(+), 54 deletions(-) [+] |
line wrap: on
line diff
--- a/src/connection.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/connection.c Mon Apr 11 15:26:51 2005 +0000 @@ -130,7 +130,7 @@ if (regist) { - gaim_debug_info("connection", "Registering. gc = %p\n", gc); + gaim_debug_info("connection", "Registering. gc = %p\n", gc); /* set this so we don't auto-reconnect after registering */ gc->wants_to_die = TRUE;
--- a/src/gtkdialogs.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/gtkdialogs.c Mon Apr 11 15:26:51 2005 +0000 @@ -556,7 +556,7 @@ "<span weight=\"bold\" size=\"large\" foreground=\"#1f6bad\">Pimpin\' Penguin Style! *Waddle Waddle*</span>"); else if (!strcmp(norm, "flynorange")) gtk_label_set_markup(GTK_LABEL(label), - "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me. I'm so cute!</span>"); + "<span weight=\"bold\" size=\"large\" foreground=\"blue\">You should be me. I'm so cute!</span>"); else if (!strcmp(norm, "ewarmenhoven")) gtk_label_set_markup(GTK_LABEL(label), "<span weight=\"bold\" size=\"large\" foreground=\"orange\">Now that's what I like!</span>"); @@ -571,7 +571,7 @@ "<span weight=\"bold\" size=\"large\" foreground=\"red\">This sunflower seed taste like pizza.</span>"); else if (!strcmp(norm, "markdoliner")) gtk_label_set_markup(GTK_LABEL(label), - "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey! I was in that tumbleweed!</span>"); + "<span weight=\"bold\" size=\"large\" foreground=\"#6364B1\">Hey! I was in that tumbleweed!</span>"); else if (!strcmp(norm, "lschiere")) gtk_label_set_markup(GTK_LABEL(label), "<span weight=\"bold\" size=\"large\" foreground=\"gray\">I'm not anything.</span>"); @@ -886,10 +886,10 @@ text = g_strdup_printf( ngettext( "You are about to remove the contact containing %s " - "and %d other buddy from your buddy list. Do you " + "and %d other buddy from your buddy list. Do you " "want to continue?", "You are about to remove the contact containing %s " - "and %d other buddies from your buddy list. Do you " + "and %d other buddies from your buddy list. Do you " "want to continue?", contact->totalsize - 1), buddy->name, contact->totalsize - 1); @@ -952,7 +952,7 @@ g_return_if_fail(group != NULL); - text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), + text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"), group->name); gaim_request_action(group, NULL, _("Remove Group"), text, 0, group, 2, @@ -994,7 +994,7 @@ g_return_if_fail(buddy != NULL); - text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), + text = g_strdup_printf(_("You are about to remove %s from your buddy list. Do you want to continue?"), buddy->name); gaim_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2, @@ -1031,7 +1031,7 @@ gaim_gtkdialogs_remove_chat(GaimChat *chat) { const gchar *name = gaim_chat_get_name(chat); - gchar *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list. Do you want to continue?"), name); + gchar *text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list. Do you want to continue?"), name); g_return_if_fail(chat != NULL);
--- a/src/protocols/gg/gg.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/gg/gg.c Mon Apr 11 15:26:51 2005 +0000 @@ -1,6 +1,6 @@ /* * gaim - Gadu-Gadu Protocol Plugin - * $Id: gg.c 12465 2005-04-11 04:32:26Z lschiere $ + * $Id: gg.c 12471 2005-04-11 15:26:51Z lschiere $ * * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> * @@ -1346,7 +1346,7 @@ _("Error communicating with Gadu-Gadu server"), _("Gaim was unable to complete your request due " "to a problem communicating with the Gadu-Gadu " - "HTTP server. Please try again later.")); + "HTTP server. Please try again later.")); return; } @@ -1375,7 +1375,7 @@ gaim_notify_error(gc, NULL, _("Unable to import Gadu-Gadu buddy list"), _("Gaim was unable to connect to the Gadu-Gadu " - "buddy list server. Please try again later.")); + "buddy list server. Please try again later.")); g_free(hi->request); g_free(hi); return; @@ -1449,7 +1449,7 @@ gaim_notify_error(gc, NULL, _("Couldn't export buddy list"), _("Gaim was unable to connect to the buddy " - "list server. Please try again later.")); + "list server. Please try again later.")); g_free(he->request); g_free(he); return; @@ -1472,7 +1472,7 @@ gaim_notify_error(gc, NULL, _("Unable to delete Gadu-Gadu buddy list"), _("Gaim was unable to connect to the buddy " - "list server. Please try again later.")); + "list server. Please try again later.")); g_free(he->request); g_free(he); return; @@ -1524,7 +1524,7 @@ _("Unable to access directory"), _("Gaim was unable to search the Directory " "because it was unable to connect to the " - "directory server. Please try again later.")); + "directory server. Please try again later.")); g_free(srch->request); g_free(srch); return; @@ -1559,7 +1559,7 @@ _("Unable to change Gadu-Gadu password"), _("Gaim was unable to change your password " "due to an error connecting to the " - "Gadu-Gadu server. Please try again " + "Gadu-Gadu server. Please try again " "later.")); g_free(hpass->request); g_free(hpass); @@ -1626,7 +1626,7 @@ _("Unable to access user profile."), _("Gaim was unable to access this user's " "profile due to an error connecting to the " - "directory server. Please try again later.")); + "directory server. Please try again later.")); g_free(srch->request); g_free(srch); return;
--- a/src/protocols/irc/msgs.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/irc/msgs.c Mon Apr 11 15:26:51 2005 +0000 @@ -783,7 +783,7 @@ void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args) { gaim_connection_error(gaim_account_get_connection(irc->account), - _("Your selected account name was rejected by the server. It probably contains invalid characters.")); + _("Your selected account name was rejected by the server. It probably contains invalid characters.")); } void irc_msg_nickused(struct irc_conn *irc, const char *name, const char *from, char **args)
--- a/src/protocols/msn/notification.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/msn/notification.c Mon Apr 11 15:26:51 2005 +0000 @@ -1263,13 +1263,13 @@ g_snprintf(buf, sizeof(buf), ngettext( "The MSN server will shut down for maintenance " "in %d minute. You will automatically be " - "signed out at that time. Please finish any " + "signed out at that time. Please finish any " "conversations in progress.\n\nAfter the " "maintenance has been completed, you will be " "able to successfully sign in.", "The MSN server will shut down for maintenance " "in %d minutes. You will automatically be " - "signed out at that time. Please finish any " + "signed out at that time. Please finish any " "conversations in progress.\n\nAfter the " "maintenance has been completed, you will be " "able to successfully sign in.", minutes),
--- a/src/protocols/napster/napster.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/napster/napster.c Mon Apr 11 15:26:51 2005 +0000 @@ -252,7 +252,7 @@ int tmp = read(source, buf + i, len - i); if (tmp <= 0) { g_free(buf); - buf = g_strdup_printf(_("Unable to read message from server: %s. Command is %hd, length is %hd."), strerror(errno), len, command); + buf = g_strdup_printf(_("Unable to read message from server: %s. Command is %hd, length is %hd."), strerror(errno), len, command); gaim_connection_error(gc, buf); g_free(buf); return;
--- a/src/protocols/oscar/oscar.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/oscar/oscar.c Mon Apr 11 15:26:51 2005 +0000 @@ -403,7 +403,7 @@ if (utf8 == NULL) { if (textlen != 0 && *text != '\0' && !g_utf8_validate(text, textlen, NULL)) - utf8 = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); + utf8 = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); else utf8 = g_strndup(text, textlen); } @@ -486,7 +486,7 @@ if (ret == NULL) ret = gaim_plugin_oscar_convert_to_utf8(data, datalen, charsetstr2, TRUE); if (ret == NULL) - ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); + ret = g_strdup(_("(There was an error receiving this message. The buddy you are speaking to most likely has a buggy client.)")); return ret; } @@ -1573,7 +1573,7 @@ gaim_request_action(gc, NULL, buf, _("Because this reveals your IP address, it " - "may be considered a privacy risk. Do you " + "may be considered a privacy risk. Do you " "wish to continue?"), 0, data, 2, _("Connect"), G_CALLBACK(oscar_direct_im), @@ -1629,8 +1629,8 @@ if ((conn->type == AIM_CONN_TYPE_BOS) || !(aim_getconn_type(od->sess, AIM_CONN_TYPE_BOS))) { - gaim_debug_error("oscar", "Major connection error. " - "Invalid data was received on the oscar TCP stream\n"); + gaim_debug_error("oscar", "Major connection error. i.e. " + "invalid data was received on the oscar TCP stream\n"); gaim_connection_error(gc, _("Disconnected.")); } else if (conn->type == AIM_CONN_TYPE_CHAT) { struct chat_connection *cc = find_oscar_chat_by_conn(gc, conn); @@ -1768,7 +1768,7 @@ if (!aim_snvalid(gaim_account_get_username(account))) { gchar *buf; - buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), gaim_account_get_username(account)); + buf = g_strdup_printf(_("Unable to login: Could not sign on as %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), gaim_account_get_username(account)); gaim_connection_error(gc, buf); g_free(buf); } @@ -2433,7 +2433,7 @@ } if (in != '\n') { char buf[256]; - g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " + g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " "this is fixed. Check %s for updates."), GAIM_WEBSITE); gaim_notify_warning(pos->gc, NULL, _("Gaim was unable to get a valid AIM login hash."), @@ -2552,8 +2552,8 @@ if (pos->modname) g_free(pos->modname); g_free(pos); - g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " - "this is fixed. Check %s for updates."), GAIM_WEBSITE); + g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " + "this is fixed. Check %s for updates."), GAIM_WEBSITE); gaim_notify_warning(pos->gc, NULL, _("Gaim was unable to get a valid login hash."), buf); @@ -3495,7 +3495,7 @@ "information.\n", userinfo->sn); if (args->proxyip) gaim_debug_warning("oscar", - "IP for a proxy server was given. Gaim " + "IP for a proxy server was given. Gaim " "does not support this yet.\n"); g_free(message); return 1; @@ -3614,7 +3614,7 @@ gaim_request_action(gc, NULL, buf, _("This requires a direct connection between " "the two computers and is necessary for IM " - "Images. Because your IP address will be " + "Images. Because your IP address will be " "revealed, this may be considered a privacy " "risk."), GAIM_DEFAULT_ACTION_NONE, d, 2, @@ -3690,7 +3690,7 @@ else nombre = NULL; - dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list. Do you want to send an authorization request?"), (nombre ? nombre : name)); + dialog_msg = g_strdup_printf(_("The user %s requires authorization before being added to a buddy list. Do you want to send an authorization request?"), (nombre ? nombre : name)); data->gc = gc; data->name = g_strdup(name); data->nick = NULL; @@ -4102,7 +4102,7 @@ default: { gaim_debug_warning("oscar", "Received an unknown rendezvous client auto-response " - "from %s. Type 0x%04hx\n", who, reason); + "from %s. Type 0x%04hx\n", who, reason); } } @@ -4134,7 +4134,7 @@ default: { gaim_debug_warning("oscar", - "Received an unknown client auto-response from %s. " + "Received an unknown client auto-response from %s. " "Type 0x%04hx\n", who, reason); } break; } /* end of switch */ @@ -4258,7 +4258,7 @@ } break; default: { - gaim_debug_error("oscar", "Received unknown typing notification message from %s. Type1 is 0x%04x and type2 is 0x%04hx.\n", sn, type1, type2); + gaim_debug_error("oscar", "Received unknown typing notification message from %s. Type1 is 0x%04x and type2 is 0x%04hx.\n", sn, type1, type2); } break; } @@ -4869,7 +4869,7 @@ msg = va_arg(ap, char *); va_end(ap); - gaim_debug_info("oscar", "Disconnected. Code is 0x%04x and msg is %s\n", + gaim_debug_info("oscar", "Disconnected. Code is 0x%04x and msg is %s\n", code, (msg != NULL ? msg : "")); g_return_val_if_fail(fr != NULL, 1); @@ -5103,7 +5103,7 @@ va_end(ap); gaim_debug_info("oscar", - "Received offline message. Converting to channel 4 ICBM...\n"); + "Received offline message. Converting to channel 4 ICBM...\n"); args.uin = msg->sender; args.type = msg->type; args.flags = msg->flags; @@ -5661,7 +5661,7 @@ if (od->rights.maxsiglen == 0) gaim_notify_warning(gc, NULL, _("Unable to set AIM profile."), _("You have probably requested to set your " - "profile before the login procedure completed. " + "profile before the login procedure completed. " "Your profile remains unset; try setting it " "again when you are fully connected.")); @@ -5688,9 +5688,9 @@ if (msglen > od->rights.maxsiglen) { gchar *errstr; errstr = g_strdup_printf(ngettext("The maximum profile length of %d byte " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. Gaim has truncated it for you.", "The maximum profile length of %d bytes " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. Gaim has truncated it for you.", od->rights.maxsiglen), od->rights.maxsiglen); gaim_notify_warning(gc, NULL, _("Profile too long."), errstr); g_free(errstr); @@ -5725,7 +5725,7 @@ gaim_notify_warning(gc, NULL, _("Unable to set AIM away message."), _("You have probably requested to set your " "away message before the login procedure " - "completed. You remain in a \"present\" " + "completed. You remain in a \"present\" " "state; try setting it again when you are " "fully connected.")); return; @@ -5771,9 +5771,9 @@ gchar *errstr; errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. Gaim has truncated it for you.", "The maximum away message length of %d bytes " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. Gaim has truncated it for you.", od->rights.maxawaymsglen), od->rights.maxawaymsglen); gaim_notify_warning(gc, NULL, _("Away message too long."), errstr); g_free(errstr); @@ -5873,7 +5873,7 @@ if (!aim_snvalid(buddy->name)) { gchar *buf; - buf = g_strdup_printf(_("Could not add the buddy %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), buddy->name); + buf = g_strdup_printf(_("Could not add the buddy %s because the screen name is invalid. Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."), buddy->name); if (!gaim_conv_present_error(buddy->name, gaim_connection_get_account(gc), buf)) gaim_notify_error(gc, NULL, _("Unable To Add"), buf); g_free(buf); @@ -6038,7 +6038,7 @@ if (reason == 0x0005) { gaim_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"), - _("Gaim was temporarily unable to retrieve your buddy list from the AIM servers. Your buddy list is not lost, and will probably become available in a few hours.")); + _("Gaim was temporarily unable to retrieve your buddy list from the AIM servers. Your buddy list is not lost, and will probably become available in a few hours.")); od->getblisttimer = gaim_timeout_add(300000, gaim_ssi_rerequestdata, od->sess); } @@ -6109,7 +6109,7 @@ "ssi: syncing local list and server list\n"); if ((timestamp == 0) || (numitems == 0)) { - gaim_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.", NULL); + gaim_debug_info("oscar", "Got AIM SSI with a 0 timestamp or 0 numitems--not syncing. This probably means your buddy list is empty.", NULL); return 1; } @@ -6329,7 +6329,7 @@ case 0x000c: { /* you are over the limit, the cheat is to the limit, come on fhqwhgads */ gchar *buf; - buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)"))); + buf = g_strdup_printf(_("Could not add the buddy %s because you have too many buddies in your buddy list. Please remove one and try again."), (retval->name ? retval->name : _("(no name)"))); if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf)) gaim_notify_error(gc, NULL, _("Unable To Add"), buf); g_free(buf); @@ -6343,7 +6343,7 @@ default: { /* La la la */ gchar *buf; gaim_debug_error("oscar", "ssi: Action 0x%04hx was unsuccessful with error 0x%04hx\n", retval->action, retval->ack); - buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."), (retval->name ? retval->name : _("(no name)"))); + buf = g_strdup_printf(_("Could not add the buddy %s for an unknown reason. The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."), (retval->name ? retval->name : _("(no name)"))); if ((retval->name != NULL) && !gaim_conv_present_error(retval->name, gaim_connection_get_account(gc), buf)) gaim_notify_error(gc, NULL, _("Unable To Add"), buf); g_free(buf); @@ -6426,7 +6426,7 @@ else nombre = g_strdup(sn); - dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list. Do you want to add them?"), nombre); + dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list. Do you want to add them?"), nombre); data = g_new(struct name_data, 1); data->gc = gc; data->name = g_strdup(sn); @@ -6497,7 +6497,7 @@ va_end(ap); gaim_debug_info("oscar", - "ssi: received authorization reply from %s. Reply is 0x%04hhx\n", sn, reply); + "ssi: received authorization reply from %s. Reply is 0x%04hhx\n", sn, reply); buddy = gaim_find_buddy(gc->account, sn); if (buddy && (gaim_buddy_get_alias_only(buddy)))
--- a/src/protocols/rendezvous/rendezvous.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/rendezvous/rendezvous.c Mon Apr 11 15:26:51 2005 +0000 @@ -831,7 +831,7 @@ prpl_info.set_status = rendezvous_prpl_set_status; if (gethostname(hostname, 255) != 0) { - gaim_debug_warning("rendezvous", "Error %d when getting host name. Using \"localhost.\"\n", errno); + gaim_debug_warning("rendezvous", "Error %d when getting host name. Using \"localhost.\"\n", errno); strcpy(hostname, "localhost"); }
--- a/src/protocols/toc/toc.c Mon Apr 11 15:00:30 2005 +0000 +++ b/src/protocols/toc/toc.c Mon Apr 11 15:26:51 2005 +0000 @@ -549,12 +549,12 @@ g_snprintf(buf, sizeof(buf), _("Your warning level is currently too high to log in.")); break; case 983: - g_snprintf(buf, sizeof(buf), _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); + g_snprintf(buf, sizeof(buf), _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer.")); break; g_snprintf(buf, sizeof(buf), _("An unknown signon error has occurred: %s."), w); break; default: - g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occurred. Info: %s"), no, w); + g_snprintf(buf, sizeof(buf), _("An unknown error, %d, has occurred. Info: %s"), no, w); } return buf; @@ -2059,7 +2059,7 @@ g_snprintf(hdr->name, 64, "listing.txt"); if (write(src, hdr, 256) < 0) { gaim_notify_error(ft->gc, NULL, - _("Could not write file header. The file will " + _("Could not write file header. The file will " "not be transferred."), NULL); fclose(ft->file); g_free(ft->filename);