aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
committerChristian S <christian@pix-art.de>2015-08-12 12:41:13 +0200
commita0145e779d3caf58b0bfdb6a76587c61b345bf55 (patch)
tree619423e3139836b9ad78dc472e7a6592b0d015ba /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
parent6ef1f090840eec062f23c3433eaeef77df75f874 (diff)
parent81b7e27a468edb37994225fa7ad3581e26f73c9d (diff)
version 1.6.0 beta 3
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationFragment.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 79cb006d1..49878463b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -333,7 +333,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
mEditMessage.setHint(getString(R.string.send_otr_message));
break;
case Message.ENCRYPTION_AXOLOTL:
- mEditMessage.setHint(getString(R.string.send_axolotl_message));
+ mEditMessage.setHint(getString(R.string.send_omemo_message));
break;
case Message.ENCRYPTION_PGP:
mEditMessage.setHint(getString(R.string.send_pgp_message));