diff options
| author | Christian S <christian@pix-art.de> | 2016-02-23 17:47:03 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-23 17:47:03 +0100 |
| commit | 5707bb9754667e6e8bc5df76f6d9e8f311b204fe (patch) | |
| tree | b604a1caf6825c586f3badb862c32af39a3a2d1b /src/main/res/values | |
| parent | cbbd85ac6b0b72dc1aeffd367093924fb3f0e052 (diff) | |
| parent | 17b1fcc3eafa078a902c662a6e774bcd7f2927b3 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res/values')
| -rw-r--r-- | src/main/res/values/strings.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 982c3ab84..f97e59bd3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -241,8 +241,7 @@ <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="conference_not_found">Conference not found</string> - <string name="conference_unknown_error">Unknown error received</string>2 + <string name="joining_conference">Joining conference…</string> <string name="leave">Leave</string> <string name="contact_added_you">Contact added you to contact list</string> <string name="add_back">Add back</string> @@ -341,6 +340,8 @@ <string name="conference_banned">You are banned from this conference</string> <string name="conference_members_only">This conference is members only</string> <string name="conference_kicked">You have been kicked from this conference</string> + <string name="conference_shutdown">The conference was shut down</string> + <string name="conference_unknown_error">You are no longer in this conference</string> <string name="using_account">using account %s</string> <string name="checking_x">Checking %s on HTTP host</string> <string name="not_connected_try_again">You are not connected. Try again later</string> |