diff options
| author | George Goldberg <george@gberg.me> | 2018-04-27 10:53:38 +0100 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-04-27 10:53:38 +0100 |
| commit | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (patch) | |
| tree | d9c5800bf168db532124db3c213c2607402894c6 /i18n/en.json | |
| parent | 7294644e9d74ca1512a730c597d61a97ccbcf10c (diff) | |
| parent | 7abd6176e99d3f82711af51f8d75b3142ab73758 (diff) | |
| download | chat-2386acb3ddabd8827e21b1862c338a8b13a25de6.tar.gz chat-2386acb3ddabd8827e21b1862c338a8b13a25de6.tar.bz2 chat-2386acb3ddabd8827e21b1862c338a8b13a25de6.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n/en.json')
| -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 65711a14b..804dfb57b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4687,6 +4687,10 @@ "translation": "Invalid user id" }, { + "id": "model.client.command.parse.app_error", + "translation": "Unable to parse incoming data" + }, + { "id": "model.client.connecting.app_error", "translation": "We encountered an error while connecting to the server" }, |