diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:22:50 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-16 18:22:50 -0400 |
| commit | 08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c (patch) | |
| tree | ad1bd1cf64ccf8dc6e771f96e0616df0362f1f08 /i18n | |
| parent | 45eee993ea2e3aa230255253f71c08b223760a70 (diff) | |
| parent | fb9a6c76113e5913d2ad7edb595a05e8567a3e85 (diff) | |
| download | chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.tar.gz chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.tar.bz2 chat-08a12ac4f4d1131dfbcb9d7a3c732125a34d4f3c.zip | |
Merge pull request #2419 from mattermost/plt-2044
PLT-2044 Auto-create account if team allows sign-up from login page and oauth …
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 6 | ||||
| -rw-r--r-- | i18n/es.json | 2 | ||||
| -rw-r--r-- | i18n/pt.json | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index d16de7dbb..9b9f57fca 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3072,7 +3072,11 @@ "translation": "We encountered an error finding the account" }, { - "id": "store.sql_user.get_by_auth.app_error", + "id": "store.sql_user.get_by_auth.other.app_error", + "translation": "We encountered an error trying to find the account by authentication type." + }, + { + "id": "store.sql_user.get_by_auth.missing_account.app_error", "translation": "We couldn't find an existing account matching your authentication type for this team. This team may require an invite from the team owner to join." }, { diff --git a/i18n/es.json b/i18n/es.json index 93ffb2341..b86c1d868 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -3068,7 +3068,7 @@ "translation": "Encontramos un error buscando la cuenta" }, { - "id": "store.sql_user.get_by_auth.app_error", + "id": "store.sql_user.get_by_auth.missing_account.app_error", "translation": "No pudimos encontrar una cuenta existente que coincida con tu tipo de autenticación para este equipo. Es posible que necesites una invitación por parte del dueño del equipo para unirte." }, { diff --git a/i18n/pt.json b/i18n/pt.json index 29c8c58c7..19bf04a90 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -3068,7 +3068,7 @@ "translation": "Encontramos um erro ao procurar a conta" }, { - "id": "store.sql_user.get_by_auth.app_error", + "id": "store.sql_user.get_by_auth.missing_account.app_error", "translation": "Não foi possível encontrar uma conta correspondente ao seu tipo de autenticação para esta equipe. Esta equipe pode exigir um convite do dono da equipe para participar." }, { @@ -3607,4 +3607,4 @@ "id": "web.watcher_fail.error", "translation": "Falha ao adicionar diretório observador %v" } -]
\ No newline at end of file +] |