diff --git a/zh-CN/legal.md b/zh-CN/legal.md
index 24b22d0b1..55c2a702b 100644
--- a/zh-CN/legal.md
+++ b/zh-CN/legal.md
@@ -1,20 +1,20 @@
---
layout: zh-CN/default
-title: Rust Legal Policies · Rust 程序设计语言
+title: Rust 法律政策 · Rust 程序设计语言
---
-# Copyright
+# 版权
-## Code
+## 代码
-Rust's [code](https://github.com/rust-lang/rust) is primarily distributed under
-the terms of both the MIT license and the Apache License (Version 2.0), with
-portions covered by various BSD-like licenses.
-See [LICENSE-APACHE](https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE),
-[LICENSE-MIT](https://github.com/rust-lang/rust/blob/master/LICENSE-MIT),
-and [COPYRIGHT](https://github.com/rust-lang/rust/blob/master/COPYRIGHT) for details.
+Rust 的[代码](https://github.com/rust-lang/rust)主要以
+ MIT 许可证和 Apache 许可证（版本 2.0）的条款分发，
+部分也受各种类 BSD 许可证覆盖。
+参阅 [LICENSE-APACHE](https://github.com/rust-lang/rust/blob/master/LICENSE-APACHE)、
+[LICENSE-MIT](https://github.com/rust-lang/rust/blob/master/LICENSE-MIT) 和
+[COPYRIGHT](https://github.com/rust-lang/rust/blob/master/COPYRIGHT) 了解详细信息。
-## Art
+## 艺术
The Rust and Cargo logos (bitmap and vector) are owned by Mozilla and
distributed under the terms of the
@@ -42,7 +42,7 @@ Variants of the Rust logo can be found at:
* [rust-logo-64x64.png](/logos/rust-logo-64x64.png)
* [rust-logo-blk.svg](/logos/rust-logo-blk.svg)
-# Trademark policy
+# 商标政策
The Rust and Cargo names and brands make it possible to say what is officially
part of the Rust community, and what isn't. So we're careful about where we
@@ -57,7 +57,7 @@ allowed and do not require permission; most commercial uses require
permission. In either case, the most important rule is that uses of the
trademarks cannot appear official or imply any endorsement by the Rust project.
-## The Rust trademarks
+## Rust 商标
The Rust programming language is an open source, community project governed by a
core team. It is also sponsored by the Mozilla Foundation ("Mozilla"), which
@@ -86,7 +86,7 @@ know they're getting the product produced by the Rust project and not someone
else's modified version. The trademark assures users and developers of the
quality and safety of the product they're using.
-## Using the trademarks
+## 使用商标
### Appearing official, affiliated, or endorsed
@@ -115,7 +115,7 @@ They may not be used:
- in ways that confuse the community as to whether the Rust programming language
is open source and free to use.
-### Uses that do not require explicit approval
+### 不需要明确批准的用途
There are a variety of uses that do not require explicit approval. **However, in all of the cases outlined below, you must ensure that use of the Rust trademarks does not appear official, as explained above.**
@@ -151,7 +151,7 @@ above uses, the **event cannot appear to be officially endorsed or run by the Ru
papers, books, and product packaging to refer to the Rust programming language
or the Rust project is allowed.
-### Uses that require explicit approval
+### 需要明确批准的用途
* Distributing a modified version of the Rust programming language or the Cargo
package manager and calling it Rust or Cargo requires explicit, written
@@ -165,34 +165,29 @@ long as (1) it is clearly communicated that the merchandise is not in any way an
official part of the Rust project and (2) it is clearly communicated whether
profits benefit the Rust project.
-* Using the Rust trademarks within another trademark requires written permission
-from the Rust core team except as described above.
+* 除上述事例外，在其他商标中使用 Rust 商标需要 Rust 核心团队的书面许可。
-## Notes
+## 备注
-If you have any doubts about whether your intended use of a Rust Trademark
-requires permission, please contact us at
+如果您就 Rust 商标的使用许可存有任何疑问，请与我们联系：
[trademark@rust-lang.org](mailto:trademark@rust-lang.org).
-This document was derived in part from the
-[Python Software Foundation Trademark Usage Policy](https://www.python.org/psf/trademarks/).
+本文档部分取自
+[Python 软件基金会商标使用政策](https://www.python.org/psf/trademarks/)。
-This document is not an official statement of Mozilla trademark policy, but
-serves to clarify Mozilla's trademark policy as it relates to Rust.
+本文件不是 Mozilla 商标政策的官方声明，而是用于澄清 Mozilla 就 Rust 相关的商标政策。
-## Helping Out
+## 帮助我们
-As a member of the Rust community, please keep an eye out for questionable uses
-of the Rust logo and "Rust" word mark. You can report potential misuse to
-[trademark@rust-lang.org](mailto:trademark@rust-lang.org). We will evaluate each case
-and take appropriate action.
+作为 Rust 社区的成员，请留意用途成疑的
+Rust 标志和“Rust”字样。您可以将潜在的滥用报告到
+[trademark@rust-lang.org](mailto:trademark@rust-lang.org)。我们将评估每个事例并采取适当的行动。
-Please do not approach users of the trademarks with a complaint. That should be
-left to Mozilla and its representatives.
+请不要接触被投诉的商标使用人。这应该留给 Mozilla 及其代表处理。
-Thanks!
+诚挚感谢！
-## License
+## 许可证
-Interested parties may adapt this document freely under the
-[Creative Commons CC0 license](https://creativecommons.org/publicdomain/zero/1.0/).
+有意者可以
+[创作共用 CC0 许可证](https://creativecommons.org/publicdomain/zero/1.0/) 自由调整本文档。
diff --git a/zh-CN/other-installers.md b/zh-CN/other-installers.md
index 4fad95f40..6dfb08908 100644
--- a/zh-CN/other-installers.md
+++ b/zh-CN/other-installers.md
@@ -13,40 +13,31 @@ title: 其他安装方法 · Rust 程序设计语言
## 您应该使用哪个安装程序？
-Rust 在许多平台上运行，并且有很多方法来安装 Rust 。
-如果您想要安装 Rust 最简单，推荐的方法，
-然后参照主要的[安装页面][installation page]上的说明。
-
-That page describes installation via [`rustup`], a tool that manages multiple
-Rust toolchains in a consistent way across all platforms Rust supports. Why
-might one _not_ want to install using those instructions?
-
-- Offline installation. `rustup` downloads components from the internet on
- demand. If you need to install Rust without access to the internet, `rustup`
- is not suitable.
-- Preference for the system package manager. On Linux in particular, but also on
- macOS with [Homebrew], and Windows with [Chocolatey], developers sometimes
- prefer to install Rust with their platform's package manager.
-- Preference against `curl | sh`. On Unix, we usually install `rustup` by
- running a shell script via `curl`. Some have concerns about the security of
- this arrangement and would prefer to download and run the installer
- themselves.
-- Validating signatures. Although `rustup` performs its downloads over HTTPS,
- the only way to verify the signatures of Rust installers today is to do so
- manually with the standalone installers.
-- GUI installation and integration with "Add/Remove Programs" on
- Windows. `rustup` runs in the console and does not register its installation
- like typical Windows programs. If you prefer a more typical GUI installation
- on Windows there are standalone `.msi` installers. In the future
- `rustup` will also have a GUI installer on Windows.
-
-Rust's platform support is defined in [three tiers], which correspond closely
-with the installation methods available: in general, the Rust project provides
-binary builds for all tier 1 and tier 2 platforms, and they are all installable
-via `rustup`. Some tier 2 platforms though have only the standard library
-available, not the compiler itself; that is, they are cross-compilation targets
-only; Rust code can run on those platforms, but they do not run the compiler
-itself. Such targets can be installed with the `rustup target add` command.
+Rust 能在许多平台上运行，并且有多种方法来安装 Rust。
+如果您想要安装 Rust 最简单、最推荐的方法，
+请参照主要[安装页面][installation page]上的操作说明。
+
+本页面会介绍通过 [`rustup`] 安装，它是一个管理多个
+Rust 工具链的工具，从而为多个平台提供一致的 Rust 支持。
+您还想试试其他的安装方式？见下文。
+
+- 官方安装程序。`rustup` 按需从互联网下载组件。如果您需要离线安装 Rust，那么 `rustup`
+ 并不合适。
+- 系统的软件包管理器。在 Linux 上尤为如此，不过
+ macOS 上也有 [Homebrew]，Windows 也有 [Chocolatey]，
+ 开发者有时喜欢用他们平台的软件包管理器来安装 Rust。
+- `curl | sh`。在 Unix 上，我们通常通过 `curl` 运行一个 shell 脚本来安装 `rustup`。有些人可能担心这样做的安全性，而更愿意手动下载和运行安装程序。
+- 验证签名。尽管 `rustup` 通过 HTTPS 完成下载，但目前验证 Rust 安装程序的签名的唯一方式是手动验证独立安装包。
+- Windows 上的图形化“添加/删除程序”。`rustup` 在控制台中运行，并且不像典型的 Windows 程序那样注册其安装。如果您偏好典型的 GUI 安装，我们有独立的 `.msi` 安装包。在未来，
+ `rustup` 也将有 Windows 上的 GUI 安装程序。
+
+Rust 的平台支持定义共有[三层]，这与可用的安装方法密切相关：
+通常来说，Rust 项目
+为所有一级和二级平台提供二进制版本，并且它们可
+通过 `rustup` 安装。部分二级平台只有标准库可用，
+而没有编译器，即它们只是交叉编译的目标；
+Rust 代码可以在这些平台上运行，但并不在这些平台上运行编译器。
+此类目标可以用 `rustup target add` 命令来安装。
## 安装 `rustup` 的其他方法
@@ -92,24 +83,18 @@ curl https://sh.rustup.rs -sSf | sh -s -- --help
## 独立安装程序
-The official Rust standalone installers contain a single release of Rust, and
-are suitable for offline installation. They come in three forms: tarballs
-(extension `.tar.gz`), that work in any Unix-like environment, Windows
-installers (`.msi`), and Mac installers (`.pkg`). These installers come with
-`rustc`, `cargo`, `rustdoc`, the standard library, and the standard
-documentation, but do not provide access to additional cross-targets like
-`rustup` does.
+官方的 Rust 独立安装程序其中包含一个 Rust 发布版本，它适合离线安装。它们也有三种形式：适用于任何类 Unix 环境的 tarballs（扩展名 `.tar.gz`）， Windows 安装包（`.msi`），以及 Mac 安装包（`.pkg`）。这些安装程序附有
+`rustc`、`cargo`、`rustdoc`、标准库，以及标准文档，但不提供 `rustup` 那样的其他跨目标访问。
使用独立安装程序的最常见原因是：
- 离线安装
- 热衷在 Windows 上使用更多平台集成的图形安装程序
-Each of these binaries is signed with the [Rust signing key], which is
-[available on keybase.io], by the Rust build infrastructure, with
-[GPG]. In the tables below, the `.asc` files are the signatures.
+这些二进制文件每个均使用了 [Rust signing key]来签名（由 Rust 构建基础设施使用 [GPG]），该密钥也在
+[keybase.io] 上提供。在下面的表格中，`.asc` 文件即该签名。
-Past releases can be found in [the archives].
+过去发布的版本可在[此处存档]中找到。
{% for channel in site.channels %}
diff --git a/zh-CN/security.html b/zh-CN/security.html
index 5831460ee..e9c233fc5 100644
--- a/zh-CN/security.html
+++ b/zh-CN/security.html
@@ -1,99 +1,92 @@
---
layout: zh-CN/default
-title: Rust Security Policy · Rust 程序设计语言
+title: Rust 安全政策 · Rust 程序设计语言
---
-
Rust Security Policy
+
Rust 安全政策
-
Reporting a Bug
+
报告 Bug
-
Safety is one of the core principles of Rust, and to that end, we would
-like to ensure that Rust has a secure implementation. Thank you for taking the
-time to responsibly disclose any issues you find.
+
安全是 Rust 的核心原则之一，为此目的，
+我们尽力确保 Rust 有一个安全的实现。
+感谢您花费时间来负责任地披露您发现的任何问题。
-
All security bugs in the Rust distribution should be reported by email to
-security@rust-lang.org. This list
-is delivered to a small security team. Your email will be acknowledged within 24
-hours, and you'll receive a more detailed response to your email within 48
-hours indicating the next steps in handling your report. If you would like, you
-can encrypt your report using our public key.
-This key is also On
-MIT's keyserver and reproduced below.
+
Rust 分发版本中的所有安全漏洞都应通过电子邮件报告至
+security@rust-lang.org。
+此列表被交付给一个小型的安全团队。您的电子邮件将在24小时内被确认妥收，
+并将在48小时内收到更详细的回复通知处理报告的后续步骤。如果您愿意，您可以
+使用我们的公钥加密您的报告。
+此密钥也被放在
+MIT 的密钥服务器和本页末尾。
-
This email address receives a large amount of spam, so be sure to use a
-descriptive subject line to avoid having your report be missed. After the
-initial reply to your report, the security team will endeavor to keep you
-informed of the progress being made towards a fix and full announcement. As
-recommended by RFPolicy,
-these updates will be sent at least every five days. In reality, this is more
-likely to be every 24-48 hours.
+
此电子邮件地址有收到大量垃圾邮件，因此请一定在主题行撰写有意义的描述，以免错过您的报告。
+在初步回复您的报告后，安全团队将尽力保证您了解修复与全面公布方面取得的进展。
+按 RFPolicy 所推荐，
+这些更新将会至少每 5 天发送一次。现实情况中，还可能
+每 24-48 小时发送一次。
-
If you have not received a reply to your email within 48 hours, or have not
-heard from the security team for the past five days, there are a few steps you
-can take:
+
如果您没有在48小时内收到您的电子邮件的回复，或者
+过去五天都没有听到安全小组的音信，
+还有几个步骤可以采取：
-
Please note that the discussion forums and #rust-internals IRC channel are
-public areas. When escalating in these venues, please do not discuss your
-issue. Simply say that you're trying to get a hold of someone from the security
+
请注意，论坛和 #rust-internals IRC 频道为公共区域。
+在这些场地寻求联络人时，不要讨论你的问题。
+只需简单地说，你正在找一个负责安全方面的联系人。
team.
-
Disclosure Policy
+
披露政策
-
The Rust project has a 5 step disclosure process.
+
Rust 项目的披露流程有5个步骤。
-- The security report is received and is assigned a primary handler. This
-person will coordinate the fix and release process.
+- 收到安全报告，分配一个主导处理人。他将负责协调修复和发布流程。
-- The problem is confirmed and a list of all affected versions is determined.
+- 确认问题并确定所有受影响版本的列表。
-- Code is audited to find any potential similar problems.
+- 审计代码以发现任何潜在的类似问题。
-- Fixes are prepared for all releases which are still under maintenance.
-These fixes are not committed to the public repository but rather held locally
-pending the announcement.
+- 为所有仍在维护的版本准备修补程序。
+这些修补程序不会提交到公共代码库，而是放在本地
+等待公告。
-- On the embargo date, the
-Rust security mailing list is sent a copy of the announcement. The changes
-are pushed to the public repository and new builds are deployed to
-rust-lang.org. Within 6 hours of the mailing list being notified, a copy of
-the advisory will be published on the Rust blog.
+
在 embargo 日期，
+Rust 安全邮件列表 发布公告的副本。变更
+被推送到公共代码库并将新的构建版本部署到
+rust-lang.org。在邮件列表收到通知的 6 小时内，在 Rust 博客上发布通告。
-
This process can take some time, especially when coordination is required
-with maintainers of other projects. Every effort will be made to handle the bug
-in as timely a manner as possible, however it's important that we follow the
-release process above to ensure that the disclosure is handled in a consistent
-manner.
+
此流程可能需要一些时间，特别是需要与其他项目的维护者协调时。
+我们会尽力、尽量及时地处理问题，但遵循我们上述的发布流程以确保
+一致处理披露也十分重要。
-
Receiving Security Updates
+
接收安全更新
-
The best way to receive all the security announcements is to subscribe to
-the 接收所有安全公告的最佳方式是
+订阅 Rust
-security announcements mailing list. The mailing list is very low traffic,
-and it receives the public notifications the moment the embargo is lifted.
+安全公告邮件列表。该邮件列表通讯量很少，
+将在取消 embargo 时收到公开通知。
-
Advance notification
+
提前通知
-
We will announce vulnerabilities 72 hours before the embargo is lifted to
-distros@openwall,
-so that Linux distributions can update their packages.
+
我们将在 embargo 的 72小时之前通告漏洞至
+distros@openwall，
+以便 Linux 发行版可以更新其软件包。
-
Comments on This Policy
+
评论此政策
-
If you have any suggestions to improve this policy, please send an email to
+
如果您有任何建议来改善此政策，请发送电子邮件至
security@rust-lang.org.
-
Plaintext PGP Key
+
纯文本 PGP Key
{% include rust-security-team-key.gpg.ascii %}
diff --git a/zh-CN/team.md b/zh-CN/team.md
index 05bdd766a..8b788b262 100644
--- a/zh-CN/team.md
+++ b/zh-CN/team.md
@@ -1,6 +1,8 @@
---
layout: zh-CN/default
title: Rust 团队 · Rust 程序设计语言
+extra_css:
+ - team.css
localized-teams:
Core team:
@@ -14,77 +16,37 @@ localized-teams:
responsibility: "Rust 标准库、Rust 语言的包及公约"
Compiler team:
name: 编译器开发团队
- responsibility: "compiler internals, optimizations"
+ responsibility: "编译器内部、优化"
Tooling and infrastructure:
name: 工具和基础组件团队
- responsibility: "提高工具支持 (譬如 Cargo、rustup)、CI 基础控件，等。"
+ responsibility: "提高工具支持（例如 Cargo、rustup）、CI 基础控件，等等。"
Community team:
name: 社区团队
- responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
+ responsibility: "协调活动、推广、商业用户、教材及曝光率"
Documentation team:
name: 文档团队
responsibility: "确保 Rust 拥有极好的文档"
Moderation team:
name: 审核团队
- responsibility: "helping uphold the
code of conduct"
+ responsibility: "帮助维护
行为守则"
Rust team alumni:
name: Rust 团队旧友
responsibility: "享受悠哉的退休生活"
---
-
-
# Rust 团队
-Rust 的项目是由若干个团队分别
-[管辖](https://github.com/rust-lang/rfcs/blob/master/text/1068-rust-governance.md)，
-的每个团队只关注特定的内容，以下是团队人名单（姓氏字母排序）。
+Rust 的项目是由若干个团队分别[管辖](https://github.com/rust-lang/rfcs/blob/master/text/1068-rust-governance.md)，
+每个团队只关注特定的内容，以下是团队人员名单（按姓氏字母排序）。
-To contact a team, post your question or comment to [the Internals
-forum](https://internals.rust-lang.org/) and tag your post with the category
-corresponding to the team name. Note that security disclosures should follow
-the [Rust security disclosure process](security.html).
+要联系某个团队，请发布您的问题或评论至[内部论坛](https://internals.rust-lang.org/)，并用相应团队的名称标注您的帖子。请注意，安全披露应该遵循
+[Rust 安全披露流程](security.html)。
{% for team in site.data.team.teams %}
{{ page.localized-teams[team.name].name | default: team.name }}
-职能: {{ page.localized-teams[team.name].responsibility | default: team.responsibility }}
+职能：{{ page.localized-teams[team.name].responsibility | default: team.responsibility }}
@@ -108,7 +70,7 @@ the [Rust security disclosure process](security.html).
irc: {% if person.irc %}{{ person.irc }}{% else %}{{ nick }}{% endif %}
{% if person.ex-teams %}
-
团队: {% for ex-team in person.ex-teams %}{% if forloop.first == false %}, {% endif %}{{ page.localized-ex-teams[ex-team] | default: ex-team }}{% endfor %}
+
团队：{% for ex-team in person.ex-teams %}{% if forloop.first == false %}, {% endif %}{{ page.localized-ex-teams[ex-team] | default: ex-team }}{% endfor %}
{% endif %}
diff --git a/zh-CN/user-groups.md b/zh-CN/user-groups.md
index ec21e2bfc..9b0a715b9 100644
--- a/zh-CN/user-groups.md
+++ b/zh-CN/user-groups.md
@@ -1,9 +1,9 @@
---
layout: zh-CN/default
-title: Rust User Groups · Rust 程序设计语言
+title: Rust 用户群组 · Rust 程序设计语言
---
-# Rust User Groups
+# Rust 用户群组
There are more than 90 Rust User Groups worldwide in over 35
countries. Rustaceans meet periodically in Rust User Groups. Its a
@@ -15,7 +15,7 @@ Community Team](./team.html#Community) or
even better, open a pull request against [this
website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md).
-## Australia
+## 澳大利亚
[Rust Brisbane](https://www.meetup.com/Rust-Brisbane/), Brisbane.
@@ -23,19 +23,19 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
[Rust Sydney](https://www.meetup.com/Rust-Sydney/), Sydney.
-## Belarus
+## 白俄罗斯
[Rust in Minsk](https://www.meetup.com/Rust-%D0%B2-%D0%9C%D0%B8%D0%BD%D1%81%D0%BA%D0%B5/), Minsk.
-## Belgium
+## 比利时
[Belgium Rust User Group](https://www.meetup.com/Belgium-Rust-user-group/), Brussels.
-## Bolivia
+## 玻利维亚
[Rust Bolivia](http://www.mozillabolivia.org/rust/), Santa Cruz, Bolivia.
-## Brazil
+## 巴西
[Rust Floripa](https://www.meetup.com/Rust-Floripa/), Florianópolis.
@@ -45,7 +45,7 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
[Rust São Paulo](https://www.meetup.com/Rust-Sao-Paulo-Meetup/), São Paulo.
-## Canada
+## 加拿大
[Montréal Rust Language Meetup](https://www.meetup.com/Montreal-Rust-Language-Meetup/), Montréal, QC.
@@ -55,19 +55,19 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
[Vancouver Rust](https://www.meetup.com/Vancouver-Rust/), Vancouver, BC.
-## Croatia
+## 克罗地亚
[Lambda Zagreb](https://www.meetup.com/lambdazagreb/), Zagreb.
-## Czech Republic
+## 捷克
[Rust Prague](https://www.meetup.com/rust-prague/), Prague.
-## Denmark
+## 丹麦
[Copenhangen Rust Group](http://cph.rs), Copenhagen.
-## France
+## 法国
[Lille Rust Meetup](https://www.meetup.com/rust-lille/), Lille.
@@ -75,11 +75,11 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
[Rust Paris](https://www.meetup.com/Rust-Paris/), Paris.
-## Finland
+## 芬兰
[Finland Rust-lang Group](https://www.meetup.com/Finland-Rust-Meetup/), Helsinki.
-## Germany
+## 德国
[Rust Cologne/Bonn User Group](https://www.meetup.com/Rust-Cologne-Bonn/), Köln.
@@ -95,11 +95,11 @@ website](https://github.com/rust-lang/rust-www/blob/master/en-US/user-groups.md)
[Rust Rhein-Main](https://www.meetup.com/Rust-Rhein-Main/), Frankfurt / Darmstadt.
-## Hungary
+## 匈牙利
[Rust Hungary Meetup](https://www.meetup.com/Rust-Hungary-Meetup/), Budapest.
-## India
+## 印度
[Hyderabad Rust Meetup](https://www.meetup.com/Hyderabad-Rust-Meetup/), Hyderabad.
+