summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-09-07 00:02:42 +0800
committerChris <ccbrown112@gmail.com>2017-09-06 11:02:42 -0500
commitf968c56890bd84295672ee0d46cc846cac2dbd47 (patch)
tree029b386ed8e351f35cac7bfbab79aaed97eeb72d /webapp/i18n
parent90da40b54c5f7b36a3936bee2901fc645cc8ef4c (diff)
downloadchat-f968c56890bd84295672ee0d46cc846cac2dbd47.tar.gz
chat-f968c56890bd84295672ee0d46cc846cac2dbd47.tar.bz2
chat-f968c56890bd84295672ee0d46cc846cac2dbd47.zip
Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387)
This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68. Move to 4.3. Will discuss more if validation is necessary.
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4ad2f6abf..91ebd13c6 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -475,7 +475,7 @@
"admin.image.amazonS3IdDescription": "Obtain this credential from your Amazon EC2 administrator.",
"admin.image.amazonS3IdExample": "E.g.: \"AKIADTOVBGERKLCBV\"",
"admin.image.amazonS3IdTitle": "Amazon S3 Access Key ID:",
- "admin.image.amazonS3RegionDescription": "(Optional) AWS region you selected when creating your S3 bucket. If no region is set, Mattermost attempts to get the appropriate region from AWS, or sets it to 'us-east-1' if none found.",
+ "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.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.",