Bug 1400359 - Follow-up: Add NS_ERROR_NET_RESET and NS_ERROR_NET_INTERRUPT in nsMsgProtocol::ShowAlertMessage(). r=me a=jorgk
authorJorg K <jorgk@jorgk.com>
Tue, 19 Sep 2017 09:49:12 +0200
changeset 28610 958254c475a5fbbe93a8ad261d037a21deac9966
parent 28609 9ccf7f64ce420ef440989f27cf70e6769aee01d9
child 28611 7159bd45a4f6813f96ad665986bd4e9da2ced430
push idunknown
push userunknown
push dateunknown
reviewersme, jorgk
bugs1400359
Bug 1400359 - Follow-up: Add NS_ERROR_NET_RESET and NS_ERROR_NET_INTERRUPT in nsMsgProtocol::ShowAlertMessage(). r=me a=jorgk
mail/locales/en-US/chrome/messenger/messenger.properties
mailnews/base/util/nsMsgProtocol.cpp
suite/locales/en-US/chrome/mailnews/messenger.properties
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -403,16 +403,20 @@ attachmentsPrintHeader=Attachments:
 
 # Connection Error Messages
 # LOCALIZATION NOTE(unknownHostError): %S is the server name
 unknownHostError=Failed to connect to server %S.
 # LOCALIZATION NOTE(connectionRefusedError): %S is the server name
 connectionRefusedError=Could not connect to server %S; the connection was refused.
 # LOCALIZATION NOTE(netTimeoutError): %S is the server name
 netTimeoutError=Connection to server %S timed out.
+# LOCALIZATION NOTE(netResetError): %S is the server name
+netResetError=Connection to server %S was reset.
+# LOCALIZATION NOTE(netInterruptError): %S is the server name
+netInterruptError=Connection to server %S was interrupted.
 
 recipientSearchCriteria=Subject or Recipient contains:
 fromSearchCriteria=Subject or From contains:
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages
 biffNotification_message=has %1$S new message
 biffNotification_messages=has %1$S new messages
 
--- a/mailnews/base/util/nsMsgProtocol.cpp
+++ b/mailnews/base/util/nsMsgProtocol.cpp
@@ -339,16 +339,22 @@ void nsMsgProtocol::ShowAlertMessage(nsI
      break;
   case NS_ERROR_CONNECTION_REFUSED:
   case NS_ERROR_PROXY_CONNECTION_REFUSED:
      errorString = u"connectionRefusedError";
      break;
   case NS_ERROR_NET_TIMEOUT:
      errorString = u"netTimeoutError";
      break;
+  case NS_ERROR_NET_RESET:
+     errorString = u"netResetError";
+     break;
+  case NS_ERROR_NET_INTERRUPT:
+     errorString = u"netInterruptError";
+     break;
   default:
      // Leave the string as nullptr.
      break;
   }
 
   NS_ASSERTION(errorString, "unknown error, but don't alert user.");
   if (errorString)
   {
--- a/suite/locales/en-US/chrome/mailnews/messenger.properties
+++ b/suite/locales/en-US/chrome/mailnews/messenger.properties
@@ -324,16 +324,20 @@ attachmentsPrintHeader=Attachments:
 
 # Connection Error Messages
 # LOCALIZATION NOTE(unknownHostError): %S is the server name
 unknownHostError=Failed to connect to server %S.
 # LOCALIZATION NOTE(connectionRefusedError): %S is the server name
 connectionRefusedError=Could not connect to server %S; the connection was refused.
 # LOCALIZATION NOTE(netTimeoutError): %S is the server name
 netTimeoutError=Connection to server %S timed out.
+# LOCALIZATION NOTE(netResetError): %S is the server name
+netResetError=Connection to server %S was reset.
+# LOCALIZATION NOTE(netInterruptError): %S is the server name
+netInterruptError=Connection to server %S was interrupted.
 
 # LOCALIZATION NOTE(biffNotification): %1$S is the number of new messages
 biffNotification_message=has %1$S new message
 biffNotification_messages=has %1$S new messages
 
 # LOCALIZATION NOTE(macBiffNotification is Mac only):
 #  %1$S is the number of new messages
 #  %2$S is a list of names and/or email addresses separated by biffNotification_separator