summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2016-03-11 10:48:43 -0500
committerJoramWilander <jwawilander@gmail.com>2016-03-11 10:48:43 -0500
commitfb9a6c76113e5913d2ad7edb595a05e8567a3e85 (patch)
treedab8e91d1c294e70054a1fadbb0cdef3e393bb80 /i18n
parentf7156fdb3a4b5d5c35a5d394047e349f04dd2a10 (diff)
downloadchat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.tar.gz
chat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.tar.bz2
chat-fb9a6c76113e5913d2ad7edb595a05e8567a3e85.zip
Auto-create account if team allows sign-up from login page and oauth account doesn't exist
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json6
-rw-r--r--i18n/es.json2
-rw-r--r--i18n/pt.json4
3 files changed, 8 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json
index bc33fc019..6a36e9084 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3068,7 +3068,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 4c0c1fd03..3d111931d 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 8e45d5eaf..a76900a2b 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -3052,7 +3052,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."
},
{
@@ -3591,4 +3591,4 @@
"id": "web.watcher_fail.error",
"translation": "Falha ao adicionar diretório observador %v"
}
-] \ No newline at end of file
+]