diff options
author | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
---|---|---|
committer | Jonathan Fritz <jonathan.fritz@mattermost.com> | 2018-02-13 08:39:56 -0500 |
commit | 18fa32567b56584c6e24da2ae68814d5bf8ece6f (patch) | |
tree | 311ab6a3918ba64ac665286f15950b32dc1b1dba /i18n | |
parent | 7b2861de3a09cf00d00b0872cc537d54302c4bfa (diff) | |
parent | 8b79f5d49cb8d4877e136a76e515edef41ef6f28 (diff) | |
download | chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.gz chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.tar.bz2 chat-18fa32567b56584c6e24da2ae68814d5bf8ece6f.zip |
Merge branch 'release-4.7' into XYZ-110
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json index de910fca8..4365a44fb 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -132,6 +132,10 @@ "translation": "Unable to upload file. File is too large." }, { + "id": "api.api.init.parsing_templates.debug", + "translation": "Parsing server templates at %v" + }, + { "id": "api.api.init.parsing_templates.error", "translation": "Failed to parse server templates %v" }, @@ -3131,14 +3135,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" }, @@ -4863,14 +4859,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." }, @@ -7095,10 +7083,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" }, @@ -7175,6 +7159,10 @@ "translation": "Failed to create directory watcher %v" }, { + "id": "web.dir_fail.error", + "translation": "Failed in directory watcher %v" + }, + { "id": "web.do_load_channel.error", "translation": "Error in getting users profile for id=%v forcing logout" }, @@ -7279,10 +7267,18 @@ "translation": "Parsing templates at %v" }, { + "id": "web.parsing_templates.error", + "translation": "Failed to parse templates %v" + }, + { "id": "web.post_permalink.app_error", "translation": "Invalid Post ID" }, { + "id": "web.reparse_templates.info", + "translation": "Re-parsing templates because of modified file %v" + }, + { "id": "web.reset_password.expired_link.app_error", "translation": "The password reset link has expired" }, |