# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1278624317 0
# Node ID c8cf189bf6db96f7e8fdf1428441a47c97643c82
# Parent  eeee406244da7f6fad68926e945c0ff7617f068f
jabber: This is more accurate, I think (e.g. Cyrus doesn't know what SCRAM-SHA-1 is)

diff -r eeee406244da -r c8cf189bf6db libpurple/protocols/jabber/auth_cyrus.c
--- a/libpurple/protocols/jabber/auth_cyrus.c	Thu Jul 08 02:13:38 2010 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Thu Jul 08 21:25:17 2010 +0000
@@ -36,7 +36,7 @@
 {
 	purple_connection_error_reason(purple_account_get_connection(account),
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-		_("Server requires plaintext authentication over an unencrypted stream"));
+		_("Server may require plaintext authentication over an unencrypted stream"));
 }
 
 static void start_cyrus_wrapper(JabberStream *js)
@@ -240,8 +240,9 @@
 				 * it in plaintext, see if we can turn on
 				 * plaintext auth
 				 */
+				/* XXX Should we just check for PLAIN/LOGIN being offered mechanisms? */
 				} else if (!plaintext) {
-					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+					char *msg = g_strdup_printf(_("%s may require plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 							purple_account_get_username(account));
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),