summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-03-08 12:10:31 -0800
committerCorey Hulen <corey@hulen.com>2016-03-08 12:10:31 -0800
commita1ec47eb780f6d244d1d3d50e6078f907e8b7fd7 (patch)
tree4c46ed31fff46c4b1adc0b29c3c90157348920d9 /i18n
parentcbf84c8beaa0896daaf82ecdb63f236da4d64c0e (diff)
parent5c29d4f64935d0516e9d72d1d8cc734bcf295a87 (diff)
downloadchat-a1ec47eb780f6d244d1d3d50e6078f907e8b7fd7.tar.gz
chat-a1ec47eb780f6d244d1d3d50e6078f907e8b7fd7.tar.bz2
chat-a1ec47eb780f6d244d1d3d50e6078f907e8b7fd7.zip
Merge pull request #2388 from mattermost/plt-1789
PLT-1789 Deleting posts with files now renames the file so that public links t…
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json20
1 files changed, 18 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index b7ebbb8b1..6ac5ce5c2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -456,8 +456,24 @@
"translation": "S3 is not supported for local storage export."
},
{
- "id": "api.export.write_file.app_error",
- "translation": "Unable to write to export file"
+ "id": "api.file.move_file.get_from_s3.app_error",
+ "translation": "Unable to get file from S3."
+ },
+ {
+ "id": "api.file.move_file.delete_from_s3.app_error",
+ "translation": "Unable to delete file from S3."
+ },
+ {
+ "id": "api.file.move_file.rename.app_error",
+ "translation": "Unable to move file locally."
+ },
+ {
+ "id": "api.file.move_file.configured.app_error",
+ "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+ },
+ {
+ "id": "api.file.file_upload.exceeds",
+ "translation": "File exceeds max image size."
},
{
"id": "api.file.file_upload.exceeds",