rust-lang · alexcrichton · May 20, 2017 · May 12, 2017 · May 18, 2017 · May 19, 2017
diff --git a/_layouts/zh-CN/basic.html b/_layouts/zh-CN/basic.html
@@ -6,16 +6,19 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ page.title }}</title>
-    <meta name="keywords" content="Rust, Rust程序语言, rustlang, rust-lang, Mozilla Rust">
+    <meta name="keywords" content="Rust, Rust 编程语言, rustlang, rust-lang, Mozilla Rust">
     <meta name="description" content="一种注重高效、安全、并行的系统程序语言。">
 
     <link rel="stylesheet" href="/css/bootstrap.css">
     <link rel="stylesheet" href="/css/style.css">
+    {% for css_name in page.extra_css %}
+    <link rel="stylesheet" href="/css/{{ css_name }}">
+    {% endfor %}
   </head>
 
   <body class="container">
     <a href="https://github.com/rust-lang/rust">
-      <img class="ribbon" style="display: none" src="/logos/forkme_zh_cn.svg" alt="从GitHub上拷贝源码" width="298" height="298">
+      <img class="ribbon" style="display: none" src="/logos/forkme_zh_cn.svg" alt="Fork 在 GitHub 上的代码" width="298" height="298">
     </a>
 
     <header>
@@ -37,7 +40,7 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
     {{ content }}
 
     <footer>
-      <p>本土化页面：
+      <p>其他语言页面：
 	    {% include footer.html %}
       </p>
     </footer>

diff --git a/logos/forkme_zh_cn.svg b/logos/forkme_zh_cn.svg
diff --git a/zh-CN/community.md b/zh-CN/community.md
diff --git a/zh-CN/conduct.md b/zh-CN/conduct.md
@@ -1,13 +1,13 @@
 ---
 layout: zh-CN/default
-title: The Rust Code of Conduct &middot; Rust 程序设计语言
+title: Rust 行为守则 &middot; Rust 程序设计语言
 ---
 
-# The Rust Code of Conduct
+# Rust 行为守则
 
-## Conduct
+## 行为举止
 
-**Contact**: [rust-mods@rust-lang.org](mailto:rust-mods@rust-lang.org)
+**联系**：[rust-mods@rust-lang.org](mailto:rust-mods@rust-lang.org)
 
 * We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
 * On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
