Merge pull request #578 from 3442853561/中文16.10.14

There are something new in Chinese translation.

Author: alexcrichton

zh-CN/documentation.md

@@ -1,25 +1,24 @@
 ---
-layout: default
-title:  Rust Documentation · The Rust Programming Language
+layout: zh-CN/default
+title:  Rust 语言文档 · Rust 程序设计语言
 ---
 
-# Rust Documentation
+# Rust 语言文档
 
 If you haven't seen Rust at all yet, the first thing you should read
-is the introduction to the book, [The Rust Programming
-Language][book]. It will give you a good idea of what Rust is like,
+is the introduction to the book, [Rust 程序设计语言][book]。It will give you a good idea of what Rust is like,
 show you how to install it, and explain its syntax and concepts. Upon
 completing the book, you'll be an intermediate Rust developer, and
 will have a good grasp of the fundamental ideas behind Rust.
 
-## Learning Rust
+## 学习 Rust
 
-[The Rust Programming Language][book]. Also known as "The Book",
+[Rust 程序设计语言][book]. Also known as "The Book",
 The Rust Programming Language is the most comprehensive resource for
 all topics related to Rust, and is the primary official document of
 the language.
 
-[Rust by Example][rbe]. A collection of self-contained Rust
+[在实践中学 Rust][rbe]。 A collection of self-contained Rust
 examples on a variety of topics, executable in-browser.
 
 [Frequently asked questions][faq].
@@ -31,7 +30,7 @@ programmers.
 [rust-learning]. A community-maintained collection of resources
 for learning Rust.
 
-[book]: https://doc.rust-lang.org/book/
+[book]: https://kaisery.gitbooks.io/rust-book-chinese/content/
 [rbe]: http://rustbyexample.com
 [faq]: faq.html
 [nomicon]: https://doc.rust-lang.org/nomicon/
@@ -83,7 +82,7 @@ other corners of the Rust world.
 [legal]: legal.html
 [coc]: https://www.rust-lang.org/conduct.html
 
-## Nightly and beta documentation
+## 开发版与测试版文档
 
 Much of the official Rust documentation is also available for the
 [nightly] and [beta] releases in addition to the stable documentation
@@ -92,9 +91,13 @@ linked above.
 [nightly]: https://doc.rust-lang.org/nightly/
 [beta]: https://doc.rust-lang.org/beta/
 
-## Non-english resources
+## 母语文献
 
-For resources in languages other than English, see the
-[locale-specific links in rust-learning][locale].
+如果您需要非英语的本土化资料请[点击这里][locale]。  
+中文文献可以快速链接到：  
+[简体中文][locale-zh-CN]  
+[台灣正體][locale-zh-TW]  
 
 [locale]: https://github.com/ctjhoa/rust-learning#locale-links
+[locale-zh-CN]: https://kaisery.gitbooks.io/rust-book-chinese/content/
+[locale-zh-TW]: http://askeing.github.io/rust-book/

zh-CN/downloads.html

@@ -9,12 +9,11 @@ <h1>下载</h1>
     <div class="row install">
       <div class="col-md-4 side-header">
         <h2 id="stable">{{ site.stable }}&nbsp;</h2>
-        <h3>{{ site.stable_date | date: "%B %-d, %Y" }}</h3>
+        <h3>{{ site.stable_date | date: "%Y 年 %-m 月 %-d 日" }}</h3>
         <p>
-	  The
           <a href="http://blog.rust-lang.org{{ site.stable_blog }}">
-	    current stable release of Rust</a>,
-	  updated every six weeks and backwards-compatible.
+	    当前稳定的版本</a>，
+	  保持每六周更新一次和后向兼容。
         </p>
       </div>
       <div class="col-md-8">
@@ -30,12 +29,12 @@ <h3>{{ site.stable_date | date: "%B %-d, %Y" }}</h3>
           <td><a href="https://static.rust-lang.org/dist/rust-{{ site.stable }}-i686-apple-darwin.pkg"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>†</sup></a>) (.msi)</td>
+          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>〔注〕</sup></a>) (.msi)</td>
           <td><a href="https://static.rust-lang.org/dist/rust-{{ site.stable }}-x86_64-pc-windows-gnu.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-{{ site.stable }}-i686-pc-windows-gnu.msi"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>†</sup></a>) (.msi) </td>
+          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>〔注〕</sup></a>) (.msi) </td>
           <td><a href="https://static.rust-lang.org/dist/rust-{{ site.stable }}-x86_64-pc-windows-msvc.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-{{ site.stable }}-i686-pc-windows-msvc.msi"><div class="inst-button">32位</div></a></td>
           </tr>
