diff options
author | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
commit | 901acc9703ae58b625b44e7abfd02333b9bab951 (patch) | |
tree | 1a8fc17a85544bc7b8064874923e2fe6e3f44354 /i18n/en.json | |
parent | 21afaf4bedcad578d4f876bb315d1072ccd296e6 (diff) | |
parent | 2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff) | |
download | chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.gz chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.bz2 chat-901acc9703ae58b625b44e7abfd02333b9bab951.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 134 |
1 files changed, 109 insertions, 25 deletions
diff --git a/i18n/en.json b/i18n/en.json index 549537735..bb906ae6c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -112,6 +112,18 @@ "translation": "Mattermost - Testing Email Settings" }, { + "id": "api.admin.test_s3.missing_s3_bucket", + "translation": "S3 Bucket is required" + }, + { + "id": "api.admin.test_s3.missing_s3_region", + "translation": "S3 Region is required" + }, + { + "id": "api.admin.test_s3.missing_s3_endpoint", + "translation": "S3 Endpoint is required" + }, + { "id": "api.admin.upload_brand_image.array.app_error", "translation": "Empty array under 'image' in request" }, @@ -1373,6 +1385,10 @@ "translation": "Unable to upload file. Header cannot be parsed." }, { + "id": "api.file.upload_file.incorrect_number_of_files.app_error", + "translation": "Unable to upload files. Incorrect number of files specified." + }, + { "id": "api.file.upload_file.large_image.app_error", "translation": "File above maximum dimensions could not be uploaded: {{.Filename}}" }, @@ -1812,11 +1828,15 @@ }, { "id": "api.post.send_notifications_and_forget.push_image_only", - "translation": " Uploaded one or more files in " + "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" + "translation": " uploaded one or more files in a direct message" }, { "id": "api.post.send_notifications_and_forget.push_in", @@ -2183,6 +2203,50 @@ "translation": "The number of running goroutines is over the health threshold %v of %v" }, { + "id": "api.team.set_team_icon.get_team.app_error", + "translation": "An error occurred getting the team" + }, + { + "id": "api.team.set_team_icon.storage.app_error", + "translation": "Unable to upload team icon. Image storage is not configured." + }, + { + "id": "api.team.set_team_icon.too_large.app_error", + "translation": "Unable to upload team icon. File is too large." + }, + { + "id": "api.team.set_team_icon.parse.app_error", + "translation": "Could not parse multipart form" + }, + { + "id": "api.team.set_team_icon.no_file.app_error", + "translation": "No file under 'image' in request" + }, + { + "id": "api.team.set_team_icon.array.app_error", + "translation": "Empty array under 'image' in request" + }, + { + "id": "api.team.set_team_icon.open.app_error", + "translation": "Could not open image file" + }, + { + "id": "api.team.set_team_icon.decode_config.app_error", + "translation": "Could not decode team icon metadata" + }, + { + "id": "api.team.set_team_icon.decode.app_error", + "translation": "Could not decode team icon" + }, + { + "id": "api.team.set_team_icon.encode.app_error", + "translation": "Could not encode team icon" + }, + { + "id": "api.team.set_team_icon.write_file.app_error", + "translation": "Could not save team icon" + }, + { "id": "api.team.add_user_to_team.added", "translation": "%v added to the team by %v." }, @@ -2303,6 +2367,14 @@ "translation": "%v left the team." }, { + "id": "api.team.move_channel.post.error", + "translation": "Failed to post channel move message." + }, + { + "id": "api.team.move_channel.success", + "translation": "This channel has been moved to this team from %v." + }, + { "id": "api.team.permanent_delete_team.attempting.warn", "translation": "Attempting to permanently delete team %v id=%v" }, @@ -2711,11 +2783,11 @@ "translation": "The signup link has expired" }, { - "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", + "id": "api.user.create_user.signup_link_invalid.app_error", "translation": "The signup link does not appear to be valid" }, { - "id": "api.user.create_user.signup_link_invalid.app_error", + "id": "api.user.create_user.signup_link_mismatched_invite_id.app_error", "translation": "The signup link does not appear to be valid" }, { @@ -3147,14 +3219,6 @@ "translation": "Cannot move a channel unless all its members are already members of the destination team." }, { - "id": "api.team.move_channel.success", - "translation": "This channel has been moved to this team from %v." - }, - { - "id": "api.team.move_channel.post.error", - "translation": "Failed to post channel move message." - }, - { "id": "app.channel.post_update_channel_purpose_message.post.error", "translation": "Failed to post channel purpose message" }, @@ -3660,7 +3724,7 @@ }, { "id": "app.plugin.disabled.app_error", - "translation": "Plugins have been disabled." + "translation": "Plugins have been disabled. Please check your logs for details." }, { "id": "app.plugin.extract.app_error", @@ -3711,6 +3775,10 @@ "translation": "Plugins and/or plugin uploads have been disabled." }, { + "id": "app.team.join_user_to_team.max_accounts.app_error", + "translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit." + }, + { "id": "app.user_access_token.disabled", "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details." }, @@ -4191,6 +4259,18 @@ "translation": "Unable to find user on AD/LDAP server: " }, { + "id": "ent.migration.migratetosaml.user_not_found_in_users_mapping_file", + "translation": "User not found in the users file." + }, + { + "id": "ent.migration.migratetosaml.username_already_used_by_other_user", + "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." }, @@ -4879,14 +4959,6 @@ "translation": "Message export job BatchSize must be a positive integer" }, { - "id": "model.config.is_valid.message_export.export_type.app_error", - "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" - }, - { - "id": "model.config.is_valid.message_export.global_relay_email_address.app_error", - "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address" - }, - { "id": "model.config.is_valid.message_export.daily_runtime.app_error", "translation": "Message export job DailyRuntime must be a 24-hour time stamp in the form HH:MM." }, @@ -4899,6 +4971,10 @@ "translation": "Message export job ExportFromTimestamp must be a timestamp (expressed in seconds since unix epoch). Only messages sent after this timestamp will be exported." }, { + "id": "model.config.is_valid.message_export.export_type.app_error", + "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" + }, + { "id": "model.config.is_valid.message_export.file_location.app_error", "translation": "Message export job FileLocation must be a writable directory that export data will be written to" }, @@ -4907,6 +4983,10 @@ "translation": "Message export job FileLocation must be a sub-directory of FileSettings.Directory" }, { + "id": "model.config.is_valid.message_export.global_relay_email_address.app_error", + "translation": "Message export job GlobalRelayEmailAddress must be set to a valid email address" + }, + { "id": "model.config.is_valid.password_length.app_error", "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}." }, @@ -4967,6 +5047,10 @@ "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." }, @@ -7131,10 +7215,6 @@ "translation": "Failed to authenticate on SMTP server" }, { - "id": "utils.mail.sendMail.attachments.write_error", - "translation": "Failed to write attachment to email" - }, - { "id": "utils.mail.new_client.helo.error", "translation": "Failed to to set the HELO to SMTP server %v" }, @@ -7143,6 +7223,10 @@ "translation": "Failed to open a connection to SMTP server %v" }, { + "id": "utils.mail.sendMail.attachments.write_error", + "translation": "Failed to write attachment to email" + }, + { "id": "utils.mail.send_mail.close.app_error", "translation": "Failed to close connection to SMTP server" }, |