From 2e5617c29be69637acd384e85f795a0b343bec8d Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Thu, 21 Apr 2016 22:37:01 -0700 Subject: PLT-2057 User as a first class object (#2648) * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding client side unit test * Cleaning up the clint side tests * Fixing msg * Adding more client side unit tests * Adding more using tests * Adding last bit of client side unit tests and adding make cmd * Fixing bad merge * Fixing libraries * Updating to new client side API * Fixing borken unit test * Fixing unit tests * ugg...trying to beat gofmt * ugg...trying to beat gofmt * Cleaning up remainder of the server side routes * Adding inital load api * Increased coverage of webhook unit tests (#2660) * Adding loading ... to root html * Fixing bad merge * Removing explicit content type so superagent will guess corectly (#2685) * Fixing merge and unit tests * Adding create team UI * Fixing signup flows * Adding LDAP unit tests and enterprise unit test helper (#2702) * Add the ability to reset MFA from the commandline (#2706) * Fixing compliance unit tests * Fixing client side tests * Adding open server to system console * Moving websocket connection * Fixing unit test * Fixing unit tests * Fixing unit tests * Adding nickname and more LDAP unit tests (#2717) * Adding join open teams * Cleaning up all TODOs in the code * Fixing web sockets * Removing unused webockets file * PLT-2533 Add the ability to reset a user's MFA from the system console (#2715) * Add the ability to reset a user's MFA from the system console * Add client side unit test for adminResetMfa * Reorganizing authentication to fix LDAP error message (#2723) * Fixing failing unit test * Initial upgrade db code * Adding upgrade script * Fixing upgrade script after running on core * Update OAuth and Claim routes to work with user model changes (#2739) * Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740) * Fixing team invite ldap login call (#2741) * Fixing bluebar and some img stuff * Fix all the different file upload web utils (#2743) * Fixing invalid session redirect (#2744) * Redirect on bad channel name (#2746) * Fixing a bunch of issue and removing dead code * Patch to fix error message on leave channel (#2747) * Setting EnableOpenServer to false by default * Fixing config * Fixing upgrade * Fixing reported bugs * Bug fixes for PLT-2057 * PLT-2563 Redo password recovery to use a database table (#2745) * Redo password recovery to use a database table * Update reset password audits * Split out admin and user reset password APIs to be separate * Delete password recovery when user is permanently deleted * Consolidate password resetting into a single function * Removed private channels as an option for outgoing webhooks (#2752) * PLT-2577/PLT-2552 Fixes for backstage (#2753) * Added URL to incoming webhook list * Fixed client functions for adding/removing integrations * Disallowed slash commands without trigger words * Fixed clientside handling of errors on AddCommand page * Minor auth cleanup (#2758) * Changed EditPostModal to just close if you save without making any changes (#2759) * Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756) * Fixed url in channel info modal (#2755) * Fixing reported issues * Moving to version 3 of the apis * Fixing command unit tests (#2760) * Adding team admins * Fixing DM issue * Fixing eslint error * Properly set EditPostModal's originalText state in all cases (#2762) * Update client config check to assume features is defined if server is licensed (#2772) * Fixing url link * Fixing issue with websocket crashing when sending messages to different teams --- webapp/i18n/en.json | 104 +++++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 62 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index da69aba74..6d4f4c287 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -271,6 +271,9 @@ "admin.ldap.lastnameAttrDesc": "The attribute in the LDAP server that will be used to populate the last name of users in Mattermost.", "admin.ldap.lastnameAttrEx": "Ex \"sn\"", "admin.ldap.lastnameAttrTitle": "Last Name Attribute:", + "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the LDAP server that will be used to populate the nickname of users in Mattermost.", + "admin.ldap.nicknameAttrEx": "Ex \"nickname\"", + "admin.ldap.nicknameAttrTitle": "Nickname Attribute:", "admin.ldap.noLicense": "

Note:

LDAP is an enterprise feature. Your current license does not support LDAP. Click here for information and pricing on enterprise licenses.

", "admin.ldap.portDesc": "The port Mattermost will use to connect to the LDAP server. Default is 389.", "admin.ldap.portEx": "Ex \"389\"", @@ -526,10 +529,18 @@ "admin.team.uploading": "Uploading..", "admin.team.userCreationDescription": "When false, the ability to create accounts is disabled. The create account button displays error when pressed.", "admin.team.userCreationTitle": "Enable User Creation: ", + "admin.team.openServerDescription": "When true, anyone can signup for a user account on this server without the need to be invited.", + "admin.team.openServerTitle": "Enable Open Server: ", "admin.team_analytics.activeUsers": "Active Users With Posts", "admin.team_analytics.totalPosts": "Total Posts", "admin.userList.title": "Users for {team}", "admin.userList.title2": "Users for {team} ({count})", + "admin.user_item.resetMfa": "Remove MFA", + "admin.user_item.mfaYes": ", MFA: Yes", + "admin.user_item.mfaNo": ", MFA: No", + "admin.user_item.authServiceNotEmail": ", Sign-in Method: {service}", + "admin.user_item.authServiceEmail": ", Sign-in Method: Email", + "admin.user_item.emailTitle": "Email: {email}", "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.", "admin.user_item.confirmDemoteRoleTitle": "Confirm demotion from System Admin role", "admin.user_item.confirmDemotion": "Confirm Demotion", @@ -721,7 +732,7 @@ "choose_auth_page.noSignup": "No sign-up methods configured, please contact your system administrator.", "claim.account.noEmail": "No email specified", "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account", - "claim.email_to_ldap.enterPwd": "Enter the password for your {team} {site} email account", + "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account", "claim.email_to_ldap.ldapId": "LDAP ID", "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.", "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.", @@ -732,7 +743,7 @@ "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP", "claim.email_to_ldap.switchTo": "Switch account to LDAP", "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP", - "claim.email_to_oauth.enterPwd": "Enter the password for your {team} {site} account", + "claim.email_to_oauth.enterPwd": "Enter the password for your {site} account", "claim.email_to_oauth.pwd": "Password", "claim.email_to_oauth.pwdError": "Please enter your password.", "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account", @@ -741,7 +752,7 @@ "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}", "claim.ldap_to_email.confirm": "Confirm Password", "claim.ldap_to_email.email": "You will use the email {email} to login", - "claim.ldap_to_email.enterLdapPwd": "Enter your LDAP password for your {team} {site} email account", + "claim.ldap_to_email.enterLdapPwd": "Enter your {ldapPassword} for your {site} email account", "claim.ldap_to_email.enterPwd": "Enter a new password for your email account", "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.", "claim.ldap_to_email.ldapPwd": "LDAP Password", @@ -758,7 +769,7 @@ "claim.oauth_to_email.pwdNotMatch": "Password do not match.", "claim.oauth_to_email.switchTo": "Switch {type} to email and password", "claim.oauth_to_email.title": "Switch {type} Account to Email", - "claim.oauth_to_email_newPwd": "Enter a new password for your {team} {site} account", + "claim.oauth_to_email.enterNewPwd": "Enter a new password for your {site} account", "confirm_modal.cancel": "Cancel", "create_comment.addComment": "Add a comment...", "create_comment.comment": "Add Comment", @@ -841,8 +852,8 @@ "general_tab.includeDirDesc": "Including this team will display the team name from the Team Directory section of the Home Page, and provide a link to the sign-in page.", "general_tab.includeDirTitle": "Include this team in the Team Directory", "general_tab.no": "No", - "general_tab.openInviteDesc": "When allowed, a link to account creation will be included on the sign-in page of this team and allow any visitor to sign-up.", - "general_tab.openInviteTitle": "Allow anyone to sign-up from login page", + "general_tab.openInviteDesc": "When allowed, a link to this team will be including on the landing page allowing anyone with an account to join this team.", + "general_tab.openInviteTitle": "Allow anyone to join this team", "general_tab.regenerate": "Re-Generate", "general_tab.required": "This field is required", "general_tab.teamName": "Team Name", @@ -866,6 +877,7 @@ "installed_integrations.regenToken": "Regen Token", "installed_integrations.search": "Search Integrations", "installed_integrations.token": "Token: {token}", + "installed_integrations.url": "URL: {url}", "installed_outgoing_webhooks.add": "Add Outgoing Webhook", "installed_outgoing_webhooks.header": "Outgoing Webhooks", "integrations.command.description": "Slash commands send events to external integrations", @@ -913,6 +925,7 @@ "ldap_signup.team_error": "Please enter a team name", "loading_screen.loading": "Loading", "login.changed": " Sign-in method changed successfully", + "login.passwordChanged": " Password updated successfully", "login.create": "Create one now", "login.createTeam": "Create a new team", "login.find": "Find your other teams", @@ -1111,7 +1124,9 @@ "sidebar_right_menu.report": "Report a Problem", "sidebar_right_menu.teamLink": "Get Team Invite Link", "sidebar_right_menu.teamSettings": "Team Settings", - "signup_team.choose": "Choose a Team", + "signup_team.no_teams": "You do not appear to be a member of any team. Please ask your administrator for an invite, join an open team if one exists or possibly create a new team.", + "signup_team.choose": "Teams you are a member of: ", + "signup_team.join_open": "Open teams you can join: ", "signup_team.createTeam": "Or Create a Team", "signup_team.disabled": "Team creation has been disabled. Please contact an administrator for access.", "signup_team.noTeams": "There are no teams included in the Team Directory and team creation has been disabled.", @@ -1119,6 +1134,8 @@ "signup_team_complete.completed": "You've already completed the signup process for this invitation or this invitation has expired.", "signup_team_confirm.checkEmail": "Please check your email: {email}
Your email contains a link to set up your team", "signup_team_confirm.title": "Sign up Complete", + "signup_user_completed.no_open_server": "This server does not allow open signups. Please speak with your Administrator to receive an invitation.", + "signup_user_completed.invalid_invite": "The invite link was invalid. Please speak with your Administrator to receive an invitation.", "signup_user_completed.choosePwd": "Choose your password", "signup_user_completed.chooseUser": "Choose your username", "signup_user_completed.create": "Create Account", @@ -1181,61 +1198,23 @@ "team_settings_modal.generalTab": "General", "team_settings_modal.importTab": "Import", "team_settings_modal.title": "Team Settings", - "team_signup_display_name.back": "Back to previous step", - "team_signup_display_name.charLength": "Name must be 4 or more characters up to a maximum of 15", - "team_signup_display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.", - "team_signup_display_name.next": "Next", - "team_signup_display_name.required": "This field is required", - "team_signup_display_name.teamName": "Team Name", - "team_signup_email.address": "Email Address", - "team_signup_email.different": "Please use a different email than the one used at signup", - "team_signup_email.validEmail": "Please enter a valid email address", - "team_signup_password.agreement": "By proceeding to create your account and use {siteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {siteName}.", - "team_signup_password.back": "Back to previous step", - "team_signup_password.choosePwd": "Choose your password", - "team_signup_password.creating": "Creating team...", - "team_signup_password.email": "Email", - "team_signup_password.finish": "Finish", - "team_signup_password.hint": "Passwords must contain {min} to {max} characters. Your password will be strongest if it contains a mix of symbols, numbers, and upper and lowercase characters.", - "team_signup_password.passwordError": "Please enter at least {chars} characters", - "team_signup_password.selectPassword": "Select a password that you'll use to login with your email address:", - "team_signup_password.yourPassword": "Your password", - "team_signup_send_invites.addInvitation": "Add Invitation", - "team_signup_send_invites.back": "Back to previous step", - "team_signup_send_invites.disabled": "Email is currently disabled for your team, and emails cannot be sent. Contact your system administrator to enable email and email invitations.", - "team_signup_send_invites.forNow": "for now.", - "team_signup_send_invites.next": "Next", - "team_signup_send_invites.prefer": "if you prefer, you can invite team members later
and ", - "team_signup_send_invites.skip": "skip this step ", - "team_signup_send_invites.title": "Invite Team Members", - "team_signup_url.back": "Back to previous step", - "team_signup_url.charLength": "Name must be 4 or more characters up to a maximum of 15", - "team_signup_url.hint": "
  • Short and memorable is best
  • Use lowercase letters, numbers and dashes
  • Must start with a letter and can't end in a dash
    • ", - "team_signup_url.next": "Next", - "team_signup_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.", - "team_signup_url.required": "This field is required", - "team_signup_url.taken": "URL is taken or contains a reserved word", - "team_signup_url.teamUrl": "Team URL", - "team_signup_url.unavailable": "This URL is unavailable. Please try another.", - "team_signup_url.webAddress": "Choose the web address of your new team:", - "team_signup_username.back": "Back to previous step", - "team_signup_username.chooseUsername": "Choose your username", - "team_signup_username.hint": "Usernames must begin with a letter and contain between {min} to {max} characters made up of lowercase letters, numbers, and the symbols '.', '-' and '_'", - "team_signup_username.invalid": "Username must begin with a letter, and contain between {min} to {max} characters in total, which may be numbers, lowercase letters, or any of the symbols '.', '-', or '_'", - "team_signup_username.memorable": "Select a memorable username that makes it easy for teammates to identify you:", - "team_signup_username.next": "Next", - "team_signup_username.reserved": "This username is reserved, please choose a new one.", - "team_signup_username.username": "Your username", - "team_signup_welcome.address": "Email Address", - "team_signup_welcome.admin": "Your account will administer the new team site.
    You can add other administrators later.", - "team_signup_welcome.confirm": "Please confirm your email address:", - "team_signup_welcome.different": "Use a different email", - "team_signup_welcome.instead": "Use this instead", - "team_signup_welcome.lets": "Let's set up your new team", - "team_signup_welcome.storageError": "This service requires local storage to be enabled. Please enable it or exit private browsing.", - "team_signup_welcome.validEmailError": "Please enter a valid email address", - "team_signup_welcome.welcome": "Welcome to:", - "team_signup_welcome.yes": "Yes, this address is correct", + "create_team.agreement": "By proceeding to create your account and use {siteName}, you agree to our Terms of Service and Privacy Policy. If you do not agree, you cannot use {siteName}.", + "create_team.display_name.teamName": "Team Name", + "create_team.display_name.nameHelp": "Name your team in any language. Your team name shows in menus and headings.", + "create_team.display_name.next": "Next", + "create_team.display_name.back": "Back to previous step", + "create_team.display_name.required": "This field is required", + "create_team.display_name.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.team_url.required": "This field is required", + "create_team.team_url.regex": "Use only lower case letters, numbers and dashes. Must start with a letter and can't end in a dash.", + "create_team.team_url.charLength": "Name must be 4 or more characters up to a maximum of 15", + "create_team.team_url.taken": "URL is taken or contains a reserved word", + "create_team.team_url.unavailable": "This URL is unavailable. Please try another.", + "create_team.team_url.teamUrl": "Team URL", + "create_team.team_url.webAddress": "Choose the web address of your new team:", + "create_team.team_url.hint": "
  • Short and memorable is best
  • Use lowercase letters, numbers and dashes
  • Must start with a letter and can't end in a dash
    • ", + "create_team.team_url.finish": "Finish", + "create_team.team_url.back": "Back to previous step", "textbox.bold": "**bold**", "textbox.edit": "Edit message", "textbox.help": "Help", @@ -1406,6 +1385,7 @@ "user.settings.security.currentPasswordError": "Please enter your current password", "user.settings.security.emailPwd": "Email and Password", "user.settings.security.gitlab": "GitLab SSO", + "user.settings.security.ldap": "LDAP", "user.settings.security.lastUpdated": "Last updated {date} at {time}", "user.settings.security.loginGitlab": "Login done through Gitlab", "user.settings.security.loginLdap": "Login done through LDAP", -- cgit v1.2.3-1-g7c22