summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json12
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a723b68c7..c3bb3112f 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -72,8 +72,8 @@
"add_emoji.imageRequired": "An image is required for the emoji",
"add_emoji.name": "Name",
"add_emoji.name.help": "Choose a name for your emoji made of up to 64 characters consisting of lowercase letters, numbers, and the symbols '-' and '_'.",
- "add_emoji.nameRequired": "A name is required for the emoji",
"add_emoji.nameInvalid": "An emoji's name can only contain numbers, letters, and the symbols '-' and '_'.",
+ "add_emoji.nameRequired": "A name is required for the emoji",
"add_emoji.nameTaken": "This name is already in use by a system emoji. Please choose another name.",
"add_emoji.preview": "Preview",
"add_emoji.preview.sentence": "This is a sentence with {image} in it.",
@@ -150,9 +150,9 @@
"admin.customization.customEmoji": "Custom Emoji",
"admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".",
"admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:",
+ "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationAll": "Allow everyone to create custom emoji",
"admin.customization.restrictCustomEmojiCreationDesc": "Restrict the creation of custom emoji to certain users.",
- "admin.customization.restrictCustomEmojiCreationAdmin": "Allow System and Team Admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationSystemAdmin": "Only allow System Admins to create custom emoji",
"admin.customization.restrictCustomEmojiCreationTitle": "Restrict Custom Emoji Creation:",
"admin.customization.support": "Legal and Support",
@@ -273,14 +273,14 @@
"admin.image.amazonS3RegionExample": "Ex \"us-east-1\"",
"admin.image.amazonS3RegionTitle": "Amazon S3 Region:",
"admin.image.amazonS3SecretDescription": "Obtain this credential from your Amazon EC2 administrator.",
- "admin.image.maxFileSizeTitle": "Maximum File Size:",
- "admin.image.maxFileSizeExample": "50",
- "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
"admin.image.amazonS3SecretExample": "Ex \"jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY\"",
"admin.image.amazonS3SecretTitle": "Amazon S3 Secret Access Key:",
"admin.image.localDescription": "Directory to which files and images are written. If blank, defaults to ./data/.",
"admin.image.localExample": "Ex \"./data/\"",
"admin.image.localTitle": "Local Storage Directory:",
+ "admin.image.maxFileSizeDescription": "Maximum file size for message attachments in megabytes. Caution: Verify server memory can support your setting choice. Large file sizes increase the risk of server crashes and failed uploads due to network interruptions.",
+ "admin.image.maxFileSizeExample": "50",
+ "admin.image.maxFileSizeTitle": "Maximum File Size:",
"admin.image.previewHeightDescription": "Maximum height of preview image (\"0\": Sets to auto-size). Updating this value changes how preview images render in future, but does not change images created in the past.",
"admin.image.previewHeightExample": "Ex \"0\"",
"admin.image.previewHeightTitle": "Image Preview Height:",
@@ -299,9 +299,9 @@
"admin.image.shareDescription": "Allow users to share public links to files and images.",
"admin.image.shareTitle": "Enable Public File Links: ",
"admin.image.storeAmazonS3": "Amazon S3",
+ "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
"admin.image.storeLocal": "Local File System",
"admin.image.storeTitle": "File Storage System:",
- "admin.image.storeDescription": "Storage system where files and image attachments are saved.<br /><br />Selecting \"Amazon S3\" enables fields to enter your Amazon credentials and bucket details.<br /><br />Selecting \"Local File System\" enables the field to specify a local file directory.",
"admin.image.thumbHeightDescription": "Height of thumbnails generated from uploaded images. Updating this value changes how thumbnail images render in future, but does not change images created in the past.",
"admin.image.thumbHeightExample": "Ex \"100\"",
"admin.image.thumbHeightTitle": "Attachment Thumbnail Height:",