Bug 812921 - Land in comm-central Instantbird's changes to chat/ - 4 - Bio 1610 - Display a correct error message in the conversation when receiving a message type=error stanza, r=clokep.

chat/locales/en-US/xmpp.properties

@@ -34,6 +34,13 @@ connection.error.authenticationFailure=Authentication failure
 connection.error.notAuthorized=Not authorized (Did you enter the wrong password?)
 connection.error.failedToGetAResource=Failed to get a resource
 
+
+# LOCALIZATION NOTE (conversation.error.notDelivered):
+#   This is displayed in a conversation as an error message when a message
+#   the user has sent wasn't delivered.
+#   %S is replaced by the text of the message that wasn't delivered.
+conversation.error.notDelivered=This message could not be delivered: %S
+
 # LOCALIZATION NOTE (tooltip.*):
 #   These are the titles of lines of information that will appear in
 #   the tooltip showing details about a contact or conversation.

chat/protocols/xmpp/xmpp.jsm

@@ -144,7 +144,7 @@ const XMPPMUCConversationPrototype = {
       from = this.name;
     }
     else if (aStanza.attributes["type"] == "error") {
-      aMsg = _("connection.error.incorrectResponse");
+      aMsg = _("conversation.error.notDelivered", aMsg);
       flags.system = true;
       flags.error = true;
     }
@@ -272,7 +272,7 @@ const XMPPConversationPrototype = {
     this._targetResource = this._account._parseJID(from).resource;
     let flags = {};
     if (aStanza.attributes["type"] == "error") {
-      aMsg = _("connection.error.incorrectResponse");
+      aMsg = _("conversation.error.notDelivered", aMsg);
       flags.system = true;
       flags.error = true;
     }