diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-01 20:16:45 +0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-01 08:16:45 -0400 |
| commit | 88f398ffddbcbb58265d085c09cb72008be3f3d5 (patch) | |
| tree | 6db22e220a781a144808e113505ce040c7e2eac7 /i18n | |
| parent | b023b891550cd8fb2f874e822f05921d13f51fb2 (diff) | |
| download | chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.gz chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.bz2 chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.zip | |
Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"
This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049.
* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"
This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/i18n/en.json b/i18n/en.json index 01bde8f12..c4940295b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -153,7 +153,7 @@ }, { "id": "api.channel.add_member.added", - "translation": "%v added %v to the channel." + "translation": "%v added to the channel by %v" }, { "id": "api.channel.add_member.find_channel.app_error", @@ -297,7 +297,7 @@ }, { "id": "api.channel.join_channel.post_and_forget", - "translation": "%v joined the channel." + "translation": "%v has joined the channel." }, { "id": "api.channel.leave.default.app_error", @@ -313,7 +313,7 @@ }, { "id": "api.channel.leave.left", - "translation": "%v left the channel." + "translation": "%v has left the channel." }, { "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error", @@ -348,14 +348,6 @@ "translation": "%s updated the channel header to: %s" }, { - "id": "api.channel.create_user_activity_post.error", - "translation": "Failed to create user activity system message like add, remove, join or leave" - }, - { - "id": "api.channel.update_user_activity_post.error", - "translation": "Failed to update user activity system message like add, remove, join or leave" - }, - { "id": "api.channel.post_user_add_remove_message_and_forget.error", "translation": "Failed to post join/leave message" }, |