aboutsummaryrefslogtreecommitdiffstats
path: root/res/values/strings.xml
diff options
context:
space:
mode:
authorkruks23 <scardenas@openmailbox.org>2014-07-10 15:13:31 +0200
committerkruks23 <scardenas@openmailbox.org>2014-07-10 15:13:31 +0200
commit8379f695166ee9888e6e1221894c7d1494669a6d (patch)
treeb43c4b4fe72916df1dd547ab706ffae34cdcd243 /res/values/strings.xml
parentc7088489bd339e4b8b5128e909a1b4377864a5c9 (diff)
parente97b5244552c8da06b3311bccb831be30c9a641a (diff)
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r--res/values/strings.xml15
1 files changed, 12 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80bd2052..ebfaaa17 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,6 +21,7 @@
<string name="title_activity_contact_details">Contact Details</string>
<string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Share with Conversation</string>
+ <string name="title_activity_start_conversation">Start Conversation</string>
<string name="just_now">just now</string>
<string name="minute_ago">1 min ago</string>
<string name="minutes_ago">%d mins ago</string>
@@ -200,10 +201,10 @@
<string name="mgmt_account_account_offline">Account is offline</string>
<string name="attach_record_voice">Record voice</string>
<string name="account_settings">Account Settings</string>
- <string name="account_settings_jabber_id">Jabber ID:</string>
- <string name="account_settings_password">Password:</string>
+ <string name="account_settings_jabber_id">Jabber ID</string>
+ <string name="account_settings_password">Password</string>
<string name="account_settings_example_jabber_id">username@example.com</string>
- <string name="account_settings_confirm_password">Confirm password:</string>
+ <string name="account_settings_confirm_password">Confirm password</string>
<string name="password">Password</string>
<string name="confirm_password">Confirm password</string>
<string name="passwords_do_not_match">Passwords do not match</string>
@@ -254,4 +255,12 @@
<string name="otr_fingerprint">OTR fingerprint</string>
<string name="verify">Verify</string>
<string name="decrypt">Decrypt</string>
+ <string name="conferences">Conferences</string>
+ <string name="search">Search</string>
+ <string name="create_contact">Create Contact</string>
+ <string name="create_conference">Create Conference</string>
+ <string name="delete_contact">Delete Contact</string>
+ <string name="view_contact_details">View contact details</string>
+ <string name="create">Create</string>
+ <string name="contact_already_exists">The contact already exists</string>
</resources> \ No newline at end of file