Bug 491709: "because the server has disabled login" is horribly bad error message. ui-r=clarkbw, r+sr=bienvenu

mail/locales/en-US/chrome/messenger/imapMsgs.properties

@@ -438,10 +438,6 @@ reduce the number of cached connections.
 # Place the word %2$S where the total number of messages should appear.
 5103=Copying Message %1$S of %2$S to %3$S
 
-## @name IMAP_LOGIN_DISABLED
-## @loc None
-5104=You cannot log in to %S because the server has disabled login. You may need to connect via SSL or TLS. Please check the account settings for your mail server.
-
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
@@ -461,3 +457,8 @@ reduce the number of cached connections.
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Delete Folder
+
+## @name IMAP_LOGIN_DISABLED
+## @loc None
+# LOCALIZATION NOTE (5109): %S is the server address
+5109=You cannot log in to %S because the server doesn't allow plaintext authentication without STARTTLS or SSL/TLS. Try enabling connection security or secure authentication in the account settings.

mailnews/imap/src/nsImapStringBundle.h

@@ -133,9 +133,9 @@ PR_END_EXTERN_C
 #define	IMAP_OUT_OF_MEMORY                          5100
 #define IMAP_AUTH_SECURE_NOTSUPPORTED               5102
 #define IMAP_COPYING_MESSAGE_OF                     5103
-#define IMAP_LOGIN_DISABLED                         5104
 #define IMAP_MOVE_FOLDER_TO_TRASH                   5105
 #define IMAP_DELETE_NO_TRASH                        5106
 #define IMAP_DELETE_FOLDER_DIALOG_TITLE             5107
 #define IMAP_DELETE_FOLDER_BUTTON_LABEL             5108
+#define IMAP_LOGIN_DISABLED                         5109
 #endif /* _nsImapStringBundle_H__ */

suite/locales/en-US/chrome/mailnews/imapMsgs.properties

@@ -438,10 +438,6 @@ reduce the number of cached connections.
 # Place the word %2$S where the total number of messages should appear.
 5103=Copying Message %1$S of %2$S to %3$S
 
-## @name IMAP_LOGIN_DISABLED
-## @loc None
-5104=You cannot log in to %S because the server has disabled login. You may need to connect via SSL or TLS. Please check the account settings for your mail server.
-
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
@@ -461,3 +457,8 @@ reduce the number of cached connections.
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Delete Folder
+
+## @name IMAP_LOGIN_DISABLED
+## @loc None
+# LOCALIZATION NOTE (5109): %S is the server address
+5109=You cannot log in to %S because the server doesn't allow plaintext authentication without STARTTLS or SSL/TLS. Try enabling connection security or secure authentication in the account settings.