Changed and new strings need IDs never used before. Bug 555164, requestedby=sipaq, r=bienvenu, sr=standard8
authorBen Bucksch <ben.bucksch@beonex.com>
Thu, 01 Apr 2010 00:40:19 +0200
changeset 5339 0ebd348108ed
parent 5338 b42a5d2e6c5b
child 5340 34bf573fdf62
push id4115
push usermozilla.BenB@bucksch.org
push dateWed, 31 Mar 2010 22:40:11 +0000
treeherdercomm-central@0ebd348108ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbienvenu, standard8
bugs555164
Changed and new strings need IDs never used before. Bug 555164, requestedby=sipaq, r=bienvenu, sr=standard8
mail/locales/en-US/chrome/messenger/imapMsgs.properties
mail/locales/en-US/chrome/messenger/localMsgs.properties
mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
mailnews/compose/src/nsComposeStrings.h
mailnews/imap/src/nsImapStringBundle.h
mailnews/local/src/nsLocalStrings.h
suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
suite/locales/en-US/chrome/mailnews/imapMsgs.properties
suite/locales/en-US/chrome/mailnews/localMsgs.properties
--- a/mail/locales/en-US/chrome/messenger/imapMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/imapMsgs.properties
@@ -362,39 +362,24 @@ 5096=This server does not support quotas
 ## @loc None
 5097=There are no storage quotas on this folder.
 
 # Out of memory
 ## @name IMAP_OUT_OF_MEMORY
 ## @loc None
 5100=Application is out of memory.
 
-## @name IMAP_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-# LOCALIZATION NOTE (5101): %S is the server hostname
-5101=The IMAP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
-
-## @name IMAP_AUTH_MECH_FAILED
-## @loc None
-# LOCALIZATION NOTE (5102): %S is the server hostname
-5102=All login mechanisms for %S failed. Please check the password or change the 'Authentication method' in the 'Account Settings | Server settings'.
-
 ## @name IMAP_COPYING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # 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_AUTH_GSSAPI_FAILED
-## @loc None
-# LOCALIZATION NOTE (5104): %S is the server hostname
-5104=The Kerberos/GSSAPI ticket was not accepted by the IMAP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
 # "%S" is the the name of the folder.
 5105=Are you sure you want to delete the folder '%S'?
 
 ## @name IMAP_DELETE_NO_TRASH
 ## @loc None
@@ -405,22 +390,37 @@ 5106=Deleting this folder is not undoabl
 ## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
 ## @loc None
 5107=Delete Folder
 
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Delete Folder
 
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-# LOCALIZATION NOTE (5109): %S is the server hostname
-5109=The IMAP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
-
 ## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
 ## @loc None
 # LOCALIZATION NOTE (5110): %S is the server hostname
 5110=The IMAP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
 ## @loc None
 # LOCALIZATION NOTE (5111): %S is the server hostname
 5111=The IMAP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+## @loc None
+# LOCALIZATION NOTE (5112): %S is the server hostname
+5112=The IMAP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+## @name IMAP_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+# LOCALIZATION NOTE (5113): %S is the server hostname
+5113=The IMAP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_MECH_FAILED
+## @loc None
+# LOCALIZATION NOTE (5114): %S is the server hostname
+5114=All login mechanisms for %S failed. Please check the password or change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_GSSAPI_FAILED
+## @loc None
+# LOCALIZATION NOTE (5115): %S is the server hostname
+5115=The Kerberos/GSSAPI ticket was not accepted by the IMAP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/mail/locales/en-US/chrome/messenger/localMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/localMsgs.properties
@@ -160,26 +160,16 @@ 4027=Copying %S of %S messages to %S
 ## @loc None
 4028=Moving %S of %S messages to %S
 
 # Status - write error occurred
 ## @name POP3_MESSAGE_FOLDER_BUSY
 ## @loc None
 4029=This folder is being processed. Please wait until processing is complete to get messages.
 
-# Authentication server caps and pref don't match
-## @name POP3_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-4030=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
-
-# Status - Could not log in to GSSAPI, and it was the only method
-## @name POP3_GSSAPI_FAILURE
-## @loc None
-4031=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
 ## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
 ## @loc None
 4033=Unable to open mail spool file %S.
 
 ## @name MOVEMAIL_CANT_CREATE_LOCK
 ## @loc None
 4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
 
