diff options
| author | cpanato <ctadeu@gmail.com> | 2018-09-04 23:27:39 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-09-04 23:27:39 +0200 |
| commit | 4cf6913c1c58847b69bd7a16f046d4bfc676bdb4 (patch) | |
| tree | dbad14ece2033e395eb8f93920ce7256da803f35 /i18n | |
| parent | 50af3a19a2817097355df9fd70c0fda0328d8bae (diff) | |
| parent | d2190527eafdae31e14ba0832dcfb79a0a1e223b (diff) | |
| download | chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.tar.gz chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.tar.bz2 chat-4cf6913c1c58847b69bd7a16f046d4bfc676bdb4.zip | |
Merge remote-tracking branch 'upstream/release-5.3' into release-5.3-daily-merge-20180904
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 a0733827a..5345fa0cf 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5007,6 +5007,10 @@ "translation": "We couldn't update the channel" }, { + "id": "store.sql_channel.update.archived_channel.app_error", + "translation": "You can not modify an archived channel" + }, + { "id": "store.sql_channel.update.exists.app_error", "translation": "A channel with that handle already exists" }, |