Improves the OTR information messages displayed to the user when the session status is FINISHED

resources/languages/resources.properties

@@ -1607,12 +1607,12 @@ plugin.otr.activator.sessionfinished={0} has ended his/her private conversation
 plugin.otr.activator.sessionlost=Private conversation with {0} lost.
 plugin.otr.activator.historyon={0} is recording this conversation on your device. You can <A href=\"jitsi://{1}/{2}\">turn off chat history here</a>.
 plugin.otr.activator.historyoff={0} is NOT recording this conversation. You can <A href=\"jitsi://{1}/{2}\">activate chat history here</a>.
-plugin.otr.activator.sessionfinishederror=Your message was not sent. Please end your private conversation with {0}.
+plugin.otr.activator.sessionfinishederror=Your message [{0}] was not sent. Please end your private conversation with {1}.
 plugin.otr.activator.smpaborted={0} has aborted the authentication process.
 plugin.otr.activator.smperror=An error occurred in the authentication process.
 plugin.otr.activator.unencryptedmsgreceived=The message was received unencrypted.
 plugin.otr.activator.unreadablemsgreceived={0} sent you an unreadable encrypted message.
-plugin.otr.activator.requireencryption=Your message was not sent. Private messaging is required.
+plugin.otr.activator.requireencryption=Your message [{0}] was not sent. Private messaging is required.
 plugin.otr.activator.unreadablemsgreply=You sent {0} an unreadable encrypted message. Please end your private conversation with {1} or refresh it.
 plugin.otr.activator.fallbackmessage=<span style="font-weight: bold;">{0} is trying to initiate an encrypted \
 <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">Off-The-Record conversation</a> with you. However, your software does not support \

src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java

@@ -232,7 +232,7 @@ public void smpAborted(SessionID sessionID) throws OtrException
         }
 
         @Override
-        public void finishedSessionMessage(SessionID sessionID)
+        public void finishedSessionMessage(SessionID sessionID, String msgText)
             throws OtrException
         {
             OtrContact otrContact = getOtrContact(sessionID);
@@ -246,7 +246,7 @@ public void finishedSessionMessage(SessionID sessionID)
                 OtrActivator.resourceService.getI18NString(
                     "plugin.otr.activator.sessionfinishederror",
                     new String[]
-                        {contact.getDisplayName() + resourceName});
+                        {msgText, contact.getDisplayName() + resourceName});
             OtrActivator.uiService.getChat(contact).addMessage(
                 contact.getDisplayName(), new Date(),
                 Chat.ERROR_MESSAGE, error,
@@ -261,15 +261,12 @@ public void requireEncryptedMessage(SessionID sessionID, String msgText)
             if (otrContact == null)
                 return;
 
-            String resourceName = otrContact.resource != null ?
-                "/" + otrContact.resource.getResourceName() : "";
-
                 Contact contact = otrContact.contact;
             String error =
                 OtrActivator.resourceService.getI18NString(
                     "plugin.otr.activator.requireencryption",
                     new String[]
-                        {contact.getDisplayName() + resourceName});
+                        {msgText});
             OtrActivator.uiService.getChat(contact).addMessage(
                 contact.getDisplayName(), new Date(),
                 Chat.ERROR_MESSAGE, error,