summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-09-05 15:24:21 -0400
committerGitHub <noreply@github.com>2017-09-05 15:24:21 -0400
commit09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3 (patch)
treed540c42e07195d62c8555c05ca5e57becf5542a6 /webapp/i18n
parentcc289d70610ada2797c7a07dce013fd4d89bcc10 (diff)
downloadchat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.tar.gz
chat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.tar.bz2
chat-09f8267751c71bdb6d8ba2757a1e4ffe62ccf5c3.zip
PLT-7517 Added setting to enable tracing of Amazon S3 connections (#7349)
* PLT-7517 Added setting to enable tracing of Amazon S3 connections * Removed unnecessary placeholders on boolean settings * Added AmazonS3Trace to diagnostics * Updated AmazonS3Trace setting name in system console * Removing extra colon
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 635c619a3..f111c5dd5 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -479,14 +479,14 @@
"admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
"admin.image.amazonS3SSEDescription": "When true, encrypt files in Amazon S3 using server-side encryption with Amazon S3-managed keys. See <a href=\"https://about.mattermost.com/default-server-side-encryption\">documentation</a> to learn more.",
- "admin.image.amazonS3SSEExample": "E.g.: \"false\"",
"admin.image.amazonS3SSETitle": "Enable Server-Side Encryption for Amazon S3:",
"admin.image.amazonS3SSLDescription": "When false, allow insecure connections to Amazon S3. Defaults to secure connections only.",
- "admin.image.amazonS3SSLExample": "E.g.: \"true\"",
"admin.image.amazonS3SSLTitle": "Enable Secure Amazon S3 Connections:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3SecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
"admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
+ "admin.image.amazonS3TraceDescription": "(Development Mode) When true, log additional debugging information to the system logs.",
+ "admin.image.amazonS3TraceTitle": "Enable Amazon S3 Debugging:",
"admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
"admin.image.localExample": "E.g.: \"./data/\"",
"admin.image.localTitle": "Local Storage Directory:",