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 /webapp/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 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 55fc3cd74..79d291e47 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1042,15 +1042,15 @@ "analytics.team.title": "Team Statistics for {team}", "analytics.team.totalPosts": "Total Posts", "analytics.team.totalUsers": "Total Users", - "api.channel.add_member.added": " {username} added {addedUsername} to the channel.", + "api.channel.add_member.added": "{addedUsername} added to the channel by {username}", "api.channel.delete_channel.archived": "{username} has archived the channel.", - "api.channel.join_channel.post_and_forget": "{username} joined the channel.", - "api.channel.leave.left": "{username} left the channel.", + "api.channel.join_channel.post_and_forget": "{username} has joined the channel.", + "api.channel.leave.left": "{username} has left the channel.", "api.channel.post_update_channel_displayname_message_and_forget.updated_from": "{username} updated the channel display name from: {old} to: {new}", "api.channel.post_update_channel_header_message_and_forget.removed": "{username} removed the channel header (was: {old})", "api.channel.post_update_channel_header_message_and_forget.updated_from": "{username} updated the channel header from: {old} to: {new}", "api.channel.post_update_channel_header_message_and_forget.updated_to": "{username} updated the channel header to: {new}", - "api.channel.remove_member.removed": "{removedUsername} was removed from the channel.", + "api.channel.remove_member.removed": "{removedUsername} was removed from the channel", "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})", "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}", "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}", |