diff options
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index f231ccac2..783aea863 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -180,9 +180,9 @@ "admin.email.smtpUsernameTitle": "SMTP Username:", "admin.email.testing": "Testing...", "admin.false": "false", - "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.", - "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.", + "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", + "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.", "admin.gitab.clientSecretDescription": "Obtain this value via the instructions above for logging into GitLab.", "admin.gitlab.EnableHtmlDesc": "<ol><li>Log in to your GitLab account and go to Profile Settings -> Applications.</li><li>Enter Redirect URIs \"<your-mattermost-url>/login/gitlab/complete\" (example: http://localhost:8065/login/gitlab/complete) and \"<your-mattermost-url>/signup/gitlab/complete\". </li><li>Then use \"Secret\" and \"Id\" fields from GitLab to complete the options below.</li><li>Complete the Endpoint URLs below. </li></ol>", "admin.gitlab.authDescription": "Enter https://<your-gitlab-url>/oauth/authorize (example https://example.com:3000/oauth/authorize). Make sure you use HTTP or HTTPS in your URL depending on your server configuration.", @@ -719,11 +719,11 @@ "channel_notifications.sendDesktop": "Send desktop notifications", "channel_notifications.unreadInfo": "The channel name is bolded in the sidebar when there are unread messages. Selecting \"Only for mentions\" will bold the channel only when you are mentioned.", "channel_select.placeholder": "--- Select a channel ---", + "channel_switch_modal.dm": "(Direct Message)", "channel_switch_modal.help": "Type channel name. Use ↑↓ to browse, TAB to select, ↵ to confirm, ESC to dismiss", "channel_switch_modal.not_found": "No matches found.", "channel_switch_modal.submit": "Switch", "channel_switch_modal.title": "Switch Channels", - "channel_switch_modal.dm": "(Direct Message)", "choose_auth_page.emailCreate": "Create new team with email address", "choose_auth_page.find": "Find my teams", "choose_auth_page.gitlabCreate": "Create new team with GitLab Account", @@ -840,15 +840,15 @@ "email_verify.verified": "{siteName} Email Verified", "email_verify.verifiedBody": "<p>Your email has been verified! Click <a href={url}>here</a> to log in.</p>", "email_verify.verifyFailed": "Failed to verify your email.", + "error.not_found.link_message": "Back to Mattermost", + "error.not_found.message": "The page you were trying to reach does not exist", + "error.not_found.title": "Page not found", + "error.not_supported.message": "Private browsing is not supported", + "error.not_supported.title": "Browser not supported", "error_bar.expired": "Enterprise license has expired; you have 15 days from expiry to renew the license, please contact commercial@mattermost.com for details", "error_bar.expiring": "The Enterprise license is expiring on {date}. To renew your license, please contact commercial@mattermost.com", "error_bar.past_grace": "Enterprise license has expired, please contact your System Administrator for details", "error_bar.preview_mode": "Preview Mode: Email notifications have not been configured", - "error.not_found.title": "Page not found", - "error.not_found.message": "The page you were trying to reach does not exist", - "error.not_found.link_message": "Back to Mattermost", - "error.not_supported.title": "Browser not supported", - "error.not_supported.message": "Private browsing is not supported", "file_attachment.download": "Download", "file_info_preview.size": "Size ", "file_info_preview.type": "File type ", @@ -968,13 +968,13 @@ "login.ldapUsernameLower": "LDAP username", "login.noAccount": "Don't have an account? ", "login.noEmail": "Please enter your email", - "login.noUsername": "Please enter your username", - "login.noLdapUsername": "Please enter your {ldapUsername}", - "login.noEmailUsername": "Please enter your email or username", "login.noEmailLdapUsername": "Please enter your email or {ldapUsername}", - "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}", + "login.noEmailUsername": "Please enter your email or username", "login.noEmailUsernameLdapUsername": "Please enter your email, username or {ldapUsername}", + "login.noLdapUsername": "Please enter your {ldapUsername}", "login.noPassword": "Please enter your password", + "login.noUsername": "Please enter your username", + "login.noUsernameLdapUsername": "Please enter your username or {ldapUsername}", "login.on": "on {siteName}", "login.or": "or", "login.password": "Password", @@ -1295,13 +1295,13 @@ "user.settings.developer.register": "Register New Application", "user.settings.developer.thirdParty": "Open to register a new third-party application", "user.settings.developer.title": "Developer Settings", - "user.settings.display.collapseOn": "On", - "user.settings.display.collapseOff": "Off", - "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.", - "user.settings.display.collapseDisplay": "Auto Collapse Previews", "user.settings.display.channelDisplayTitle": "Channel Display Mode", "user.settings.display.channeldisplaymode": "Select the width of the center channel.", "user.settings.display.clockDisplay": "Clock Display", + "user.settings.display.collapseDesc": "Toggle whether to automatically collapse all image previews.", + "user.settings.display.collapseDisplay": "Auto Collapse Previews", + "user.settings.display.collapseOff": "Off", + "user.settings.display.collapseOn": "On", "user.settings.display.fixedWidthCentered": "Fixed width, centered", "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.", "user.settings.display.fontTitle": "Display Font", @@ -1410,11 +1410,11 @@ "user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"", "user.settings.notifications.wordsTrigger": "Words that trigger mentions", "user.settings.push_notification.allActivity": "For all activity", + "user.settings.push_notification.disabled": "Disabled by system administrator", + "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.", "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.", "user.settings.push_notification.off": "Off", "user.settings.push_notification.onlyMentions": "For mentions and direct messages", - "user.settings.push_notification.disabled": "Disabled by system administrator", - "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.", "user.settings.security.close": "Close", "user.settings.security.currentPassword": "Current Password", "user.settings.security.currentPasswordError": "Please enter your current password", |