merge of '695baad2c457cdae36d14dc835dcf76972ba5b24'

Sat, 04 Jul 2009 01:07:26 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Sat, 04 Jul 2009 01:07:26 +0000
changeset 27517
9a2385174d89
parent 27515
695baad2c457 (current diff)
parent 27514
e61c71ea635b (diff)
child 27518
cd2b24154a2b

merge of '695baad2c457cdae36d14dc835dcf76972ba5b24'
and 'e61c71ea635b54d0527259622db329b2bc018f19'

--- 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);

mercurial