diff options
| author | cpanato <ctadeu@gmail.com> | 2018-07-06 10:57:40 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-07-06 10:57:40 +0200 |
| commit | a92f5addccad0f77079308ff853a8251db5f2d09 (patch) | |
| tree | f4aefb58970b38a5b561551ccd3d4cd430dbdce7 /i18n | |
| parent | 4de50ddfc3ef09ddc0a56c8ff9bf2429df524aa5 (diff) | |
| parent | 0896b5c64ef224f0f8835b9727d1c1b94cbe7c29 (diff) | |
| download | chat-a92f5addccad0f77079308ff853a8251db5f2d09.tar.gz chat-a92f5addccad0f77079308ff853a8251db5f2d09.tar.bz2 chat-a92f5addccad0f77079308ff853a8251db5f2d09.zip | |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180706
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 58ed704a8..0afc83afa 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -160,6 +160,10 @@ "translation": "The channel has been archived or deleted" }, { + "id": "api.channel.delete_channel.type.invalid", + "translation": "Cannot delete direct or group message channels" + }, + { "id": "api.channel.join_channel.already_deleted.app_error", "translation": "Channel is already deleted" }, |