summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json50
1 files changed, 45 insertions, 5 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",