summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2016-04-21 22:37:01 -0700
committerCorey Hulen <corey@hulen.com>2016-04-21 22:37:01 -0700
commit2e5617c29be69637acd384e85f795a0b343bec8d (patch)
tree6b8bdae1e664013b97c2dda94985375abda91aa5 /i18n
parent5c755463ed3a4c74a383fb4460b5be02d8868481 (diff)
downloadchat-2e5617c29be69637acd384e85f795a0b343bec8d.tar.gz
chat-2e5617c29be69637acd384e85f795a0b343bec8d.tar.bz2
chat-2e5617c29be69637acd384e85f795a0b343bec8d.zip
PLT-2057 User as a first class object (#2648)
* Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding TeamMember to system * Fixing all unit tests on the backend * Fixing merge conflicts * Fixing merge conflict * Adding javascript unit tests * Adding client side unit test * Cleaning up the clint side tests * Fixing msg * Adding more client side unit tests * Adding more using tests * Adding last bit of client side unit tests and adding make cmd * Fixing bad merge * Fixing libraries * Updating to new client side API * Fixing borken unit test * Fixing unit tests * ugg...trying to beat gofmt * ugg...trying to beat gofmt * Cleaning up remainder of the server side routes * Adding inital load api * Increased coverage of webhook unit tests (#2660) * Adding loading ... to root html * Fixing bad merge * Removing explicit content type so superagent will guess corectly (#2685) * Fixing merge and unit tests * Adding create team UI * Fixing signup flows * Adding LDAP unit tests and enterprise unit test helper (#2702) * Add the ability to reset MFA from the commandline (#2706) * Fixing compliance unit tests * Fixing client side tests * Adding open server to system console * Moving websocket connection * Fixing unit test * Fixing unit tests * Fixing unit tests * Adding nickname and more LDAP unit tests (#2717) * Adding join open teams * Cleaning up all TODOs in the code * Fixing web sockets * Removing unused webockets file * PLT-2533 Add the ability to reset a user's MFA from the system console (#2715) * Add the ability to reset a user's MFA from the system console * Add client side unit test for adminResetMfa * Reorganizing authentication to fix LDAP error message (#2723) * Fixing failing unit test * Initial upgrade db code * Adding upgrade script * Fixing upgrade script after running on core * Update OAuth and Claim routes to work with user model changes (#2739) * Fixing perminant deletion. Adding ability to delete all user and the entire database (#2740) * Fixing team invite ldap login call (#2741) * Fixing bluebar and some img stuff * Fix all the different file upload web utils (#2743) * Fixing invalid session redirect (#2744) * Redirect on bad channel name (#2746) * Fixing a bunch of issue and removing dead code * Patch to fix error message on leave channel (#2747) * Setting EnableOpenServer to false by default * Fixing config * Fixing upgrade * Fixing reported bugs * Bug fixes for PLT-2057 * PLT-2563 Redo password recovery to use a database table (#2745) * Redo password recovery to use a database table * Update reset password audits * Split out admin and user reset password APIs to be separate * Delete password recovery when user is permanently deleted * Consolidate password resetting into a single function * Removed private channels as an option for outgoing webhooks (#2752) * PLT-2577/PLT-2552 Fixes for backstage (#2753) * Added URL to incoming webhook list * Fixed client functions for adding/removing integrations * Disallowed slash commands without trigger words * Fixed clientside handling of errors on AddCommand page * Minor auth cleanup (#2758) * Changed EditPostModal to just close if you save without making any changes (#2759) * Renamed client -> Client in async_client.jsx and fixed eslint warnings (#2756) * Fixed url in channel info modal (#2755) * Fixing reported issues * Moving to version 3 of the apis * Fixing command unit tests (#2760) * Adding team admins * Fixing DM issue * Fixing eslint error * Properly set EditPostModal's originalText state in all cases (#2762) * Update client config check to assume features is defined if server is licensed (#2772) * Fixing url link * Fixing issue with websocket crashing when sending messages to different teams
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json50
-rw-r--r--i18n/es.json20
-rw-r--r--i18n/fr.json16
-rw-r--r--i18n/pt.json20
4 files changed, 45 insertions, 61 deletions
diff --git a/i18n/en.json b/i18n/en.json
index a135e04be..990db5277 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1313,11 +1313,11 @@
},
{
"id": "api.templates.singin_change_email.body.info",
- "translation": "You updated your sign-in method for {{.TeamDisplayName}} on {{ .TeamURL }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
+ "translation": "You updated your sign-in method for on {{ .SiteName }} to {{.Method}}.<br>If this change wasn't initiated by you, please contact your system administrator."
},
{
"id": "api.templates.singin_change_email.subject",
- "translation": "You updated your sign-in method for {{.TeamDisplayName}} on {{ .SiteName }}"
+ "translation": "You updated your sign-in method on {{ .SiteName }}"
},
{
"id": "api.templates.verify_body.button",
@@ -1425,11 +1425,11 @@
},
{
"id": "api.user.create_oauth_user.already_attached.app_error",
- "translation": "Team {{.DisplayName}} already has a user with the email address attached to your {{.Service}} account"
+ "translation": "An existing user is already attached to your {{.Service}} account"
},
{
"id": "api.user.create_oauth_user.already_used.app_error",
- "translation": "This {{.Service}} account has already been used to sign up for team {{.DisplayName}}"
+ "translation": "This {{.Service}} account has already been used to sign up"
},
{
"id": "api.user.create_oauth_user.create.app_error",
@@ -1452,6 +1452,10 @@
"translation": "Could not add user initial to default profile picture"
},
{
+ "id": "api.user.create_user.no_open_server",
+ "translation": "This server does not allow open signups. Please speak with your Administrator to receive an invitation."
+ },
+ {
"id": "api.user.create_user.accepted_domain.app_error",
"translation": "The email you provided does not belong to an accepted domain. Please contact your administrator or sign up with a different email."
},
@@ -1760,6 +1764,14 @@
"translation": "Incoming webhooks have been disabled by the system admin."
},
{
+ "id": "api.webhook.create_outgoing.not_open.app_error",
+ "translation": "Outgoing webhooks can only be created for public channels."
+ },
+ {
+ "id": "api.webhook.create_outgoing.permissions.app_error",
+ "translation": "Inappropriate permissions to create outcoming webhook."
+ },
+ {
"id": "api.webhook.create_outgoing.disabled.app_error",
"translation": "Outgoing webhooks have been disabled by the system admin."
},
@@ -2112,6 +2124,18 @@
"translation": "Invalid type"
},
{
+ "id": "model.team_member.is_valid.team_id.app_error",
+ "translation": "Invalid team id"
+ },
+ {
+ "id": "model.team_member.is_valid.user_id.app_error",
+ "translation": "Invalid user id"
+ },
+ {
+ "id": "model.team_member.is_valid.role.app_error",
+ "translation": "Invalid role"
+ },
+ {
"id": "model.channel.is_valid.update_at.app_error",
"translation": "Update at must be a valid time"
},
@@ -2944,6 +2968,22 @@
"translation": "We encountered an error updating the channel member"
},
{
+ "id": "store.sql_team.save_member.exists.app_error",
+ "translation": "A team member with that id already exists"
+ },
+ {
+ "id": "store.sql_team.save_member.save.app_error",
+ "translation": "We couldn't save the team member"
+ },
+ {
+ "id": "store.sql_team.get_members.app_error",
+ "translation": "We couldn't get the team members"
+ },
+ {
+ "id": "store.sql_team.remove_member.app_error",
+ "translation": "We couldn't remove the team member"
+ },
+ {
"id": "store.sql_command.analytics_command_count.app_error",
"translation": "We couldn't count the commands"
},
@@ -3237,7 +3277,7 @@
},
{
"id": "store.sql_session.remove_all_sessions_for_team.app_error",
- "translation": "We couldn't remove all the sessions for the team"
+ "translation": "We couldn't remove all the sessions"
},
{
"id": "store.sql_session.save.app_error",
diff --git a/i18n/es.json b/i18n/es.json
index 7686e2b88..26378b148 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -1312,14 +1312,6 @@
"translation": "Configuración del equipo en {{ .SiteName }}"
},
{
- "id": "api.templates.singin_change_email.body.info",
- "translation": "Haz actualizado el método con el que inicias sesión en {{.TeamURL}} para el equipo {{.TeamDisplayName}} por {{.Method}}.<br>Si este cambio no fue realizado por ti, por favor contacta a un administrador del sistema."
- },
- {
- "id": "api.templates.singin_change_email.subject",
- "translation": "Cambio del método de inicio de sesión para {{.TeamDisplayName}} en {{ .SiteName }}"
- },
- {
"id": "api.templates.verify_body.button",
"translation": "Confirmar Correo"
},
@@ -1424,14 +1416,6 @@
"translation": "OAuth para {{.Service}} no está disponible en este servidor"
},
{
- "id": "api.user.create_oauth_user.already_attached.app_error",
- "translation": "El Equipo {{.DisplayName}} ya tiene un usuario con esta dirección de correo asociada a tu cuenta de {{.Service}}"
- },
- {
- "id": "api.user.create_oauth_user.already_used.app_error",
- "translation": "Esta cuenta de {{.Service}} ya fue utilizada para registrarse en el equipo {{.DisplayName}}"
- },
- {
"id": "api.user.create_oauth_user.create.app_error",
"translation": "No se pudo crear el usuario basandose en el objeto de {{.Service}}"
},
@@ -3236,10 +3220,6 @@
"translation": "No pudimos remover la sesión"
},
{
- "id": "store.sql_session.remove_all_sessions_for_team.app_error",
- "translation": "No pudimos remover todas las sesiones para el equipo"
- },
- {
"id": "store.sql_session.save.app_error",
"translation": "No pudimos guardar la sesión"
},
diff --git a/i18n/fr.json b/i18n/fr.json
index eaf16fbdd..488b49b69 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -1236,14 +1236,6 @@
"translation": "Paramétrage Équipe {{ .SiteName }}"
},
{
- "id": "api.templates.singin_change_email.body.info",
- "translation": "Vous avez mis à jour la méthode de connexion de {{.TeamDisplayName}} sur {{.TeamURL}} pour {{.Method}}.<br>Si cette modification n'a pas été effectuée par vous, veuillez prendre contact avec votre administrateur système."
- },
- {
- "id": "api.templates.singin_change_email.subject",
- "translation": "Vous avez mis à jour la méthode de connexion de {{.TeamDisplayName}} sur {{ .SiteName }}"
- },
- {
"id": "api.templates.verify_body.button",
"translation": "Vérifier l'adresse électronique"
},
@@ -1340,14 +1332,6 @@
"translation": "{{.Service}} oauth non disponible sur ce serveur"
},
{
- "id": "api.user.create_oauth_user.already_attached.app_error",
- "translation": "L'équipe {{.DisplayName}} dispose déjà d'un utilisateur ayant la même adresse électronique que celle attachée à votre compte {{.Service}}"
- },
- {
- "id": "api.user.create_oauth_user.already_used.app_error",
- "translation": "Ce compte {{.Service}} a déjà été utilisé pour pour se connecter à l'équipe {{.DisplayName}}"
- },
- {
"id": "api.user.create_oauth_user.create.app_error",
"translation": "Impossible de créer un utilisateur à partir du user object {{.Service}}"
},
diff --git a/i18n/pt.json b/i18n/pt.json
index b9e0c49c9..635e254d1 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1312,14 +1312,6 @@
"translation": "{{ .SiteName }} Configuração da Equipe"
},
{
- "id": "api.templates.singin_change_email.body.info",
- "translation": "Você atualizou seu método de login para {{.TeamDisplayName}} no {{ .TeamURL }} para {{.Method}}.<br>Se esta mudança não foi iniciada por você, por favor entre em contato com o administrador do sistema."
- },
- {
- "id": "api.templates.singin_change_email.subject",
- "translation": "Você atualizou seu método de login para {{.TeamDisplayName}} em {{ .SiteName }}"
- },
- {
"id": "api.templates.verify_body.button",
"translation": "Verificar Email"
},
@@ -1424,14 +1416,6 @@
"translation": "{{.Service}} oauth não disponível neste servidor"
},
{
- "id": "api.user.create_oauth_user.already_attached.app_error",
- "translation": "Equipe {{.DisplayName}} já tem um usuário com o endereço de email anexado a sua conta {{.Service}}"
- },
- {
- "id": "api.user.create_oauth_user.already_used.app_error",
- "translation": "Está conta {{.Service}} já foi utilizada para se inscrever na equipe {{.DisplayName}}"
- },
- {
"id": "api.user.create_oauth_user.create.app_error",
"translation": "Não foi possível criar o usuário fora do {{.Service}} do objeto de usuário"
},
@@ -3236,10 +3220,6 @@
"translation": "Não foi possível remover a sessão"
},
{
- "id": "store.sql_session.remove_all_sessions_for_team.app_error",
- "translation": "Não foi possível remover todas as sessões para a equipe"
- },
- {
"id": "store.sql_session.save.app_error",
"translation": "Não foi possível salvar a sessão"
},