From f968c56890bd84295672ee0d46cc846cac2dbd47 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 7 Sep 2017 00:02:42 +0800 Subject: 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. --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n') 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 documentation to learn more.", -- cgit v1.2.3-1-g7c22