summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2017-08-15 12:22:22 -0300
committerSaturnino Abril <saturnino.abril@gmail.com>2017-08-15 23:22:22 +0800
commit7d3719b5c67327da42822071e001b38f0a3f8db7 (patch)
tree4fccd8c4b3db8b3ba1f8660f6a24249fc2459dc6 /webapp/i18n/en.json
parent8e646763e71b548991cb262a227e097f06daa758 (diff)
downloadchat-7d3719b5c67327da42822071e001b38f0a3f8db7.tar.gz
chat-7d3719b5c67327da42822071e001b38f0a3f8db7.tar.bz2
chat-7d3719b5c67327da42822071e001b38f0a3f8db7.zip
translations PR 20170814 (#7210)
Diffstat (limited to 'webapp/i18n/en.json')
-rwxr-xr-xwebapp/i18n/en.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b74c049b4..dd0237769 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -463,12 +463,12 @@
"admin.image.amazonS3RegionDescription": "AWS region you selected for creating your S3 bucket.",
"admin.image.amazonS3RegionExample": "E.g.: \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
- "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.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:",