diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-15 14:30:57 -0400 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-15 14:30:57 -0400 |
commit | accf612d25dc4fbd569da7f262e67720bac8d736 (patch) | |
tree | dd181f99dbadc38af5c0f10bb3c95ce4ace67d1f /i18n/zh-CN.json | |
parent | e3edc2c121c64541a71e3fc540b902b19e5466dd (diff) | |
parent | d1ed79a66c7930020b7fda046a11050f5890c84e (diff) | |
download | chat-accf612d25dc4fbd569da7f262e67720bac8d736.tar.gz chat-accf612d25dc4fbd569da7f262e67720bac8d736.tar.bz2 chat-accf612d25dc4fbd569da7f262e67720bac8d736.zip |
Merge remote-tracking branch 'origin/release-4.8' into t0merge48master
Diffstat (limited to 'i18n/zh-CN.json')
-rw-r--r-- | i18n/zh-CN.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index f476b48ed..43d3fde87 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -2308,11 +2308,11 @@ }, { "id": "api.team.move_channel.post.error", - "translation": "发送频道作用消息失败" + "translation": "发送频道移动消息失败。" }, { "id": "api.team.move_channel.success", - "translation": "This channel has been moved to this team from %v." + "translation": "此频道已从 %v 移至此团队。" }, { "id": "api.team.permanent_delete_team.attempting.warn", @@ -3080,7 +3080,7 @@ }, { "id": "api.webhook.incoming.error", - "translation": "Could not decode the multipart payload of incoming webhook." + "translation": "无法解码传入的 webhook 混合数据。" }, { "id": "api.webhook.init.debug", @@ -4904,7 +4904,7 @@ }, { "id": "model.config.is_valid.message_export.export_type.app_error", - "translation": "Message export job ExportFormat must be one of either 'actiance' or 'globalrelay'" + "translation": "消息导出任务 ExportFormat 必须为 'actiance' 或 'globalrelay'" }, { "id": "model.config.is_valid.message_export.file_location.app_error", @@ -4916,7 +4916,7 @@ }, { "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" + "translation": "消息导出任务 GlobalRelayEmailAddress 必须为有效的电子邮箱地址" }, { "id": "model.config.is_valid.password_length.app_error", |