diff options
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index daa0434dc..9ed17cee2 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1307,8 +1307,8 @@ "find_team.submitError": "Please enter a valid email address", "flag_post.flag": "Flag for follow up", "flag_post.unflag": "Unflag", - "general_tab.chooseName": "Please choose a new name for your team", "general_tab.chooseDescription": "Please choose a new description for your team", + "general_tab.chooseName": "Please choose a new name for your team", "general_tab.codeDesc": "Click 'Edit' to regenerate Invite Code.", "general_tab.codeLongDesc": "The Invite Code is used as part of the URL in the team invitation link created by {getTeamInviteLink} in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.", "general_tab.codeTitle": "Invite Code", @@ -2156,8 +2156,8 @@ "user.settings.security.ldap": "AD/LDAP", "user.settings.security.loginGitlab": "Login done through GitLab", "user.settings.security.loginGoogle": "Login done through Google Apps", - "user.settings.security.loginOffice365": "Login done through Office 365", "user.settings.security.loginLdap": "Login done through AD/LDAP", + "user.settings.security.loginOffice365": "Login done through Office 365", "user.settings.security.loginSaml": "Login done through SAML", "user.settings.security.logoutActiveSessions": "View and Logout of Active Sessions", "user.settings.security.method": "Sign-in Method", @@ -2187,10 +2187,10 @@ "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.passwordGoogleCantUpdate": "Login occurs through Google Apps. Password cannot be updated.", - "user.settings.security.passwordOffice365CantUpdate": "Login occurs through Office 365. Password cannot be updated.", "user.settings.security.passwordLdapCantUpdate": "Login occurs through AD/LDAP. Password cannot be updated.", "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.passwordOffice365CantUpdate": "Login occurs through Office 365. Password cannot be updated.", "user.settings.security.passwordSamlCantUpdate": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.", "user.settings.security.retypePassword": "Retype New Password", "user.settings.security.saml": "SAML", |