diff options
| author | Tejay Cardon <tejay.cardon@gmail.com> | 2017-08-08 08:15:20 -0600 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-08-08 10:15:20 -0400 |
| commit | 2105b10ccdff58a6d1986776c37fc179249f369f (patch) | |
| tree | 2f9192a951ce39c3c2dceaf14d48fb0b756d331f /webapp/i18n | |
| parent | 7683e751ab7c8dee28e8ec8f2dcf3edd1048fe29 (diff) | |
| download | chat-2105b10ccdff58a6d1986776c37fc179249f369f.tar.gz chat-2105b10ccdff58a6d1986776c37fc179249f369f.tar.bz2 chat-2105b10ccdff58a6d1986776c37fc179249f369f.zip | |
FIXES PLT-6648 Add support for Server Side Encryption on S3 (#6467)
Help from Jason Blais on wording
Update storage_settings.jsx
Update en.json
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 509499c1d..6f87e540b 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -466,6 +466,9 @@ "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.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.", "admin.image.amazonS3SecretExample": "E.g.: \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"", "admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:", |