diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-07-18 21:57:27 +0200 |
| commit | 1cfe557b2b7035c3b7df26948b82a11dff141e77 (patch) | |
| tree | a3e9f2f85db66d61c3508fd3a1cafea50854224d /res/values | |
| parent | c65600edc9861c5f1788676e03a8164904a79193 (diff) | |
| parent | 2f514381a22edd8c26c0b15f822c032edc1702df (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index af655f67..61e3ee94 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,7 @@ <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="title_activity_choose_contact">Choose contact</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> <string name="minutes_ago">%d mins ago</string> @@ -269,7 +270,6 @@ <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> <string name="conference_not_found">Conference not found</string> <string name="leave">Leave</string> </resources> |