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

[fixed and add some new]Chinese translation #629

Merged
merged 8 commits into from
Dec 15, 2016
Merged
Show file tree
Hide file tree
Changes from all 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
6 changes: 3 additions & 3 deletions zh-CN/community.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Rust's developers coordinate in [#rust-internals][internals_irc]. It is for real
[webdev_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-webdev
[docs_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-docs

## Discussion Forums
## 论坛

We have two forums for asynchronous discussion:

Expand Down Expand Up @@ -152,7 +152,7 @@ Contact the [community team][community_team] to add your own.
[user_group]: ./user-groups.html
[calendar]: https://www.google.com/calendar/embed?src=apd9vmbc22egenmtu5l6c5jbfc@group.calendar.google.com

## The Rust Team
## Rust 团队

Rust has a community-driven development process where most decisions are made
through open discussion and consensus, under the stewardship of various
Expand Down Expand Up @@ -206,7 +206,7 @@ help get you started.
[mod_team]: https://www.rust-lang.org/team.html#Moderation
[doc_team]: https://www.rust-lang.org/en-US/team.html#Documentation-team

## Rust Development
## Rust 开发

Rust has had over [1,200 different contributors][authors], a number that grows
every single week. [We'd love for you to join that list][contribute]!
Expand Down
23 changes: 10 additions & 13 deletions zh-CN/contribute.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,29 @@ title: 为 Rust 语言做贡献 · Rust 程序设计语言

**发现了一个大漏洞 (bug),如何报告?** [漏洞报告指南][bugs]. 在此感谢您的建言。

Rust is an expansive system of projects, the most prominent of which
are maintained by [Rust 开发者][devs] in [GitHub 上的 rust-lang][rust-lang]. Newcomers may be
interested in the project's [CONTRIBUTING.md] file, which explains the
mechanics of contributing to [rust-lang/rust].
Rust有一个庞大的项目系统,其中最突出的是由 [Rust 开发者][devs]在的GitHub上维护的[rust-lang][rust-lang]。
如果您刚刚开始贡献之旅,您可能对项目的 [CONTRIBUTING.md] 文件感兴趣,
它解释了对 [rust-lang/rust] 的贡献的机制。

有很多方式为 Rust 语言做出极好的贡献,
这里有几条给新贡献者的建议:

* [发现问题、审查问题以及解决问题](contribute-bugs.html):
The basic work of maintaining a large and active project like Rust.
维持一个像 Rust 这样的庞大而活跃的项目基础工作。
* [文档](contribute-docs.html):
不只限于官方文档——库、博客及其他非官方的消息来源。
* [社区建设](contribute-community.html)
帮助你在Rust中的手足,以及壮大Rust
* [工具、集成开发环境以及infrastructure](contribute-tools.html). The
important pieces that make using a language practical and painless.
帮助你在 Rust 中的手足同胞,以及壮大 Rust
* [工具、集成开发环境以及infrastructure](contribute-tools.html)
语言的实用与人性化是一门好的语言的关键所在。
* [库](contribute-libs.html):
Rust's suitability for any particular task is mostly
dependent on availability of quality libraries.
Rust 对任何特定任务的适用性主要取决于那些高质量库的可用性。
* [语言、编译器和标准库](contribute-compiler.html):
语言设计、 功能实现、 性能的改善。

如果您需要额外的指导请参考 [#rust-internals] 或 [internals.rust-lang.org]。

We pride ourselves on maintaining civilized discourse, and to that end
contributors are expected to follow our [行为规范][coc]。
我们为保持自身修养而感到自豪,因此希望贡献者遵循我们的[社区行为规范][coc]。
如果您还要其他问题可以咨询我们的[社区团队][community team]。

<!--
Expand All @@ -46,7 +43,7 @@ libs / community building
-->

[#rust-internals]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
[CONTRIBUTING.md]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
[bugs]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[coc]: https://www.rust-lang.org/conduct.html
[community team]: https://www.rust-lang.org/team.html#Community
Expand Down
29 changes: 11 additions & 18 deletions zh-CN/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ title: Rust 语言文档 &middot; Rust 程序设计语言

[Rust 高级教程][nomicon]: 为高级 Rust 工程师准备的专门讲解如何编写不安全的Rust代码的书。

[学习 Rust]: 由社区维护、收集的学习 Rust 资料合集。
[学习 Rust][rust-learning]: 由社区维护、收集的学习 Rust 资料合集。

[常见问题][faq]

Expand All @@ -31,9 +31,8 @@ title: Rust 语言文档 &middot; Rust 程序设计语言

[标准库][api]: Rust 标准库文档

[Rust 语言参考手册][ref]. While Rust does not have a
specification, the reference tries to describe its working in
detail. It tends to be out of date.
[Rust 语言参考手册][ref]: 当Rust还没有一个语言规范的时候,这个文档对它进行了尽可能详尽的描述。
不过当有文档的时候某些内容可能已经过时了。

[语法索引][syn]: 本索引中包含 Rust 中与《Rust 程序设计语言》的部分交叉引用的所有语法示例。

Expand All @@ -42,7 +41,7 @@ detail. It tends to be out of date.

[编译器错误索引][err]: 编译器生成错误报告的扩展说明。

[Release Notes][release_notes]. A recording of changes made during each release.
[版本维护文档][release_notes]: 每次发布期间所做更改的记录文档。

[api]: https://doc.rust-lang.org/std/
[syn]: https://doc.rust-lang.org/book/syntax-index.html
Expand All @@ -51,29 +50,23 @@ detail. It tends to be out of date.
[err]: https://doc.rust-lang.org/error-index.html
[release_notes]: https://github.com/rust-lang/rust/blob/stable/RELEASES.md

## Project policies
## Rust 项目政策与策略

[Rust security policy][security]. The project's policies for
reporting, fixing and disclosing security-related bugs.
[Rust 安全策略][security]。该项目策略,修复和披露安全相关问题策略。

[Rust copyright and trademark policies][legal]. The Rust
copyrights are owned by The Rust Project Developers, and its
trademarks are owned by Mozilla. Appropriate usage of Rust's
trademarks are described here.
[Rust 版权和商标政策][legal]。 Rust的版权归 Rust 项目开发者所有,其商标归 Mozilla 所有。
改政策描述了 Rust 的商标的使用范畴。

[Code of Conduct][coc]. Applies to the rust-lang organization
on GitHub, the official forums, IRC channels, and various
other corners of the Rust world.
[社区行为规范][coc]。 适用于包括但不仅限于 GitHub 上的 Rust-lang 组织,
官方论坛,IRC 通道的所有 Rust 社区。

[security]: security.html
[legal]: legal.html
[coc]: https://www.rust-lang.org/conduct.html

## 开发版与测试版文档

Much of the official Rust documentation is also available for the
[nightly] and [beta] releases in addition to the stable documentation
linked above.
除了上面链接的稳定文档外,大多数官方Rust文档也可用于[开发版][nightly]和[测试版][beta]。

[nightly]: https://doc.rust-lang.org/nightly/
[beta]: https://doc.rust-lang.org/beta/
Expand Down
1 change: 1 addition & 0 deletions zh-CN/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ <h2>特点</h2>
</div>
<div id="static-code">{% include zh-CN/example.rs.html %}</div>
<div class="more-examples">
<a href="https://play.rust-lang.org/?gist=a22cc6240ff70436cb3ff29c8c1a36df&version=nightly&backtrace=2">使用母语编程</a>
<a href="http://rustbyexample.com/">更多例子</a>
</div>
</div>
Expand Down