aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/menu/conversations.xml4
-rw-r--r--res/menu/newconversation_context.xml4
-rw-r--r--res/values/strings.xml11
3 files changed, 18 insertions, 1 deletions
diff --git a/res/menu/conversations.xml b/res/menu/conversations.xml
index bb2bd9ee..977d47e5 100644
--- a/res/menu/conversations.xml
+++ b/res/menu/conversations.xml
@@ -26,6 +26,10 @@
android:showAsAction="ifRoom"
android:icon="@drawable/ic_action_group"
android:title="@string/action_muc_details" />
+ <item
+ android:id="@+id/action_invite"
+ android:showAsAction="never"
+ android:title="@string/invite_contacts" />
<item
android:id="@+id/action_archive"
diff --git a/res/menu/newconversation_context.xml b/res/menu/newconversation_context.xml
index c28d839d..7492c265 100644
--- a/res/menu/newconversation_context.xml
+++ b/res/menu/newconversation_context.xml
@@ -15,4 +15,8 @@
android:id="@+id/action_invite"
android:showAsAction="ifRoom"
android:title="@string/invite_contacts" />
+ <item
+ android:id="@+id/action_invite_to_existing"
+ android:showAsAction="never"
+ android:title="@string/invite_contacts_to_existing" />
</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f04fca96..eb38e39f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,7 +10,7 @@
<string name="action_muc_details">Conferenece details</string>
<string name="action_secure">Secure conversation</string>
<string name="action_add_account">Add account</string>
- <string name="title_activity_new_conversation">New Conversation</string>
+ <string name="title_activity_contacts">Contacts</string>
<string name="just_now">just now</string>
<string name="sending">sending&#8230;</string>
<string name="announce_pgp">Renew PGP announcement</string>
@@ -31,4 +31,13 @@
<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="cancel">Cancel</string>
+ <string name="create_invite">Create \u0026 Invite</string>
+ <string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string>
+ <string name="no_open_mucs">No existing conferences</string>
+ <string name="invitation_sent">Invitation sent</string>
+ <string name="account_offline">Account offline</string>
+ <string name="cant_invite_while_offline">You have to be online to invite people to conferences</string>
</resources>