From 88f398ffddbcbb58265d085c09cb72008be3f3d5 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Tue, 1 Aug 2017 20:16:45 +0800 Subject: 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. --- webapp/i18n/en.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'webapp/i18n') 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}", -- cgit v1.2.3-1-g7c22