@@ -245,8 +235,18 @@ 4048=This POP3 server does not seem to s
 
 ## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
 ## @loc None
 4049=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
 ## @loc None
 4050=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Authentication server caps and pref don't match
+## @name POP3_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+4051=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Status - Could not log in to GSSAPI, and it was the only method
+## @name POP3_GSSAPI_FAILURE
+## @loc None
+4052=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/locales/en-US/chrome/messenger/messengercompose/composeMsgs.properties
@@ -203,28 +203,16 @@ 12570=There was an error attaching %S. P
 12571=There was an error copying the message to the Sent folder. Retry?
 
 ## @name NS_ERROR_SMTP_GREETING
 12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
 
 ## @name NS_ERROR_SENDING_RCPT_COMMAND
 12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
 
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-12576=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-12579=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-12580=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-12581=Unable to authenticate to SMTP server %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.
-
 ## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
 12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
 
 ## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
 12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
 
 ## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
 12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
@@ -246,24 +234,43 @@ 12591=The message could not be sent beca
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
 12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
 12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+# LOCALIZATION NOTE (12594): $S is server hostname
 12594=The SMTP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
+# LOCALIZATION NOTE (12595): $S is server hostname
 12595=The SMTP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
+# LOCALIZATION NOTE (12596): $S is server hostname
 12596=The SMTP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
 
+## @name NS_ERROR_SMTP_AUTH_FAILURE
+# LOCALIZATION NOTE (12597): $S is server hostname
+12597=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_GSSAPI
+# LOCALIZATION NOTE (12598): $S is server hostname
+12598=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
+
+## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12599): $S is server hostname
+12599=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12600): $S is server hostname
+12600=Unable to authenticate to SMTP server %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.
+
 
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
 saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
--- a/mailnews/compose/src/nsComposeStrings.h
+++ b/mailnews/compose/src/nsComposeStrings.h
@@ -69,31 +69,30 @@
 
 #define NS_MSG_ERROR_ATTACHING_FILE                 NS_MSG_GENERATE_FAILURE(12570)
 #define NS_MSG_ERROR_DOING_FCC                      12571
 
 #define NS_ERROR_SMTP_GREETING                      NS_MSG_GENERATE_FAILURE(12572)
 
 #define NS_ERROR_SENDING_RCPT_COMMAND               NS_MSG_GENERATE_FAILURE(12575)
 
-#define NS_ERROR_SMTP_AUTH_FAILURE                  NS_MSG_GENERATE_FAILURE(12576)
-#define NS_ERROR_SMTP_AUTH_GSSAPI                   NS_MSG_GENERATE_FAILURE(12579)
-#define NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED       NS_MSG_GENERATE_FAILURE(12580)
-#define NS_ERROR_SMTP_AUTH_NOT_SUPPORTED            NS_MSG_GENERATE_FAILURE(12581)
-
 #define NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS      NS_MSG_GENERATE_FAILURE(12582)
 
 #define NS_ERROR_SMTP_PASSWORD_UNDEFINED            NS_MSG_GENERATE_FAILURE(12584)
 #define NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED            NS_MSG_GENERATE_FAILURE(12586)
 #define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_1          NS_MSG_GENERATE_FAILURE(12587)
 #define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2          NS_MSG_GENERATE_FAILURE(12588)
 
 #define NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_SERVER    NS_MSG_GENERATE_FAILURE(12589)
 #define NS_ERROR_SMTP_SEND_FAILED_REFUSED           NS_MSG_GENERATE_FAILURE(12590)
 #define NS_ERROR_SMTP_SEND_FAILED_INTERRUPTED       NS_MSG_GENERATE_FAILURE(12591)
 #define NS_ERROR_SMTP_SEND_FAILED_TIMEOUT           NS_MSG_GENERATE_FAILURE(12592)
 #define NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON    NS_MSG_GENERATE_FAILURE(12593)
 
 #define NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL  NS_MSG_GENERATE_FAILURE(12594)
 #define NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL     NS_MSG_GENERATE_FAILURE(12595)
 #define NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT         NS_MSG_GENERATE_FAILURE(12596)
+#define NS_ERROR_SMTP_AUTH_FAILURE                  NS_MSG_GENERATE_FAILURE(12597)
+#define NS_ERROR_SMTP_AUTH_GSSAPI                   NS_MSG_GENERATE_FAILURE(12598)
+#define NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED       NS_MSG_GENERATE_FAILURE(12599)
+#define NS_ERROR_SMTP_AUTH_NOT_SUPPORTED            NS_MSG_GENERATE_FAILURE(12600)
 
 #endif /* _nsComposeStrings_H__ */
