diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-06-15 11:05:43 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-15 11:05:43 -0400 |
commit | 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch) | |
tree | 71fa9b677ce72050dca3abc3c9243e6cf39e0278 /i18n/zh-CN.json | |
parent | c0a0065472c199166d32b052dd328b0212f5b693 (diff) | |
download | chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2 chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip |
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)
* Fix quick switcher for channels/users not stored locally (#6610)
* Fix button text on confirm mention modal (#6609)
* fix post delete permission of channel admin (#6608)
* open comment thread for the most recent reply-able message (#6605)
* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)
* Use mutex flag with yarn to prevent concurrent builds interfering
* Remove yarn mutex file with clean
* Minor bug fixes (#6615)
* PLT-6774 - Fixing color for offline icon
* PLT-6784 - Fixing status icon
* Fixing icon margin
* Updating caret position
* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)
* Fixing JS error (#6623)
* Minor bug fixes (#6622)
* PLT-6808 - Updating channel switcher on mobile
* PLT-6743 - Updating scrollbar styling
* Login instead of failing if user exists in OAuth sign-up flow (#6627)
* PLT-6802 Disable team switcher (#6626)
* Disable team switcher
* Fix ESLint errors
* PLT-6807 Ensured select teams page can scroll on iOS (#6630)
* Do not redirect from account switch pages on 401 (#6631)
* Fixing loadtest command and renaming to /test (#6624)
* PLT-6820 Update mattermost-redux dependency (#6632)
* translations PR 20170612 (#6629)
* Bump HTTP client timeout to 30 seconds (#6633)
* For team unreads return empty array instead of null (#6636)
* PLT-6831 Fix status modal localization IDs (#6637)
* Fix status modal localization IDs
* Update test snapshot
Diffstat (limited to 'i18n/zh-CN.json')
-rw-r--r-- | i18n/zh-CN.json | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index 41559d814..3f8ed9b4c 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -757,7 +757,7 @@ }, { "id": "api.command_shortcuts.msgs.reply", - "translation": "SHIFT+UP (in empty input field): Reply to the most recent message in the current channel\n" + "translation": "SHIFT+UP (在空输入栏):回复当前频道最新的消息\n" }, { "id": "api.command_shortcuts.msgs.reprint_next", @@ -773,7 +773,7 @@ }, { "id": "api.command_shortcuts.nav.direct_messages_menu", - "translation": "{{.CmdOrCtrl}}+SHIFT+K: Open direct messages menu\n" + "translation": "{{.CmdOrCtrl}}+SHIFT+K:打开私信菜单\n" }, { "id": "api.command_shortcuts.nav.header", @@ -801,7 +801,7 @@ }, { "id": "api.command_shortcuts.nav.switcher_team", - "translation": "{{.CmdOrCtrl}}+K:打开频道快速切换对话框\n" + "translation": "{{.CmdOrCtrl}}+ALT+K:打开团队快速切换对话框\n" }, { "id": "api.command_shortcuts.nav.unread_next", @@ -1463,7 +1463,7 @@ }, { "id": "api.opengraph.init.debug", - "translation": "Initializing open graph protocol api routes" + "translation": "正在初始化 open graph 协议 api 路由" }, { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", @@ -1981,7 +1981,7 @@ }, { "id": "api.system.go_routines", - "translation": "The number of running goroutines is over the health threshold %v of %v" + "translation": "运行中的 goroutine 数量 %v 已经超过健康界限 %v" }, { "id": "api.team.add_user_to_team.invalid_data.app_error", @@ -2749,7 +2749,7 @@ }, { "id": "api.user.upload_profile_user.decode_config.app_error", - "translation": "Could not save profile image. File does not appear to be a valid image." + "translation": "无法保存个人资料图片。文件不是有效的图片。" }, { "id": "api.user.upload_profile_user.encode.app_error", @@ -3909,19 +3909,19 @@ }, { "id": "model.config.is_valid.elastic_search.connection_url.app_error", - "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled." + "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search ConnectionUrl 设定。" }, { "id": "model.config.is_valid.elastic_search.enable_searching.app_error", - "translation": "Elastic Search IndexingEnabled setting must be set to true when Elastic Search SearchEnabled is set to true." + "translation": "当 Elastic Search SearchEnabled 设为是时必须设定 Elastic Search IndexingEnabled 为是。" }, { "id": "model.config.is_valid.elastic_search.password.app_error", - "translation": "Elastic Search Password setting must be provided when Elastic Search indexing is enabled." + "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 密码设定。" }, { "id": "model.config.is_valid.elastic_search.username.app_error", - "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled." + "translation": "当 Elastic Search 索引开启时必须提供 Elastic Search 用户名设定。" }, { "id": "model.config.is_valid.email_batching_buffer_size.app_error", @@ -6029,7 +6029,7 @@ }, { "id": "utils.mail.send_mail.from_address.app_error", - "translation": "Notification From Address setting is missing or invalid." + "translation": "缺少或无效的从寄件人地址通知设定。" }, { "id": "utils.mail.send_mail.msg.app_error", @@ -6045,7 +6045,7 @@ }, { "id": "utils.mail.send_mail.to_address.app_error", - "translation": "Notification To Address setting is missing or invalid." + "translation": "缺少或无效的通知到收件人地址设定。" }, { "id": "utils.mail.test.configured.error", |