summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorThomas Balthazar <tbalthazar@users.noreply.github.com>2016-07-05 21:37:21 +0200
committerHarrison Healey <harrisonmhealey@gmail.com>2016-07-05 15:37:21 -0400
commitf4dd8e579639637057e8717067bb0627d9eb1de3 (patch)
tree7c5795636c052e35849df95a07778bae38f54969 /webapp/i18n/en.json
parent71bd413b257afd376e1e6fb4c229f70bdb9381c1 (diff)
downloadchat-f4dd8e579639637057e8717067bb0627d9eb1de3.tar.gz
chat-f4dd8e579639637057e8717067bb0627d9eb1de3.tar.bz2
chat-f4dd8e579639637057e8717067bb0627d9eb1de3.zip
PLT-1316/PLT-3280 Change client-side max file size limit (#3354)
* Change client-side max file size limit It now relies on the value set in config.json. Re-enable and tweak the max file size setting in system console. * Update file upload error message
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json7
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 3677ec80e..95f267740 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -265,6 +265,9 @@
"admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
+ "admin.image.maxFileSizeTitle": "Maximum File Size:",
+ "admin.image.maxFileSizeExample": "50",
+ "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
"admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
"admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
"admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
@@ -941,8 +944,8 @@
"file_attachment.download": "Download",
"file_info_preview.size": "Size ",
"file_info_preview.type": "File type ",
- "file_upload.fileAbove": "File above {max}MB could not be uploaded: {filename}",
- "file_upload.filesAbove": "Files above {max}MB could not be uploaded: {filenames}",
+ "file_upload.fileAbove": "File above {max}MB cannot be uploaded: {filename}",
+ "file_upload.filesAbove": "Files above {max}MB cannot be uploaded: {filenames}",
"file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.",
"file_upload.pasted": "Image Pasted at ",
"filtered_user_list.any_team": "All Users",