diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-17 09:51:45 -0700 |
| commit | 5273559ca101d8ae4a55104f18081ab011e5068c (patch) | |
| tree | f152b638101b224ffc59ed000e384b651915266a /i18n | |
| parent | 074f15f761ff50388b58e35e8354c139c06a807e (diff) | |
| parent | 128204b47a9ff89bf2bea97cd21d3b8892151e69 (diff) | |
| download | chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.gz chat-5273559ca101d8ae4a55104f18081ab011e5068c.tar.bz2 chat-5273559ca101d8ae4a55104f18081ab011e5068c.zip | |
Fixing merge
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/en.json | 8 | ||||
| -rw-r--r-- | i18n/es.json | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index a37773460..f14e0bbe0 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3132,14 +3132,14 @@ "translation": "We encountered an error finding the account" }, { - "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." }, { + "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_username.app_error", "translation": "We couldn't find an existing account matching your username 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 4622a1b12..894bf0c18 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -3080,6 +3080,10 @@ "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." }, { + "id": "store.sql_user.get_by_auth.other.app_error", + "translation": "Encontramos un error tratando de identificar la cuenta con este tipo de autenticación." + }, + { "id": "store.sql_user.get_by_username.app_error", "translation": "No pudimos encontrar una cuenta existente que coincida con tu nombre de usuario para este equipo. Es posible que necesites una invitación por parte del dueño del equipo para unirte." }, |