# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1270318303 0
# Node ID 6d18b6221c5e94996e8e6bef1964ab0e71d7e30f
# Parent  ba2b9a097da94236b8029fa92912f6f25276445a
Clarify an error condition I was able to duplicate reliably last night.

diff -r ba2b9a097da9 -r 6d18b6221c5e libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Sat Apr 03 16:39:02 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sat Apr 03 18:11:43 2010 +0000
@@ -1894,7 +1894,8 @@
 					break;
 				case 1213:
 					/* security lock from too many failed login attempts */
-					error_reason = g_strdup(_("Account locked: Too many failed login attempts.  Logging 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:
@@ -1903,9 +1904,16 @@
 					error = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 					break;
 				case 1214:
+					/* indicates a lock of some description */
+					error_reason = g_strdup(_("Account locked: Unknown reason.  Logging "
+								"into the Yahoo! website may fix this."));
+					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
+					break;
 				case 1236:
-					/* indicates a lock of some description */
-					error_reason = g_strdup(_("Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."));
+					/* indicates a lock due to logging in too frequently */
+					error_reason = g_strdup(_("Account locked: You have been logging in too "
+								"frequently.  Wait a few minutes before trying to connect "
+								"again.  Logging into the Yahoo! website may help."));
 					error = PURPLE_CONNECTION_ERROR_OTHER_ERROR;
 					break;
 				case 100: