summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorDebanshu Kundu <debanshu.kundu@joshtechnologygroup.com>2017-07-31 23:47:21 +0530
committerSaturnino Abril <saturnino.abril@gmail.com>2017-08-01 02:17:21 +0800
commit8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c (patch)
tree28496b27f4da93baa8707bf0690ef88f8cdcc178 /i18n
parent59992ae4a4638006ec1489dd834151b258c1728c (diff)
downloadchat-8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.tar.gz
chat-8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.tar.bz2
chat-8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.zip
#4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)
fix 7 and 8 remove @ at "{username} joined the channel" refactor and update test
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json14
1 files changed, 11 insertions, 3 deletions
diff --git a/i18n/en.json b/i18n/en.json
index c4940295b..01bde8f12 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -153,7 +153,7 @@
},
{
"id": "api.channel.add_member.added",
- "translation": "%v added to the channel by %v"
+ "translation": "%v added %v to the channel."
},
{
"id": "api.channel.add_member.find_channel.app_error",
@@ -297,7 +297,7 @@
},
{
"id": "api.channel.join_channel.post_and_forget",
- "translation": "%v has joined the channel."
+ "translation": "%v joined the channel."
},
{
"id": "api.channel.leave.default.app_error",
@@ -313,7 +313,7 @@
},
{
"id": "api.channel.leave.left",
- "translation": "%v has left the channel."
+ "translation": "%v left the channel."
},
{
"id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
@@ -348,6 +348,14 @@
"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"
},