aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-01 19:08:42 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-01 19:08:42 +0200
commit32a21e1ab94b625e99c125779a03ea29690f9533 (patch)
tree882f013478c0ef296014f80ac73a905bdc6d711c /res/values/strings.xml
parent8ea73feec405dffc47e5273ab034cb40af327a85 (diff)
unified crypto messages and made lock icon work for conferences
Diffstat (limited to '')
-rw-r--r--res/values/strings.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0f68fdd..e80de86f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -60,7 +60,7 @@
<string name="save">Save</string>
<string name="yes">Yes</string>
<string name="no">No</string>
- <string name="ok">Ok</string>
+ <string name="ok">OK</string>
<string name="done">Done</string>
<string name="hide">Hide</string>
<string name="create_invite">Create \u0026 Invite</string>
@@ -89,7 +89,6 @@
<string name="delete_messages">Delete messages</string>
<string name="also_end_conversation">End this conversations afterwards</string>
<string name="choose_presence">Choose presence to contact</string>
- <string name="send_message_to_conference">Send message to conference</string>
<string name="send_plain_text_message">Send plain text message</string>
<string name="send_otr_message">Send OTR encrypted message</string>
<string name="send_pgp_message">Send OpenPGP encrypted message</string>