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.json15
1 files changed, 11 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index b37b7a5d5..72733c60b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -282,7 +282,7 @@
"admin.files.storage": "Storage",
"admin.general.configuration": "Configuration",
"admin.general.localization": "Localization",
- "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+ "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
"admin.general.localization.availableLocalesTitle": "Available Languages:",
"admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
"admin.general.localization.clientLocaleTitle": "Default Client Language:",
@@ -919,6 +919,7 @@
"channel_flow.channel": "Channel",
"channel_flow.create": "Create {term}",
"channel_flow.group": "Group",
+ "channel_flow.handleTooShort": "Channel URL must be 2 or more lowercase alphanumeric characters",
"channel_flow.invalidName": "Invalid Channel Name",
"channel_flow.set_url_title": "Set {term} URL",
"channel_header.channel": "Channel",
@@ -1041,6 +1042,9 @@
"create_comment.files": "Files uploading",
"create_post.comment": "Comment",
"create_post.post": "Post",
+ "create_post.shortcutsNotSupported": "Keyboard shortcuts are not supported on your device.",
+ "flag_post.flag": "Flag for follow up",
+ "flag_post.unflag": "Unflag",
"create_post.tutorialTip": "<h4>Sending Messages</h4><p>Type here to write a message and press <strong>Enter</strong> to post it.</p><p>Click the <strong>Attachment</strong> button to upload an image or a file.</p>",
"create_post.write": "Write a message...",
"create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our <a href='/static/help/terms.html'>Terms of Service</a> and <a href='/static/help/privacy.html'>Privacy Policy</a>. If you do not agree, you cannot use {siteName}.",
@@ -1097,7 +1101,7 @@
"edit_post.save": "Save",
"email_signup.address": "Email Address",
"email_signup.createTeam": "Create Team",
- "email_signup.emailError": "Please enter a valid email address",
+ "email_signup.emailError": "Please enter a valid email address.",
"email_signup.find": "Find my teams",
"email_verify.almost": "{siteName}: You are almost done",
"email_verify.failed": " Failed to send verification email.",
@@ -1534,6 +1538,9 @@
"suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
"suggestion.mention.channel": "Notifies everyone in the channel",
"suggestion.mention.here": "Notifies everyone in the channel and online",
+ "suggestion.mention.members": "Channel Members",
+ "suggestion.mention.nonmembers": "Not in Channel",
+ "suggestion.mention.special": "Special Mentions",
"suggestion.search.private": "Private Groups",
"suggestion.search.public": "Public Channels",
"team_export_tab.download": "download",
@@ -1771,7 +1778,7 @@
"user.settings.push_notification.onlyMentions": "For mentions and direct messages",
"user.settings.security.close": "Close",
"user.settings.security.currentPassword": "Current Password",
- "user.settings.security.currentPasswordError": "Please enter your current password",
+ "user.settings.security.currentPasswordError": "Please enter your current password.",
"user.settings.security.emailPwd": "Email and Password",
"user.settings.security.gitlab": "GitLab",
"user.settings.security.google": "Google",
@@ -1803,7 +1810,7 @@
"user.settings.security.passwordErrorUppercaseSymbol": "Your password must contain at least {min} characters made up of at least one uppercase letter and at least one symbol (e.g. \"~!@#$%^&*()\").",
"user.settings.security.passwordGitlabCantUpdate": "Login occurs through GitLab. Password cannot be updated.",
"user.settings.security.passwordLdapCantUpdate": "Login occurs through LDAP. Password cannot be updated.",
- "user.settings.security.passwordMatchError": "The new passwords you entered do not match",
+ "user.settings.security.passwordMatchError": "The new passwords you entered do not match.",
"user.settings.security.passwordMinLength": "Invalid minimum length, cannot show preview.",
"user.settings.security.retypePassword": "Retype New Password",
"user.settings.security.saml": "SAML",