@@ -50,7 +49,7 @@ <h3>{{ site.stable_date | date: "%B %-d, %Y" }}</h3>
 
      <div class="row">
       <div class="col-md-10 col-md-offset-1">
-        <p>Linux和Mac系统中安装的快捷方法，在终端中运行：</p>
+        <p>也可以快捷的在Linux和Mac系统中的终端运行来安装Rust(稳定绿化版)：</p>
         <pre><code>curl -sSf https://static.rust-lang.org/rustup.sh | sh</code></pre>
       </div>
     </div>
@@ -59,12 +58,12 @@ <h3>{{ site.stable_date | date: "%B %-d, %Y" }}</h3>
 
     <div class="row install">
       <div class="col-md-4 side-header">
-        <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
+        <h2 id="beta">测试版(Beta)&nbsp; ({{ site.beta }})</h2>
         <p>
-	A preview of the upcoming stable release, intended for testing by
-	crate authors. Updated every six weeks and as needed.
+	即将推出的稳定版本，提供为库(crate) 作者测试使用。
+	每六周或必要时更新一次。
         </p>
-        <p><em>Scheduled for stable release<br/>{{ site.beta_date | date: "%B %-d, %Y" }}</em>.<p>
+        <p><em>预计将于 <br/>{{ site.beta_date | date: "%Y 年 %-m 月 %-d 日" }}</em> 推出稳定版<p>
       </div>
       <div class="col-md-8">
         <table class="table-features table-installers"><tbody>
@@ -79,28 +78,28 @@ <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
           <td><a href="https://static.rust-lang.org/dist/rust-beta-i686-apple-darwin.pkg"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>†</sup></a>) (.msi)</td>
+          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>〔注〕</sup></a>) (.msi)</td>
           <td><a href="https://static.rust-lang.org/dist/rust-beta-x86_64-pc-windows-gnu.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-beta-i686-pc-windows-gnu.msi"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>†</sup></a>) (.msi) </td>
+          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>〔注〕</sup></a>) (.msi) </td>
           <td><a href="https://static.rust-lang.org/dist/rust-beta-x86_64-pc-windows-msvc.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-beta-i686-pc-windows-msvc.msi"><div class="inst-button">32位</div></a></td>
           <td></td>
           </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
           <td class="inst-type"></td>
-          <td colspan="2"><a href="https://static.rust-lang.org/dist/rustc-beta-src.tar.gz"><div class="inst-button">Source</div></a></td>
+          <td colspan="2"><a href="https://static.rust-lang.org/dist/rustc-beta-src.tar.gz"><div class="inst-button">源码</div></a></td>
           </tr>
         </tbody></table>
       </div>
     </div>
 
      <div class="row">
       <div class="col-md-10 col-md-offset-1">
-        <p>An easy way to install the beta binaries for Linux and Mac is to run this in your shell:</p>
+        <p>也可以快捷的在Linux和Mac系统中的终端运行来安装Rust(测试绿化版)：</p>
         <pre><code>curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=beta</code></pre>
       </div>
     </div>
@@ -109,12 +108,12 @@ <h2 id="beta">Beta&nbsp; ({{ site.beta }})</h2>
 
     <div class="row install">
       <div class="col-md-4 side-header">
-        <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
+        <h2 id="nightly">开发版(Nightly)&nbsp; ({{ site.nightly }})</h2>
         <p>
-        The current development branch.
-	It includes
-	<a href="https://doc.rust-lang.org/book/nightly-rust.html">unstable features</a>
-	that are not available in the betas or stable releases.
+        当前正在开发的分支。
+	它包括若干
+	<a href="https://doc.rust-lang.org/book/nightly-rust.html">不稳定的特性</a>，
+	这些特性在稳定版和测试版中都是不支持的。
         </p>
       </div>
       <div class="col-md-8">
@@ -130,28 +129,28 @@ <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
           <td><a href="https://static.rust-lang.org/dist/rust-nightly-i686-apple-darwin.pkg"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>†</sup></a>) (.msi)</td>
+          <td class="inst-type">Windows (<a href="#win-foot">GNU ABI <sup>〔注〕</sup></a>) (.msi)</td>
           <td><a href="https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-gnu.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.msi"><div class="inst-button">32位</div></a></td>
           </tr>
           <tr>
-          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>†</sup></a>) (.msi) </td>
+          <td class="inst-type">Windows (<a href="#win-foot">MSVC ABI <sup>〔注〕</sup></a>) (.msi) </td>
           <td><a href="https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-msvc.msi"><div class="inst-button">64位</div></a></td>
           <td><a href="https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-msvc.msi"><div class="inst-button">32位</div></a></td>
           <td></td>
           </tr>
           <tr><td>&nbsp;</td></tr>
           <tr>
           <td class="inst-type"></td>
