diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-17 08:37:11 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-17 08:37:11 -0400 |
| commit | 927c2dbfecaad12f28d294fe9575b660d19293b9 (patch) | |
| tree | 4939aaabf8c69194dad0a59ef651d7824251805b | |
| parent | be07d634645ac1f095f7d4bec182a604075c6138 (diff) | |
| parent | 226e31fd7bdc7934f3a9be84fdfe0623d2c65bb2 (diff) | |
| download | chat-927c2dbfecaad12f28d294fe9575b660d19293b9.tar.gz chat-927c2dbfecaad12f28d294fe9575b660d19293b9.tar.bz2 chat-927c2dbfecaad12f28d294fe9575b660d19293b9.zip | |
Merge pull request #2459 from ZBoxApp/server-es-locs
Added Missing es server locs and sort by id
| -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 0c32d8dc3..5e7cd2957 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3076,14 +3076,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." }, |