diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:13:29 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:13:29 -0500 |
commit | 3da5df3c90f5888a3490881957befabb37c308d5 (patch) | |
tree | a99a74d6b858d73624c06f85e393acbe97c90586 /i18n | |
parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
parent | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (diff) | |
download | chat-3da5df3c90f5888a3490881957befabb37c308d5.tar.gz chat-3da5df3c90f5888a3490881957befabb37c308d5.tar.bz2 chat-3da5df3c90f5888a3490881957befabb37c308d5.zip |
Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge
Diffstat (limited to 'i18n')
-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 21f0661cc..de910fca8 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2199,10 +2199,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." }, @@ -2703,6 +2699,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" }, @@ -7299,10 +7299,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" }, @@ -7319,10 +7315,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" }, |