aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/res/values/strings.xml36
1 files changed, 24 insertions, 12 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7e6fad360..886f9a7ba 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -14,19 +14,19 @@
<string name="action_unblock_contact">Unblock contact</string>
<string name="action_block_domain">Block domain</string>
<string name="action_unblock_domain">Unblock domain</string>
- <string name="title_activity_manage_accounts">Manage Accounts</string>
+ <string name="title_activity_manage_accounts">Manage accounts</string>
<string name="title_activity_settings">Settings</string>
- <string name="title_activity_conference_details">Group chat Details</string>
- <string name="title_activity_contact_details">Contact Details</string>
- <string name="title_activity_sharewith">Share with Conversation</string>
- <string name="title_activity_start_conversation">Start Conversation</string>
+ <string name="conference_details">Group chat details</string>
+ <string name="title_activity_contact_details">Contact details</string>
+ <string name="title_activity_sharewith">Share with conversation</string>
+ <string name="title_activity_start_conversation">Start conversation</string>
<string name="title_activity_choose_contact">Choose contact</string>
- <string name="title_activity_choose_contacts">Choose Contacts</string>
+ <string name="title_activity_choose_contacts">Choose contacts</string>
<string name="title_activity_block_list">Block list</string>
<string name="just_now">just now</string>
<string name="minute_ago">1 min ago</string>
<string name="minutes_ago">%d mins ago</string>
- <string name="unread_conversations">unread Conversations</string>
+ <string name="unread_conversations">unread conversations</string>
<string name="sending">sending…</string>
<string name="message_decrypting">Decrypting message. Please wait…</string>
<string name="pgp_message">OpenPGP encrypted message</string>
@@ -209,11 +209,10 @@
<string name="done">Done</string>
<string name="verify">Verify</string>
<string name="decrypt">Decrypt</string>
- <string name="conferences">Group chats</string>
+ <string name="bookmarks">Bookmarks</string>
<string name="search">Search</string>
<string name="create_contact">Create Contact</string>
<string name="enter_contact">Enter Contact</string>
- <string name="join_conference">Join group chat</string>
<string name="delete_contact">Delete Contact</string>
<string name="view_contact_details">View contact details</string>
<string name="block_contact">Block contact</string>
@@ -222,8 +221,8 @@
<string name="select">Select</string>
<string name="contact_already_exists">The contact already exists</string>
<string name="join">Join</string>
- <string name="conference_address">Group chat address</string>
- <string name="conference_address_example">groupchat@room.pix-art.de</string>
+ <string name="channel_full_jid_example">channel@conference.example.com/nick</string>
+ <string name="channel_bare_jid_example">channel@conference.example.com</string>
<string name="save_as_bookmark">Save as bookmark</string>
<string name="delete_bookmark">Delete bookmark</string>
<string name="bookmark_already_exists">This bookmark already exists</string>
@@ -557,7 +556,6 @@
<string name="show_password">Show password</string>
<string name="registration_please_wait">Registration failed: Try again later</string>
<string name="registration_password_too_weak">Registration failed: Password too weak</string>
- <string name="create_conference">Create group chat</string>
<string name="conference_subject">Subject</string>
<string name="choose_participants">Choose participants</string>
<string name="creating_conference">Creating group chat…</string>
@@ -875,4 +873,18 @@
<string name="join_group_chat">Join group chat</string>
<string name="create_group_chat">Create group chat</string>
<string name="message_deleted">Message was deleted</string>
+ <string name="channel_details">Channel details</string>
+ <string name="join_public_channel">Join public channel</string>
+ <string name="create_private_group_chat">Create private group chat</string>
+ <string name="create_public_channel">Create public channel</string>
+ <string name="create_dialog_channel_name">Channel name</string>
+ <string name="xmpp_address">XMPP address</string>
+ <string name="please_enter_name">Please provide a name for the channel</string>
+ <string name="please_enter_xmpp_address">Please provide an XMPP address</string>
+ <string name="this_is_an_xmpp_address">This is an XMPP address. Please provide a name.</string>
+ <string name="creating_channel">Creating public channel…</string>
+ <string name="channel_already_exists">This channel already exits</string>
+ <string name="joined_an_existing_channel">You\'ve joined an existing channel</string>
+ <string name="unable_to_set_channel_configuration">Unable to set channel configuration</string>
+ <string name="back">Back</string>
</resources>