diff options
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/i18n/en.json b/i18n/en.json index 37639ba60..8457d6d3d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1815,14 +1815,14 @@ "translation": " uploaded one or more files in " }, { - "id": "api.post.send_notifications_and_forget.push_image_only_no_channel", - "translation": " uploaded one or more files" - }, - { "id": "api.post.send_notifications_and_forget.push_image_only_dm", "translation": " uploaded one or more files in a direct message" }, { + "id": "api.post.send_notifications_and_forget.push_image_only_no_channel", + "translation": " uploaded one or more files" + }, + { "id": "api.post.send_notifications_and_forget.push_in", "translation": " in " }, @@ -4191,6 +4191,10 @@ "translation": "Unable to find user on AD/LDAP server: " }, { + "id": "ent.migration.migratetosaml.email_already_used_by_other_user", + "translation": "Email already used by another SAML user." + }, + { "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file", "translation": "User not found in the users file." }, @@ -4199,10 +4203,6 @@ "translation": "Username already used by another Mattermost user." }, { - "id": "ent.migration.migratetosaml.email_already_used_by_other_user", - "translation": "Email already used by another SAML user." - }, - { "id": "ent.saml.attribute.app_error", "translation": "SAML login was unsuccessful because one of the attributes is incorrect. Please contact your System Administrator." }, @@ -4979,10 +4979,6 @@ "translation": "Site URL must be a valid URL and start with http:// or https://" }, { - "id": "model.config.is_valid.websocket_url.app_error", - "translation": "Websocket URL must be a valid URL and start with ws:// or wss://" - }, - { "id": "model.config.is_valid.site_url_email_batching.app_error", "translation": "Unable to enable email batching when SiteURL isn't set." }, @@ -5051,6 +5047,10 @@ "translation": "Invalid value for webserver connection security." }, { + "id": "model.config.is_valid.websocket_url.app_error", + "translation": "Websocket URL must be a valid URL and start with ws:// or wss://" + }, + { "id": "model.config.is_valid.write_timeout.app_error", "translation": "Invalid value for write timeout." }, |