diff options
author | George Goldberg <george@gberg.me> | 2018-02-13 13:35:52 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-02-13 13:46:01 +0000 |
commit | 5c101253c5987743cf1b3a8fe68814d748070622 (patch) | |
tree | e2632505d051e7d15d6daf974ed8ac92095f82fe /i18n/en.json | |
parent | b7fc3d7d35ca4dd16097715a66463392a1dfaf0a (diff) | |
parent | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (diff) | |
download | chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.gz chat-5c101253c5987743cf1b3a8fe68814d748070622.tar.bz2 chat-5c101253c5987743cf1b3a8fe68814d748070622.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json index 76f3d7ea6..5befd9fc5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2203,10 +2203,6 @@ "translation": "The signup link has expired" }, { - "id": "api.team.create_team_from_signup.invalid_link.app_error", - "translation": "The signup link does not appear to be valid" - }, - { "id": "api.team.create_team_from_signup.unavailable.app_error", "translation": "This URL is unavailable. Please try another." }, @@ -2715,6 +2711,10 @@ "translation": "The signup link has expired" }, { + "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", + "translation": "The signup link does not appear to be valid" + }, + { "id": "api.user.create_user.signup_link_invalid.app_error", "translation": "The signup link does not appear to be valid" }, @@ -7331,10 +7331,6 @@ "translation": "Signup" }, { - "id": "web.signup_team_complete.invalid_link.app_error", - "translation": "The signup link does not appear to be valid" - }, - { "id": "web.signup_team_complete.link_expired.app_error", "translation": "The signup link has expired" }, @@ -7351,10 +7347,6 @@ "translation": "The signup link has expired" }, { - "id": "web.signup_user_complete.link_invalid.app_error", - "translation": "The signup link does not appear to be valid" - }, - { "id": "web.signup_user_complete.no_invites.app_error", "translation": "The team type doesn't allow open invites" }, |