aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin/otr
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2017-01-15 18:52:30 +0100
committerIngo Bauersachs <ingo@jitsi.org>2017-01-18 21:17:00 +0100
commit38e1ebc48aa042bfcffa2c4763b9fdb1a6b1b754 (patch)
treeebe0d772c285a85b1f5edd5584cab95468e2539d /src/net/java/sip/communicator/plugin/otr
parent999dd2a04be03a6250e9dbb8a01e883c57e6f95a (diff)
downloadjitsi-38e1ebc48aa042bfcffa2c4763b9fdb1a6b1b754.zip
jitsi-38e1ebc48aa042bfcffa2c4763b9fdb1a6b1b754.tar.gz
jitsi-38e1ebc48aa042bfcffa2c4763b9fdb1a6b1b754.tar.bz2
Don't split resource strings, remove unused resources
Diffstat (limited to 'src/net/java/sip/communicator/plugin/otr')
-rw-r--r--src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
index c330879..8e4a235 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
@@ -654,15 +654,14 @@ public class ScOtrEngineImpl
String unverifiedSessionWarning
= OtrActivator.resourceService.getI18NString(
- "plugin.otr.activator"
- + ".unverifiedsessionwarning",
- new String[]
- {
- contact.getDisplayName() + resourceName,
- this.getClass().getName(),
- "AUTHENTIFICATION",
- sessionGuid.toString()
- });
+ "plugin.otr.activator.unverifiedsessionwarning",
+ new String[]
+ {
+ contact.getDisplayName() + resourceName,
+ this.getClass().getName(),
+ "AUTHENTIFICATION",
+ sessionGuid.toString()
+ });
OtrActivator.uiService.getChat(contact).addMessage(
contact.getDisplayName(),
new Date(), Chat.SYSTEM_MESSAGE,
@@ -727,8 +726,7 @@ public class ScOtrEngineImpl
OtrActivator.scOtrKeyManager.isVerified(
contact, remoteFingerprint)
? "plugin.otr.activator.sessionstared"
- : "plugin.otr.activator"
- + ".unverifiedsessionstared",
+ : "plugin.otr.activator.unverifiedsessionstared",
new String[]
{contact.getDisplayName() + resourceName});