summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json108
1 files changed, 54 insertions, 54 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 7dcc351f1..821f5c946 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1296,14 +1296,6 @@
"translation": "You joined {{ .TeamDisplayName }}"
},
{
- "id": "api.user.update_mfa.not_available.app_error",
- "translation": "MFA not configured or available on this server"
- },
- {
- "id": "api.user.generate_mfa_qr.not_available.app_error",
- "translation": "MFA not configured or available on this server"
- },
- {
"id": "api.user.add_direct_channels_and_forget.failed.error",
"translation": "Failed to add direct channel preferences for user user_id=%s, team_id=%s, err=%v"
},
@@ -1340,16 +1332,16 @@
"translation": "Unsupported OAuth service provider"
},
{
- "id": "api.user.check_user_mfa.not_available.app_error",
- "translation": "MFA is not configured or supported on this server"
+ "id": "api.user.check_user_login_attempts.too_many.app_error",
+ "translation": "Your account is locked because of too many failed password attempts. Please reset your password."
},
{
"id": "api.user.check_user_mfa.bad_code.app_error",
"translation": "Invalid MFA token."
},
{
- "id": "api.user.check_user_login_attempts.too_many.app_error",
- "translation": "Your account is locked because of too many failed password attempts. Please reset your password."
+ "id": "api.user.check_user_mfa.not_available.app_error",
+ "translation": "MFA is not configured or supported on this server"
},
{
"id": "api.user.check_user_password.invalid.app_error",
@@ -1436,6 +1428,10 @@
"translation": "LDAP not available on this server"
},
{
+ "id": "api.user.generate_mfa_qr.not_available.app_error",
+ "translation": "MFA not configured or available on this server"
+ },
+ {
"id": "api.user.get_authorization_code.unsupported.app_error",
"translation": "Unsupported OAuth service provider"
},
@@ -1580,6 +1576,10 @@
"translation": "You do not have the appropriate permissions"
},
{
+ "id": "api.user.update_mfa.not_available.app_error",
+ "translation": "MFA not configured or available on this server"
+ },
+ {
"id": "api.user.update_password.context.app_error",
"translation": "Update password failed because context user_id did not match props user_id"
},
@@ -1760,72 +1760,72 @@
"translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
},
{
- "id": "ent.mfa.license_disable.app_error",
- "translation": "Your license does not support using multi-factor authentication"
+ "id": "ent.ldap.do_login.bind_admin_user.app_error",
+ "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
},
{
- "id": "ent.mfa.generate_qr_code.create_code.app_error",
- "translation": "Error generating QR code"
+ "id": "ent.ldap.do_login.invalid_password.app_error",
+ "translation": "Invalid Password"
},
{
- "id": "ent.mfa.generate_qr_code.save_secret.app_error",
- "translation": "Error saving the MFA secret"
+ "id": "ent.ldap.do_login.licence_disable.app_error",
+ "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
},
{
- "id": "ent.mfa.activate.authenticate.app_error",
- "translation": "Error attempting to authenticate MFA token"
+ "id": "ent.ldap.do_login.matched_to_many_users.app_error",
+ "translation": "Username given matches multiple users"
},
{
- "id": "ent.mfa.activate.bad_token.app_error",
- "translation": "Invalid MFA token"
+ "id": "ent.ldap.do_login.search_ldap_server.app_error",
+ "translation": "Failed to search LDAP server"
},
{
- "id": "ent.mfa.activate.save_active.app_erro",
- "translation": "Unable to update MFA active status for the user"
+ "id": "ent.ldap.do_login.unable_to_connect.app_error",
+ "translation": "Unable to connect to LDAP server"
},
{
- "id": "ent.mfa.deactivate.save_active.app_erro",
- "translation": "Unable to update MFA active status for the user"
+ "id": "ent.ldap.do_login.unable_to_create_user.app_error",
+ "translation": "Credentials valid but unable to create user."
},
{
- "id": "ent.mfa.deactivate.save_secret.app_error",
- "translation": "Error clearing the MFA secret"
+ "id": "ent.ldap.do_login.user_not_registered.app_error",
+ "translation": "User not registered on LDAP server"
},
{
- "id": "ent.mfa.validate_token.authenticate.app_error",
- "translation": "Error trying to authenticate MFA token"
+ "id": "ent.mfa.activate.authenticate.app_error",
+ "translation": "Error attempting to authenticate MFA token"
},
{
- "id": "ent.ldap.do_login.bind_admin_user.app_error",
- "translation": "Unable to bind to LDAP server. Check BindUsername and BindPassword."
+ "id": "ent.mfa.activate.bad_token.app_error",
+ "translation": "Invalid MFA token"
},
{
- "id": "ent.ldap.do_login.invalid_password.app_error",
- "translation": "Invalid Password"
+ "id": "ent.mfa.activate.save_active.app_erro",
+ "translation": "Unable to update MFA active status for the user"
},
{
- "id": "ent.ldap.do_login.licence_disable.app_error",
- "translation": "LDAP functionality disabled by current license. Please contact your system administrator about upgrading your enterprise license."
+ "id": "ent.mfa.deactivate.save_active.app_erro",
+ "translation": "Unable to update MFA active status for the user"
},
{
- "id": "ent.ldap.do_login.matched_to_many_users.app_error",
- "translation": "Username given matches multiple users"
+ "id": "ent.mfa.deactivate.save_secret.app_error",
+ "translation": "Error clearing the MFA secret"
},
{
- "id": "ent.ldap.do_login.search_ldap_server.app_error",
- "translation": "Failed to search LDAP server"
+ "id": "ent.mfa.generate_qr_code.create_code.app_error",
+ "translation": "Error generating QR code"
},
{
- "id": "ent.ldap.do_login.unable_to_connect.app_error",
- "translation": "Unable to connect to LDAP server"
+ "id": "ent.mfa.generate_qr_code.save_secret.app_error",
+ "translation": "Error saving the MFA secret"
},
{
- "id": "ent.ldap.do_login.unable_to_create_user.app_error",
- "translation": "Credentials valid but unable to create user."
+ "id": "ent.mfa.license_disable.app_error",
+ "translation": "Your license does not support using multi-factor authentication"
},
{
- "id": "ent.ldap.do_login.user_not_registered.app_error",
- "translation": "User not registered on LDAP server"
+ "id": "ent.mfa.validate_token.authenticate.app_error",
+ "translation": "Error trying to authenticate MFA token"
},
{
"id": "manaultesting.get_channel_id.no_found.debug",
@@ -3192,14 +3192,6 @@
"translation": "We couldn't update the team name"
},
{
- "id": "store.sql_user.update_mfa_secret.app_error",
- "translation": "We encountered an error updating the user's MFA secret"
- },
- {
- "id": "store.sql_user.update_mfa_active.app_error",
- "translation": "We encountered an error updating the user's MFA active status"
- },
- {
"id": "store.sql_user.analytics_unique_user_count.app_error",
"translation": "We couldn't get the unique user count"
},
@@ -3320,6 +3312,14 @@
"translation": "We couldn't update the last_ping_at"
},
{
+ "id": "store.sql_user.update_mfa_active.app_error",
+ "translation": "We encountered an error updating the user's MFA active status"
+ },
+ {
+ "id": "store.sql_user.update_mfa_secret.app_error",
+ "translation": "We encountered an error updating the user's MFA secret"
+ },
+ {
"id": "store.sql_user.update_password.app_error",
"translation": "We couldn't update the user password"
},