aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-17 00:03:37 +0200
commit38a9242955704232039272fd8b6011d47622495d (patch)
tree16665564834041b3c1218531d548449e64285f8d /res/values
parent670dead69502884d178ab60ec10e8e0e7b7a7915 (diff)
brought muc invites back. + couple of bug fixes + refactoring
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 2 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 26e5dda5..8cfff368 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -47,10 +47,7 @@
<string name="show_otr_key">OTR fingerprint</string>
<string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string>
<string name="start_conversation">Start Conversation</string>
- <string name="invite_contacts">Invite Contacts</string>
- <string name="invite_contacts_to_existing">Invite to existing conference</string>
- <string name="new_conference">Create new conference</string>
- <string name="new_contact">Create new contact</string>
+ <string name="invite_contact">Invite Contact</string>
<string name="contacts">Contacts</string>
<string name="search_jabber_id">Search or enter Jabber ID</string>
<string name="choose_account">Choose account</string>
@@ -272,4 +269,5 @@
<string name="bookmark_already_exists">This bookmark already exists</string>
<string name="you">You</string>
<string name="action_edit_subject">Edit conference subject</string>
+ <string name="title_activity_choose_contact">Choose contact</string>
</resources>