diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-05-12 08:00:28 -0400 |
| commit | 9d109b070037951fcd0832b785eba8a3db9a157c (patch) | |
| tree | 5d109da2e9e088f16eff0ad1421876a3d3da412e /i18n/en.json | |
| parent | b1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff) | |
| parent | a21a06afd9907e9911dcb166d902cba9f405c7cb (diff) | |
| download | chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2 chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip | |
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index a3889765b..3974243f1 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1030,6 +1030,10 @@ "translation": "Unable to create emoji. An error occurred when trying to encode the GIF image." }, { + "id": "api.file.attachments.disabled.app_error", + "translation": "File attachments have been disabled on this server." + }, + { "id": "api.file.get_file.public_disabled.app_error", "translation": "Public links have been disabled by the system administrator" }, @@ -1054,10 +1058,6 @@ "translation": "Unable to get info for file. File storage is not configured." }, { - "id": "api.file.attachments.disabled.app_error", - "translation": "File attachments have been disabled on this server." - }, - { "id": "api.file.get_public_file_old.storage.app_error", "translation": "Unable to get file. Image storage is not configured." }, |