diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-28 10:35:27 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-28 10:35:27 -0400 |
| commit | c180cdbd1cba584c6e74cae7042de2290b51feb6 (patch) | |
| tree | 19002d12a212d0bcc0e09d31410df548b93d77ef /i18n | |
| parent | 7225abddeefb569f1f2da739211d7797b63814a2 (diff) | |
| parent | c37d153ffb276e501660133de836a61eec25e544 (diff) | |
| download | chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.gz chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.tar.bz2 chat-c180cdbd1cba584c6e74cae7042de2290b51feb6.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 37a199582..d631e7e1d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2823,6 +2823,22 @@ "translation": "[{{ .SiteName }}] You joined {{ .ServerURL }}" }, { + "id": "api.templates.deactivate_subject", + "translation": "[{{ .SiteName }}] Your account at {{ .ServerURL }} has been deactivated" + }, + { + "id": "api.templates.deactivate_body.title", + "translation": "Your account has been deactivated at {{ .ServerURL }}" + }, + { + "id": "api.templates.deactivate_body.info", + "translation": "You deactivated your account on {{ .SiteURL }}.<br>If this change wasn't initiated by you or you want to reactivate your account, contact your system administrator." + }, + { + "id": "api.user.send_deactivate_email_and_forget.failed.error", + "translation": "Failed to send the deactivate account email successfully" + }, + { "id": "api.user.activate_mfa.email_and_ldap_only.app_error", "translation": "MFA is not available for this account type" }, @@ -3147,6 +3163,10 @@ "translation": "You do not have the appropriate permissions" }, { + "id": "api.user.update_active.not_enable.app_error", + "translation": "You cannot deactivate yourself because this feature is not enabled. Please contact your System Administrator." + }, + { "id": "api.user.update_mfa.not_available.app_error", "translation": "MFA not configured or available on this server" }, |