--- a/mailnews/imap/src/nsImapStringBundle.h
+++ b/mailnews/imap/src/nsImapStringBundle.h
@@ -110,20 +110,20 @@ PR_END_EXTERN_C
 #define IMAP_ACL_EXPUNGE_RIGHT                      5085
 #define IMAP_SERVER_DISCONNECTED                    5090
 #define IMAP_SUBSCRIBE_PROMPT                       5092
 #define IMAP_SERVER_DROPPED_CONNECTION              5093
 #define IMAP_QUOTA_STATUS_FOLDERNOTOPEN             5095
 #define IMAP_QUOTA_STATUS_NOTSUPPORTED              5096
 #define IMAP_QUOTA_STATUS_NOQUOTA                   5097
 #define IMAP_OUT_OF_MEMORY                          5100
-#define IMAP_AUTH_MECH_NOT_SUPPORTED                5101
-#define IMAP_AUTH_MECH_FAILED                       5102
 #define IMAP_COPYING_MESSAGE_OF                     5103
-#define IMAP_AUTH_GSSAPI_FAILED                     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_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL    5109
 #define IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL       5110
 #define IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT           5111
+#define IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL    5112
+#define IMAP_AUTH_MECH_NOT_SUPPORTED                5113
+#define IMAP_AUTH_MECH_FAILED                       5114
+#define IMAP_AUTH_GSSAPI_FAILED                     5115
 #endif /* _nsImapStringBundle_H__ */
--- a/mailnews/local/src/nsLocalStrings.h
+++ b/mailnews/local/src/nsLocalStrings.h
@@ -21,28 +21,28 @@
 #define POP3_USERNAME_UNDEFINED                               4014
 #define POP3_LIST_FAILURE                                     4015
 #define POP3_DELE_FAILURE                                     4016
 #define POP3_STAT_FAILURE                                     4024
 #define POP3_SERVER_SAID                                      4025
 #define COPYING_MSGS_STATUS                                   4027
 #define MOVING_MSGS_STATUS                                    4028
 #define POP3_MESSAGE_FOLDER_BUSY                              4029
-#define POP3_AUTH_MECH_NOT_SUPPORTED                          4030
-#define POP3_GSSAPI_FAILURE                                   4031
 #define MOVEMAIL_CANT_OPEN_SPOOL_FILE                         4033
 #define MOVEMAIL_CANT_CREATE_LOCK                             4034
 #define MOVEMAIL_CANT_DELETE_LOCK                             4035
 #define MOVEMAIL_CANT_TRUNCATE_SPOOL_FILE                     4036
 #define MOVEMAIL_SPOOL_FILE_NOT_FOUND                         4037
 #define POP3_TMP_DOWNLOAD_FAILED                              4038
 #define POP3_SERVER_DOES_NOT_SUPPORT_UIDL_ETC                 4040
 #define POP3_SERVER_DOES_NOT_SUPPORT_THE_TOP_COMMAND          4041
 #define NS_ERROR_COULD_NOT_CONNECT_VIA_TLS                    4043
 #define POP3_MOVE_FOLDER_TO_TRASH                             4044
 #define POP3_DELETE_FOLDER_DIALOG_TITLE                       4045
 #define POP3_DELETE_FOLDER_BUTTON_LABEL                       4046
 #define POP3_AUTH_INTERNAL_ERROR                              4047
 #define POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL              4048
 #define POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL                 4049
 #define POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT                     4050
+#define POP3_AUTH_MECH_NOT_SUPPORTED                          4051
+#define POP3_GSSAPI_FAILURE                                   4052
 
 #endif /* _nsLocalStrings_H__ */
--- a/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
+++ b/suite/locales/en-US/chrome/mailnews/compose/composeMsgs.properties
@@ -203,28 +203,16 @@ 12570=There was an error attaching %S. P
 12571=There was an error copying the message to the Sent folder. Retry?
 
 ## @name NS_ERROR_SMTP_GREETING
 12572=An error occurred sending mail: The mail server sent an incorrect greeting:  %s.
 
 ## @name NS_ERROR_SENDING_RCPT_COMMAND
 12575=An error occurred while sending mail. The mail server responded:  %1$s. Please check the message recipient %2$s and try again.
 