-          <td colspan="2"><a href="https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz"><div class="inst-button">Source</div></a></td>
+          <td colspan="2"><a href="https://static.rust-lang.org/dist/rustc-nightly-src.tar.gz"><div class="inst-button">源码</div></a></td>
           </tr>
         </tbody></table>
       </div>
     </div>
 
      <div class="row">
       <div class="col-md-10 col-md-offset-1">
-        <p>An easy way to install the nightly binaries for Linux and Mac is to run this in your shell:</p>
+        <p>也可以快捷的在Linux和Mac系统中的终端运行来安装Rust(开发绿化版)：</p>
         <pre><code>curl -sSf https://static.rust-lang.org/rustup.sh | sh -s -- --channel=nightly</code></pre>
       </div>
     </div>
@@ -161,7 +160,7 @@ <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
     <div class="row">
       <div class="col-md-12">
       <p>
-        Discover other downloads in <a href="https://static.rust-lang.org/dist/index.html">the archives.</a>
+        这里是一些早期版本的 <a href="https://static.rust-lang.org/dist/index.html">存档</a>。
       </p>
       </div>
     </div>
@@ -172,33 +171,32 @@ <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
       <div class="col-md-12">
 	<a id="win-foot"></a>
 	<p>
-	  <em>†</em>
-	  There are two prominent
+	  <em>〔注〕</em>
+	  在 Windows 操作系统中有两个可供选择
 	  <a href="https://en.wikipedia.org/wiki/Application_binary_interface">ABIs</a>
-	  in use on Windows: the native (MSVC) ABI used by
+	  的版本。使用已经安装的 (MSVC) ABI 需要
 	  <a href="https://www.visualstudio.com">Visual Studio</a>,
-	  and the GNU ABI used by the
-	  <a href="https://gcc.gnu.org/">GCC toolchain</a>.
+	  ，而使用 GNU ABI 则需要
+	  <a href="https://gcc.gnu.org/">GCC 工具链</a>.
 	  Which version of Rust you need depends largely on what C/C++ libraries you want to interoperate with:
 	  for interop with software produced by Visual Studio use the MSVC build of Rust; for interop with
 	  GNU software built using the
-	  <a href="https://msys2.github.io/">MinGW/MSYS2 toolchain</a>
+	  <a href="https://msys2.github.io/">MinGW/MSYS2 工具链</a>
 	  use the GNU build.
 	</p>
 	<p>
 	  MSVC builds of Rust additionally require the Microsoft Visual
-          C++ build tools for Visual Studio 2013 or later.
+          C++ build tools for Visual Studio 2013 或更高版本。
 	  The easiest way to acquire the build tools is by installing
 	  <a href="http://landinghub.visualstudio.com/visual-cpp-build-tools">
 	  Microsoft Visual C++ Build Tools 2015</a>
 	  which provides just the Visual C++ build tools.
-	  Alternately, you can <a href="https://www.visualstudio.com/downloads/">install</a>
+	  Alternately, you can <a href="https://www.visualstudio.com/downloads/">安装</a>
 	  Visual Studio 2015 or Visual Studio 2013 and during install select the "C++ tools".
 	  No additional software installation is necessary for basic use of the GNU build.
 	</p>
 	<p>
-	  Rust's support for the GNU ABI is more mature, and is recommended for typical
-	  uses.
+	  Rust 对 GNU ABI 的支持更加成熟，建议作为典型用途。
 	</p>
     </div>
   </div>

zh-CN/index.html

@@ -8,14 +8,14 @@
         <p class="pitch">
           <b>Rust</b> 是一种注重高效、安全、并行的系统程序语言。
           <br/>
-          <a href="https://doc.rust-lang.org/book/README.html">详情...</a>
+          <b><a href="friends.html">看看谁在使用 Rust</a></b>
         </p>
       </div>
       <div class="col-md-4 install-box">
         <span class="version-rec-box-inner">
           推荐版本:<br>
           <span id="install-version"
-                data-type-linux="Linux 二进制版"
+                data-type-linux="Linux 绿化版"
                 data-type-windows="Windows 安装包"
                 data-type-mac="Mac 安装包"
                 data-type-source="源码">
@@ -47,7 +47,7 @@ <h2>特点</h2>
       <div class="col-md-8">
         <div id="active-code">
           <button type="button" class="btn btn-primary btn-sm" id="run-code">运行</button>
