--- a/libpurple/protocols/yahoo/yahoo.c Mon Jul 06 07:26:12 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c Mon Jul 06 09:07:42 2009 +0000
@@ -156,7 +156,7 @@
if (!purple_account_get_remember_password(account))
purple_account_set_password(account, NULL);
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE,
- _("You have signed on from another location."));
+ _("You have signed on from another location"));
return;
}
@@ -1793,12 +1793,12 @@
/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
purple_account_set_password(purple_connection_get_account(gc), NULL);
- error_reason = g_strdup(_("Incorrect Password"));
+ error_reason = g_strdup(_("Incorrect password"));
error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 1213:
/* security lock from too many failed login attempts */
- error_reason = g_strdup(_("Account locked: Too many failed login attempts.\nLogging into the Yahoo! website may fix this."));
+ error_reason = g_strdup(_("Account locked: Too many failed login attempts. Logging into the Yahoo! website may fix this."));
error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
break;
case 1235:
@@ -1809,7 +1809,7 @@
case 1214:
case 1236:
/* indicates a lock of some description */
- error_reason = g_strdup(_("Account locked: Unknown reason.\nLogging into the Yahoo! website may fix this."));
+ error_reason = g_strdup(_("Account locked: Unknown reason. Logging into the Yahoo! website may fix this."));
error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
break;
case 100:
@@ -2050,11 +2050,11 @@
switch (err) {
case 0:
- msg = g_strdup(_("Unknown error."));
+ msg = g_strdup(_("Unknown error"));
reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
break;
case 3:
- msg = g_strdup(_("Invalid username."));
+ msg = g_strdup(_("Username does not exist"));
reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
break;
case 13:
@@ -2076,7 +2076,7 @@
if (!purple_account_get_remember_password(account))
purple_account_set_password(account, NULL);
- msg = g_strdup(_("Incorrect password."));
+ msg = g_strdup(_("Incorrect password"));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
case 14:
@@ -2166,10 +2166,10 @@
}
decoded_group = yahoo_string_decode(gc, group, FALSE);
- buf = g_strdup_printf(_("Could not add buddy %s to group %s to the server list on account %s."),
+ buf = g_strdup_printf(_("Unable to add buddy %s to group %s to the server list on account %s."),
who, decoded_group, purple_connection_get_display_name(gc));
if (!purple_conv_present_error(who, purple_connection_get_account(gc), buf))
- purple_notify_error(gc, NULL, _("Could not add buddy to server list"), buf);
+ purple_notify_error(gc, NULL, _("Unable to add buddy to server list"), buf);
g_free(buf);
g_free(decoded_group);
g_free(who);
@@ -2928,14 +2928,14 @@
/* No worries */
return;
- tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+ tmp = g_strdup_printf(_("Lost connection with server: %s"),
g_strerror(errno));
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
return;
} else if (len == 0) {
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Server closed the connection."));
+ _("Server closed the connection"));
return;
}
gc->last_received = time(NULL);
@@ -3017,8 +3017,7 @@
if (source < 0) {
gchar *tmp;
- tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
- error_message);
+ tmp = g_strdup_printf(_("Unable to connect: %s"), error_message);
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
return;
@@ -3044,8 +3043,7 @@
if (source < 0) {
gchar *tmp;
- tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"),
- error_message);
+ tmp = g_strdup_printf(_("Unable to connect: %s"), error_message);
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
return;
@@ -3084,14 +3082,14 @@
/* No worries */
return;
- tmp = g_strdup_printf(_("Lost connection with server:\n%s"),
+ tmp = g_strdup_printf(_("Lost connection with server: %s"),
g_strerror(errno));
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
return;
} else if (len == 0) {
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Server closed the connection."));
+ _("Server closed the connection"));
return;
}
@@ -3107,7 +3105,7 @@
if ((strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302")) &&
strncmp(buf, "HTTP/1.1 302", strlen("HTTP/1.1 302")))) {
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Received unexpected HTTP response from server."));
+ _("Received unexpected HTTP response from server"));
purple_debug_misc("yahoo", "Unexpected HTTP response: %s\n", buf);
return;
}
@@ -3137,7 +3135,7 @@
purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
yahoo_got_web_connected, gc) == NULL) {
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Connection problem"));
+ _("Unable to connect"));
return;
}
}
@@ -3163,7 +3161,7 @@
if (gc->inpa)
purple_input_remove(gc->inpa);
gc->inpa = 0;
- tmp = g_strdup_printf(_("Lost connection with %s:\n%s"),
+ tmp = g_strdup_printf(_("Lost connection with %s: %s"),
"login.yahoo.com:80", g_strerror(errno));
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
@@ -3188,7 +3186,7 @@
if (source < 0) {
gchar *tmp;
- tmp = g_strdup_printf(_("Could not establish a connection with %s:\n%s"),
+ tmp = g_strdup_printf(_("Unable to establish a connection with %s: %s"),
"login.yahoo.com:80", error_message);
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
g_free(tmp);
@@ -3325,7 +3323,7 @@
yd->auth = g_string_free(url, FALSE);
if (purple_proxy_connect(gc, account, "login.yahoo.com", 80, yahoo_got_cookies, gc) == NULL) {
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Connection problem"));
+ _("Unable to connect"));
return;
}
@@ -3436,7 +3434,7 @@
yahoo_got_connected, gc) == NULL)
{
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Connection problem"));
+ _("Unable to connect"));
return;
}
} else {
@@ -3447,7 +3445,7 @@
yahoo_got_connected, gc) == NULL)
{
purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
- _("Connection problem"));
+ _("Unable to connect"));
return;
}
}