# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1246669646 0
# Node ID fe242dec0d50e597d0598855a3403e83db97fb93
# Parent  33734bb78c9fa0bd10cf4efea8443cb6a41545b0# Parent  979031db48c1460c1c64dc1a4ec8b9760d0c95ec
merge of '3fe037ee4d003527c8f4f41974e01680d5eea27e'
     and 'c75c4072b910c269873d22b25bb5639d85bb1b9b'

diff -r 33734bb78c9f -r fe242dec0d50 libpurple/protocols/oscar/oscar.c
--- 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);