Mercurial > pidgin
changeset 27279:fe242dec0d50
merge of '3fe037ee4d003527c8f4f41974e01680d5eea27e'
and 'c75c4072b910c269873d22b25bb5639d85bb1b9b'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 04 Jul 2009 01:07:26 +0000 |
parents | 33734bb78c9f (current diff) 979031db48c1 (diff) |
children | 660cf341992f |
files | |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sat Jul 04 00:59:44 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jul 04 01:07:26 2009 +0000 @@ -1882,7 +1882,7 @@ switch (info->errorcode) { case 0x01: /* Unregistered username */ - purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Invalid username.")); + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_INVALID_USERNAME, _("Username does not exist")); break; case 0x05: /* Incorrect password */ @@ -1917,7 +1917,7 @@ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, _("You have been connecting and disconnecting too frequently. Wait a minute and try again. If you continue to try, you will need to wait even longer.")); break; default: - purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Authentication failed")); + purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Unknown reason")); break; } purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);