-## @name NS_ERROR_SMTP_AUTH_FAILURE
-12576=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_GSSAPI
-12579=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
-## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
-12580=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
-
-## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
-12581=Unable to authenticate to SMTP server %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.
-
 ## @name NS_ERROR_STARTTLS_FAILED_EHLO_STARTTLS
 12582=An error occurred sending mail: Unable to establish a secure link with SMTP server %S using STARTTLS since it doesn't advertise that feature. Switch off STARTTLS for that server or contact your service provider.
 
 ## @name NS_ERROR_SMTP_PASSWORD_UNDEFINED
 12584=An error occurred sending mail: Could not get password for %S. The message was not sent.
 
 ## @name NS_ERROR_SMTP_TEMP_SIZE_EXCEEDED
 12586=The size of the message you are trying to send exceeds a temporary size limit of the server. The message was not sent; try to reduce the message size or wait some time and try again. The server responded:  %s.
@@ -246,24 +234,43 @@ 12591=The message could not be sent beca
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_TIMEOUT
 12592=The message could not be sent because the connection to SMTP server %S timed out. Try again or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_SEND_FAILED_UNKNOWN_REASON
 12593=The message could not be sent using SMTP server %S for an unknown reason. Please verify that your SMTP server settings are correct and try again, or contact your network administrator.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+# LOCALIZATION NOTE (12594): $S is server hostname
 12594=The SMTP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
+# LOCALIZATION NOTE (12595): $S is server hostname
 12595=The SMTP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name NS_ERROR_SMTP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
+# LOCALIZATION NOTE (12596): $S is server hostname
 12596=The SMTP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
 
+## @name NS_ERROR_SMTP_AUTH_FAILURE
+# LOCALIZATION NOTE (12597): $S is server hostname
+12597=Unable to authenticate to SMTP server %S. Please check the password, and verify the 'Authentication method' in 'Account Settings | Outgoing server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_GSSAPI
+# LOCALIZATION NOTE (12598): $S is server hostname
+12598=The Kerberos/GSSAPI ticket was not accepted by the SMTP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
+
+## @name NS_ERROR_SMTP_AUTH_MECH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12599): $S is server hostname
+12599=The SMTP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Outgoing Server (SMTP)'.
+
+## @name NS_ERROR_SMTP_AUTH_NOT_SUPPORTED
+# LOCALIZATION NOTE (12600): $S is server hostname
+12600=Unable to authenticate to SMTP server %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.
+
 
 ## Strings use for the save message dialog shown when the user close a message compose window
 saveDlogTitle=Save Message
 saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
 
 ## generics string
 defaultSubject=(no subject)
 chooseFileToAttach=Attach File(s)
--- a/suite/locales/en-US/chrome/mailnews/imapMsgs.properties
+++ b/suite/locales/en-US/chrome/mailnews/imapMsgs.properties
@@ -360,39 +360,24 @@ 5096=This server does not support quotas
 ## @loc None
 5097=There are no storage quotas on this folder.
 
 # Out of memory
 ## @name IMAP_OUT_OF_MEMORY
 ## @loc None
 5100=Application is out of memory.
 
-## @name IMAP_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-# LOCALIZATION NOTE (5101): %S is the server hostname
-5101=The IMAP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
-
-## @name IMAP_AUTH_MECH_FAILED
-## @loc None
-# LOCALIZATION NOTE (5102): %S is the server hostname
-5102=All login mechanisms for %S failed. Please check the password or change the 'Authentication method' in the 'Account Settings | Server settings'.
-
 ## @name IMAP_COPYING_MESSAGE_OF
 ## @loc None
 # LOCALIZATION NOTE (Error 5103): Do not translate the word "%S" below.
 # Place the word %3$S in your translation where the name of the destination folder should appear.
 # Place the word %1$S where the currently copying message should appear.
 # 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_AUTH_GSSAPI_FAILED
-## @loc None
-# LOCALIZATION NOTE (5104): %S is the server hostname
-5104=The Kerberos/GSSAPI ticket was not accepted by the IMAP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
 ## @name IMAP_MOVE_FOLDER_TO_TRASH
 ## @loc None
 # LOCALIZATION NOTE (5105): Do not translate the word %S below.
 # "%S" is the name of the folder.
 5105=Are you sure you want to delete the folder '%S'?
 
 ## @name IMAP_DELETE_NO_TRASH
 ## @loc None
