Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

There are something new in Chinese translation. #578

Merged
merged 8 commits into from
Oct 14, 2016
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions zh-CN/downloads.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be %Y年%-m月%-d日, like "2017年1月1日" or "2017年1月15日"? That is, no leading zero, and no space inbetween. Also, site.beta_date remains untranslated.

(Tip: If you want weekdays as well, you can make use of arrays as previously used by pt-BR. Liquid's support of array is at best strange, though.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In Chinese there need a space between (number or letter )and (chinese words)

Copy link
Contributor Author

@3442853561 3442853561 Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't need weekdays as well,%m mean month,
and I don't know what mean about site.beta_date
@lifthrasiir

Copy link
Contributor

@lifthrasiir lifthrasiir Oct 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3442853561 My impression from various Chinese websites was that there are no spaces between numbers and Chinese letters, but if you say a space is in fact needed, I'm okay with that.

%m will always display two digits for month. %Y 年 %m 月 %-d 日 will give you "2017 年 01 月 1 日" for example, which looks strange.

On site.beta_date, there are two dates for the latest stable release and the upcoming stable release (which is currently at beta). You will want to translate both.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!I will fix it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lifthrasiir THX,I fixed it.

<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">
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -59,7 +58,7 @@ <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.
Expand All @@ -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>
Expand All @@ -109,7 +108,7 @@ <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
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -172,17 +171,17 @@ <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>
Expand All @@ -197,8 +196,7 @@ <h2 id="nightly">Nightly&nbsp; ({{ site.nightly }})</h2>
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>
2 changes: 1 addition & 1 deletion zh-CN/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<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="源码">
Expand Down
45 changes: 22 additions & 23 deletions zh-CN/team.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: The Rust Team &middot; The Rust Programming Language
layout: zh-CN/default
title: Rust 团队 &middot; Rust 程序设计语言

# map from GH username to name & irc nick (irc nick can be omitted if it
# matches GH).
Expand Down Expand Up @@ -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: "提高工具支持 (譬如 Cargorustup)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
Expand Down Expand Up @@ -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
Expand All @@ -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 %}

Expand All @@ -213,7 +212,7 @@ the [Rust security disclosure process](security.html).
{% assign sitename = "github" %}
{% endif %}
{% assign site = page.sites[sitename] %}
<li class="person {% if team.lead and team.lead == nick %}lead{% endif %}">
<li class="person {% if team.lead and team.lead == nick %}负责人{% endif %}">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a CSS class and should not be translated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has been modified

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lifthrasiir fixed

<a href="{{ site.url | replace:'%nick',nick }}">
<div class="name">{{ person.name }}</div>
<div class="details">
Expand Down