-          <div id="editor">{% include example.rs %}</div>
+          <div id="editor">{% include zh-CN/example.rs %}</div>
           <div id="result" data-msg-running="运行中...">
             <a id="playlink"><i class="icon-link-ext"></i></a>
           </div>

zh-CN/team.md

@@ -1,6 +1,6 @@
 ---
-layout: default
-title: The Rust Team · The Rust Programming Language
+layout: zh-CN/default
+title: Rust 团队 · Rust 程序设计语言
 
 # map from GH username to name & irc nick (irc nick can be omitted if it
 # matches GH).
@@ -97,39 +97,39 @@ people:
 
 # Information about each team. Omit `lead` for teams without leaders.
 teams:
-  - name: Core team
+  - name: 核心团队
     responsibility: "overall direction of the project, subteam leadership, cross-cutting concerns"
     members: [brson, alexcrichton, wycats, steveklabnik, nikomatsakis, aturon, pcwalton, erickt]
-  - name: Language design team
-    responsibility: "designing new language features"
+  - name: 语言设计团队
+    responsibility: "为语言设计新特性"
     members: [eddyb, nrc, pnkfelix, nikomatsakis, aturon]
     lead: nikomatsakis
-  - name: Library team
-    responsibility: "the Rust standard library, rust-lang crates, conventions"
+  - name: 库团队
+    responsibility: "Rust 标准库、Rust 语言的包及公约"
     members: [brson, alexcrichton, sfackler, BurntSushi, Kimundi, aturon]
     lead: aturon
-  - name: Compiler team
+  - name: 编译器开发团队
     responsibility: "compiler internals, optimizations"
     members: [arielb1, eddyb, nrc, pnkfelix, bkoropoff, nikomatsakis, aatch, dotdash, michaelwoerister, jseyfried]
     lead: nikomatsakis
-  - name: Tooling and infrastructure
-    responsibility: "tool support (e.g. Cargo, rustup), CI infrastructure, etc."
+  - name: 工具和基础组件团队
+    responsibility: "提高工具支持 (譬如 Cargo、rustup)、CI 基础控件，等。"
     members: [brson, nrc, alexcrichton, vadimcn, wycats, michaelwoerister]
     lead: alexcrichton
-  - name: Community team
+  - name: 社区团队
     responsibility: "coordinating events, outreach, commercial users, teaching materials, and exposure"
     lead: erickt
     members: [brson, skade, manishearth, johannhof, steveklabnik, carols10cents, badboy, booyaa, bstrie, erickt, jonathandturner, edunham]
     email: [email protected]
-  - name: Documentation team
-    responsibility: "ensuring Rust has fantastic documentation"
+  - name: 文档团队
+    responsibility: "确保 Rust 拥有极好的文档"
     members: [steveklabnik, GuillaumeGomez, jonathandturner, peschkaj]
   - name: Moderation team
     responsibility: "helping uphold the <a href='https://www.rust-lang.org/conduct.html'>code of conduct</a>"
     members: [mbrubeck, BurntSushi, manishearth, pnkfelix, niconii]
     email: [email protected]
-  - name: Rust team alumni
-    responsibility: "enjoying a leisurely retirement"
+  - name: Rust 团队旧友
+    responsibility: "享受悠哉的退休生活"
     members: [Gankro, huonw]
 
 # Information on sites to get profile information from
@@ -154,7 +154,7 @@ sites:
   margin-bottom: 20px;
 }
 .lead { font-weight: bold; }
-.lead .name::after { content: " (lead)"; }
+.lead .name::after { content: " (负责人)"; }
 .details {
   display: none;
   position: absolute;
@@ -179,12 +179,11 @@ sites:
 }
 </style>
 
-# The Rust Team
+# Rust 团队
 
-The Rust project is
-[governed](https://github.com/rust-lang/rfcs/blob/master/text/1068-rust-governance.md)
-by a number of teams, each focused on a specific area of concern. Below are
-the rosters, in alphabetical order.
+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
@@ -195,12 +194,12 @@ the [Rust security disclosure process](security.html).
 <section id="{{ team.name | replace:' ','-' }}">
 <h2> {{ team.name }} </h2>
 
-<strong>Responsibility</strong>: <em>{{ team.responsibility }}</em>
+<strong>职能</strong>: <em>{{ team.responsibility }}</em>
 
 <br />
 
 {% if team.email %}
-  <strong>Contact</strong>:
+  <strong>联系人</strong>:
   <a href="mailto:{{ team.email | uri_escape }}">{{ team.email }}</a>
 {% endif %}