@@ -18,10 +18,10 @@ title: The Rust Code of Conduct &middot; Rust 程序设计语言
 * Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Rust moderation team](/team.html#Moderation) immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
 * Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
 
-## Moderation
+## 管理
 
 
-These are the policies for upholding our community's standards of conduct. If you feel that a thread needs moderation, please contact the [Rust moderation team](/team.html#Moderation).
+These are the policies for upholding our community's standards of conduct. 如果你认为某个主题需要被处理，请联系 [Rust 管理团队](/team.html#Moderation)。
 
 1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
 2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.

diff --git a/zh-CN/contribute-bugs.md b/zh-CN/contribute-bugs.md
@@ -1,46 +1,30 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; finding, triaging and fixing issues &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 找出、分类和修复问题 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; finding, triaging and fixing issues
+# 为 Rust 出力 &mdash; 找出、分类和修复问题
 
-The day-to-day maintenance of the project revolves around Rust's
-[issue tracker] and [pull requests][PR], and more help is always
-needed. The most basic way to get started contributing to Rust is to
-look for the [E-easy] or [E-mentor] labels. These are meant to be
-approachable for new Rust programmers.
+Rust 项目的的日常维护工作是围绕着[问题跟踪器][issue tracker]和[拉取请求][PR]，并且始终需要更多的贡献。
+开始为 Rust 出力的最简单方式是寻找标有 [E-easy] 或 [E-mentor] 标签的问题。
+它们最适合新手 Rust 程序员。
 
-On `E-mentor` issues an experienced Rust developer has volunteered in
-the comments to mentor you through solving the issue and [submitting
-the fix via GitHub pull request][pull]. Contact them about the issue,
-on the issue tracker by [@mentioning] their name in a comment, on IRC,
-or through email. Note that Rust developers get a lot of notifications
-and it is easy to miss some; don't hesitate to hunt them down by
-whatever means necessary!
+在标有 `E-mentor` 的问题上会有一名经验丰富的 Rust 开发人员来自愿帮助你解决该问题和[提交 GitHub 拉取请求][pull]来修复它。
+在评论、IRC 中用 [@mentioning] 来联系他们（也可通过电子邮件）。
+温馨提醒，Rust 开发人员经常收到大量的通知，所以有时可能错过某些；
+不要犹豫！如果你认为他没有注意到你。
 
-Other projects in Rust maintain similar entry-level tasks, including
-the web browser [Servo], the HTTP library [hyper], the
-source-formatter [rustfmt], the Unix library bindings [nix],
-and the lint collection [clippy].
+Rust 的其他项目也有其他类似的入门级任务，包括网页浏览器 [Servo]，HTTP 库 [hyper]，源代码格式化器 [rustfmt]，Unix 库绑定 [nix]，以及 lint 集 [clippy]。
 
-While Rust has an [extensive test suite][test] there is always more to
-test. The [E-needstest] label indicates issues that are thought to be
-fixed but don't have tests. Writing test cases is a great way to
-understand a new project and get started contributing.
+虽然 Rust 有一个[广泛的测试套件][test]，但测试总是不嫌多的嘛。
+[E-needstest] 标签指出了被认为已修复但尚未测试的问题。编写测试用例也是很好的一个了解新项目并开始贡献的方法。
 
-Rust is always in need of people to [triage] issues: reproduce bugs,
-minimize test cases, apply labels, close resolved issues. Note that
-you'll need elevated GitHub permissions to apply labels, but this is
-easy to obtain for somebody with a bit of experience in the
-project. Ask a [team member][team].
+Rust 始终需要人们来[分流][triage]问题：重现 bug，
+最小化的测试用例，应用标签，关闭已解决的问题。
+请注意，您需要被提升的 GitHub 权限才能应用标签，
+不过卓有经验的人很容易得到它，相关事宜请联系[团队成员][team]。
 
-Once you've found your way around the project and have created a few
-pull requests in a particular area, consider reviewing others' pull
-requests: good reviewership is a rare skill and always appreciated. No
-prior permission is needed &mdash; just start constructively and politely
-commenting on pull requests that interest you. If you want training
-on conducting good code reviews [read this guide][reviews].
+在您找到自己的方式为项目出力并创建一些拉取请求后，可以考虑审阅其他人的拉取请求：良好的审阅是一个不可多得的技能。无需事先批准 &mdash; 只需开始礼貌并有建设性地在您感兴趣的拉取请求中评论。如果您想在代码审核的基础上有效分流，[阅读这份指南][reviews]。
 
 <!--
 TODO: weekly triage email?

diff --git a/zh-CN/contribute-community.md b/zh-CN/contribute-community.md
@@ -1,20 +1,15 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; community building &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 社区建设 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; community building
+# 为 Rust 出力 &mdash; 社区建设
 
-Help newbies, spread the word, meet interesting people. Make Rust the
-shining example of open source development that we all want it to be.
+帮助新手、传播它、结识有趣的人。使用 Rust 的
+我们都希望它成为开源开发的一个光辉榜样。
 
-Keep an eye on the [#rust-beginners] channel. This is where we direct
-new Rust programmers to ask for help, and it is vital when they do
-that they receive prompt, accurate, and courteous responses. Likewise,
-[Stack Overflow], [users.rust-lang.org], and [/r/rust], are all forums
-where Rust programers commonly look for assistance. If you want
-training on answering programmers' questions [read this
-guide][helpful].
+请您留意 [#rust-beginners] 频道，这是我们为新 Rust 程序员的询问提供帮助的地方，给他们提供迅速、准确和礼貌的回应很重要。与此类似，[Stack Overflow]、[users.rust-lang.org] 和 [/r/rust] 都是 Rust 程序员常来寻求帮助的地方。
+如果您想了解怎样更好地回答程序员的提问，[阅读这份指南吧][helpful]。
 
 If you are already experienced in some area of the project, please
 look out for potential [E-easy] bugs. When you see an
@@ -26,7 +21,7 @@ thus also helpful to triage E-easy bugs for poor descrptions and
 improve them.
 
 Experienced developers who are patient and communicate clearly should
-consider [mentoring new contributors][mentor]. Tag easy issues with
+consider [指导新贡献者][mentor]. Tag easy issues with
 [E-mentor] and mention in a comment that you will mentor. Expect people
 to contact you about the issue, and attempt to respond promptly.
 
@@ -56,7 +51,7 @@ Remember as you are advocating Rust though to be considerate of
 others' views &mdash; not everybody is going to be receptive to Rust, and
 that's just fine.
 
-Meet other Rust community builders in [#rust-community].
+在 [#rust-community] 中能遇到其他 Rust 社区建设者。
 
 <!--
 Other ideas:

diff --git a/zh-CN/contribute-compiler.md b/zh-CN/contribute-compiler.md
@@ -1,9 +1,9 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; language, compiler, and the standard library &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 语言、编译器和标准库 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; language, compiler, and the standard library
+# 为 Rust 出力 &mdash; 语言、编译器和标准库
 
 
 The source code to the compiler and standard library are in the main
@@ -33,7 +33,7 @@ incremental compilation. There is yet no single source for information
 on work needed here, but ask on [internals.rust-lang.org] or
 [#rust-internals] for guidance.
 
-[It's embarrasing when our compiler crashes][ice] &mdash; the
+[当我们的编译器崩溃时，这很尴尬][ice] &mdash; the
 dreaded 'internal compiler error' (ICE). The [I-ICE] label
 tracks these, and they are often plentiful. These are usually
 good bugs to start with because it's easy to know when you've fixed
@@ -43,11 +43,10 @@ The performance of Rust code is one of its great advantages; and the
 performance of the Rust compiler one of its great weaknesses. Any
 improvements to either runtime or &mdash; especially &mdash; compiletime performance
 are widely celebrated. The [I-slow] and [A-optimization] labels deal
-with runtime performance, and [I-compiletime] with compiletime. We have
-a [site that tracks compiletime performance][rustc-perf] on a number
-of workloads. The `-Z time-passes` compiler flag can help debug
-compiler performance, and Rust code can be profiled with standard
-profilers like `perf` on Linux.
+with runtime performance, and [I-compiletime] with compiletime.
+我们有一个在一些工作流上[跟踪编译性能的网站][rustc-perf]。
+`-Z time-passes` 编译器标志可以帮助调试编译器性能，
+Rust 代码在 Linux 上也能用 `perf` 之类的标准分析器分析。
 
 Major new features go through a [Request for Comments (RFC)][rfc]
 process, by which the design is agreed upon. Though it is open to all,
@@ -69,8 +68,7 @@ repository][issue-fcp]. Both FCPs are critical moments to get involved
 and express opinions on the direction of the language, and are
 advertised in the weekly subteam reports on [internals.rust-lang.org].
 
-Meet other Rust compiler engineers in [#rustc], language
-designers in [#rust-lang], and library designers in [#rust-libs].
+在 [#rustc] 中能遇到其他 Rust 编译器工程师，语言设计师在 [#rust-lang]，库设计员在 [#rust-libs]。
 
 <!--
 TODO: guide to compile-time benchmarking

diff --git a/zh-CN/contribute-docs.md b/zh-CN/contribute-docs.md
@@ -1,9 +1,9 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; documentation &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 文档 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; documentation
+# 为 Rust 出力 &mdash; 文档
 
 Documentation is never good enough and there's never enough of it.
 Many aspects of Rust's documentation don't require deep knowledge to
@@ -43,7 +43,7 @@ documentation that is actively developed and in need of contributors
 include [Rust By Example], [Rust Design Patterns], and [rust-rosetta].
 For other existing documentation projects to contribute to see [rust-learning].
 
-Meet other Rust documentarians in [#rust-docs].
+在 [#rust-docs] 中能遇到其他 Rust 文档编写者。
 
 <!--
 TODO: blogging, translation

diff --git a/zh-CN/contribute-libs.md b/zh-CN/contribute-libs.md
@@ -1,24 +1,20 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; libraries &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 库 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; libraries
+# 为 Rust 出力 &mdash; 库
 
-If you want to contribute to Rust by writing volumes of Rust code,
-then libraries are where it's at: since Rust is a young language,
-there are many types of libraries that either do not exist yet
-or are incomplete and in need of improvement or competition.
+如果你想通过编写 Rust 代码来为 Rust 出力，
+那么库很不错：因为 Rust 是一种年轻的语言，
+很多种类的库还尚不存在或并不完整，它们需要改进或竞争者。
 
-Deciding what to write that will have impact and be fun is a common
-difficulty. Here are some ideas:
+决定写些什么更有乐趣和影响力是一个常见的问题。这里有些想法供你参考：
 
-* Read and participate in the weekly "what's everyone working on
-  this week" threads on [/r/rust] and [users.rust-lang.org]. These are
-  packed with exciting announcements from other Rust programmers in
-  need of collaborators.
-* Familiarize yourself with the best Rust libraries through
-  [awesome-rust] and [libs.rs].
+* 阅读和参与 [/r/rust] 和 [users.rust-lang.org] 上
+  每周的“本周每个人都在做什么”（"what's everyone working on
+  this week"）主题。那些包含来自其他需要合作者的 Rust 程序员的激动人心的通知。
+* 通过 [awesome-rust] 和 [libs.rs] 亲自熟悉最好的 Rust 库。
 * Some larger projects, including the web browser [Servo], the HTTP
   library [hyper], the source-formatter [rustfmt], the Unix library bindings
   [nix], and the lint collection [clippy], tag issues with 'easy' labels for new
@@ -32,14 +28,12 @@ difficulty. Here are some ideas:
 * Help guide libraries from [rust-lang-nursery] into rust-lang proper.
   Unfortunately there is not much documentation on what needs to be
   done here; ask on [#rust-libs].
-* Inspect the RFC issue tracker for a [requested community
-  library][requested] and build it.
-* Watch [Github Trending][trending] for currently active Rust projects.
+* 查阅 RFC 问题跟踪器中的[社区已请求的库][requested]并建立它。
+* 关注 [Github 趋势][trending]了解目前活跃的 Rust 项目。
 
-As a library author you will want to be aware of the [best practices
-for Rust libraries][lib-prac].
+作为库的设计者，您有必要了解 [Rust 库的最佳实践][lib-prac]。
 
-Meet other Rust library designers in [#rust-libs].
+在 [#rust-libs] 中能遇到其他 Rust 库的设计者。
 
 <!--
 TODO: Not sure #rust-libs is the place to direct people

diff --git a/zh-CN/contribute-tools.md b/zh-CN/contribute-tools.md
@@ -1,9 +1,9 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; tooling, IDEs and infrastructure &middot; Rust 程序设计语言
+title: 为 Rust 出力 &mdash; 工具、IDE 及基础设施 &middot; Rust 程序设计语言
 ---
 
-# Contributing to Rust &mdash; tooling, IDEs and infrastructure
+# 为 Rust 出力 &mdash; 工具、IDE 及基础设施
 
 Tools play a huge part in the success of a language, and there is a
 great deal left to implement. ***A major focus of Rust development now

diff --git a/zh-CN/contribute-translations.md b/zh-CN/contribute-translations.md
@@ -0,0 +1,8 @@
+---
+layout: default
+title: 将 rust-lang.org 译为其他语言以拥抱国际化
+---
+
+# Rust is universal
+
+Some docs on contributing translations!
diff --git a/zh-CN/contribute.md b/zh-CN/contribute.md
@@ -8,7 +8,7 @@ title: 为 Rust 语言做贡献 &middot; Rust 程序设计语言
 您已经开始学习 Rust 语言。依恋它，想要与它相拥。
 如果您不确定如何参与到贡献当中，这样页面可以帮助您。
 
-**发现了一个大漏洞 (bug)，如何报告？** [漏洞报告指南][bugs]。在此提前致谢！
+**发现了一个大漏洞 (bug)，如何报告？**[漏洞报告指南][bugs]。在此提前致谢！
 
 Rust 有一个庞大的项目系统，其中最突出的是由 [Rust 开发者][devs]在的GitHub上维护的 [rust-lang 组织][rust-lang]。
 如果您刚刚开始贡献之旅，您可能对项目的 [CONTRIBUTING.md] 文件感兴趣，
@@ -21,7 +21,7 @@ Rust 有一个庞大的项目系统，其中最突出的是由 [Rust 开发者][
   维持一个像 Rust 这样的庞大而活跃的项目基础工作。
 * [文档](contribute-docs.html)：
   不只限于官方文档——库、博客及其他非官方的消息来源。
-* [社区建设](contribute-community.html)
+* [社区建设](contribute-community.html)：
   帮助你在 Rust 中的手足同胞，以及壮大 Rust。
 * [工具、集成开发环境以及基础设施](contribute-tools.html)：
   语言的实用与人性化是一门好的语言的关键所在。

diff --git a/zh-CN/documentation.md b/zh-CN/documentation.md
@@ -79,7 +79,7 @@ title:  Rust 语言文档 &middot; Rust 程序设计语言
 
 ## 母语文献
 
-如果您需要非英语的本土化资料请[点击这里][locale]。
+如果您需要非英语的本地化资料，请[点击这里][locale]。
 
 中文文献可以快速链接到：
 - [简体中文][locale-zh-CN]