@@ -403,22 +388,37 @@ 5106=Deleting this folder is not undoabl
 ## @name IMAP_DELETE_FOLDER_DIALOG_TITLE
 ## @loc None
 5107=Delete Folder
 
 ## @name IMAP_DELETE_FOLDER_BUTTON_LABEL
 ## @loc None
 5108=&Delete Folder
 
-## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
-## @loc None
-# LOCALIZATION NOTE (5109): %S is the server hostname
-5109=The IMAP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
-
 ## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
 ## @loc None
 # LOCALIZATION NOTE (5110): %S is the server hostname
 5110=The IMAP server %S does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name IMAP_AUTH_CHANGE_PLAIN_TO_ENCRYPT
 ## @loc None
 # LOCALIZATION NOTE (5111): %S is the server hostname
 5111=The IMAP server %S does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_CHANGE_ENCRYPT_TO_PLAIN_NO_SSL
+## @loc None
+# LOCALIZATION NOTE (5112): %S is the server hostname
+5112=The IMAP server %S does not seem to support encrypted passwords. If you just set up the account, please try changing to 'Password, transmitted insecurely' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, this is a common scenario how someone could steal your password.
+
+## @name IMAP_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+# LOCALIZATION NOTE (5113): %S is the server hostname
+5113=The IMAP server %S does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_MECH_FAILED
+## @loc None
+# LOCALIZATION NOTE (5114): %S is the server hostname
+5114=All login mechanisms for %S failed. Please check the password or change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+## @name IMAP_AUTH_GSSAPI_FAILED
+## @loc None
+# LOCALIZATION NOTE (5115): %S is the server hostname
+5115=The Kerberos/GSSAPI ticket was not accepted by the IMAP server %S. Please check that you are logged in to the Kerberos/GSSAPI realm.
--- a/suite/locales/en-US/chrome/mailnews/localMsgs.properties
+++ b/suite/locales/en-US/chrome/mailnews/localMsgs.properties
@@ -160,26 +160,16 @@ 4025= Mail server %S responded:
 ## @name COPYING_MSGS_STATUS
 ## @loc None
 4027=Copying %S of %S messages to %S
 
 ## @name MOVING_MSGS_STATUS
 ## @loc None
 4028=Moving %S of %S messages to %S
 
-# Authentication server caps and pref don't match
-## @name POP3_AUTH_MECH_NOT_SUPPORTED
-## @loc None
-4030=The server does not support the selected authentication method. Please change the Authentication method in the Account Settings.
-
-# Status - Could not log in to GSSAPI, and it was the only method
-## @name POP3_GSSAPI_FAILURE
-## @loc None
-4031=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.
-
 ## @name MOVEMAIL_CANT_OPEN_SPOOL_FILE
 ## @loc None
 4033=Unable to open mail spool file %S.
 
 ## @name MOVEMAIL_CANT_CREATE_LOCK
 ## @loc None
 4034=Unable to create lock file %S. For movemail to work, it is necessary to create lock files in the mail spool directory. On many systems, this is best accomplished by making the spool directory be mode 01777.
 
@@ -245,8 +235,18 @@ 4048=This POP3 server does not seem to s
 
 ## @name POP3_AUTH_CHANGE_ENCRYPT_TO_PLAIN_SSL
 ## @loc None
 4049=This POP3 server does not seem to support encrypted passwords. If you just set up this account, please try changing to 'Normal password' as the 'Authentication method' in the 'Account Settings | Server settings'. If it used to work and now suddenly fails, please contact your email administrator or provider.
 
 ## @name POP3_AUTH_CHANGE_PLAIN_TO_ENCRYPT
 ## @loc None
 4050=This POP3 server does not allow plaintext passwords. Please try changing to 'Encrypted password' as the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Authentication server caps and pref don't match
+## @name POP3_AUTH_MECH_NOT_SUPPORTED
+## @loc None
+4051=The server does not support the selected authentication method. Please change the 'Authentication method' in the 'Account Settings | Server settings'.
+
+# Status - Could not log in to GSSAPI, and it was the only method
+## @name POP3_GSSAPI_FAILURE
+## @loc None
+4052=The Kerberos/GSSAPI ticket was not accepted by the POP server. Please check that you are logged in to the Kerberos/GSSAPI realm.