Bug 1148888 - Message string for SMTP server connection error is incorrect. File: composeMsgs.properties, key: smtpAuthNotSupported. r=IanN a=Ratty for SeaMonkey CLOSED TREE

mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties

@@ -104,8 +104,8 @@ smtpAuthGssapi=The Kerberos/GSSAPI ticket was not accepted by the Outgoing serve
 # LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
 smtpAuthMechNotSupported=The Outgoing server (SMTP) %S does not support the selected authentication method. Please change the 'Authentication method' in 'Account Settings | Outgoing Server (SMTP)'.
 
-# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
-smtpAuthNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (Outgoing server (SMTP)-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
+# LOCALIZATION NOTE (smtpAuthenticationNotSupported): %S is the server hostname
+smtpAuthenticationNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in the 'Account Settings | Outgoing Server (SMTP)' or contact your email service provider for instructions.
 
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.

mailnews/compose/src/nsComposeStrings.cpp

@@ -99,7 +99,7 @@ const char16_t* errorStringNameForErrorCode(nsresult aCode)
     case NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED:
       return MOZ_UTF16("smtpAuthMechNotSupported");
     case NS_ERROR_SMTP_AUTH_NOT_SUPPORTED:
-      return MOZ_UTF16("smtpAuthNotSupported");
+      return MOZ_UTF16("smtpAuthenticationNotSupported");
     case NS_ERROR_ILLEGAL_LOCALPART:
       return MOZ_UTF16("illegalLocalPart");
     default:

suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties

@@ -104,8 +104,8 @@ smtpAuthGssapi=The Kerberos/GSSAPI ticket was not accepted by the Outgoing serve
 # LOCALIZATION NOTE (smtpAuthMechNotSupported): %S is the server hostname
 smtpAuthMechNotSupported=The Outgoing server (SMTP) %S does not support the selected authentication method. Please change the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
 
-# LOCALIZATION NOTE (smtpAuthNotSupported): %S is the server hostname
-smtpAuthNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (Outgoing server (SMTP)-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in 'Account Settings | Outgoing server (SMTP)' or contact your email service provider for instructions.
+# LOCALIZATION NOTE (smtpAuthenticationNotSupported): %S is the server hostname
+smtpAuthenticationNotSupported=Unable to authenticate to Outgoing server (SMTP) %S. It does not support authentication (SMTP-AUTH) but you have chosen to use authentication. Please change the 'Authentication method' to 'None' in 'Account Settings | Outgoing server (SMTP)' or contact your email service provider for instructions.
 
 # LOCALIZATION NOTE (errorIllegalLocalPart): %s is an email address with an illegal localpart
 errorIllegalLocalPart=There are non-ASCII characters in the local part of the recipient address %s. This is not yet supported. Please change this address and try again.