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

Commit 148d531

Browse files
authored
Merge pull request #727 from 3442853561/中文fix
Fixed some different places between Chinese and English
2 parents 989b854 + 8612251 commit 148d531

File tree

2 files changed

+37
-39
lines changed

2 files changed

+37
-39
lines changed

zh-CN/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<div class="row pitch-row">
77
<div class="col-md-8">
88
<p class="pitch">
9-
<b>Rust</b> 是一种注重高效、安全、并行的系统程序语言。
9+
<b>Rust</b> 是一种系统编程语言。
10+
它具有惊人的运行速度,能够防止程序错误,并保证了线程安全。
1011
<br/>
1112
<b><a href="friends.html">看看谁在使用 Rust</a></b>
1213
</p>
@@ -27,7 +28,7 @@ <h2>特点</h2>
2728
<li>转移语义</li>
2829
<li>保证内存安全</li>
2930
<li>没有数据竞争的线程</li>
30-
<li>trait泛型</li>
31+
<li>trait 泛型</li>
3132
<li>模式匹配</li>
3233
<li>类型推断</li>
3334
<li>极小运行时</li>

zh-CN/install.html

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
layout: zh-CN/default
3-
title: Installation &middot; The Rust Programming Language
3+
title: 安装 &middot; Rust 程序设计语言
44
---
55
<h1 class="rustup">安装 Rust</h1>
66

77
<div class="row rustup-row">
88
<div class="col-md-8 instr-column">
99
<div id="platform-instructions-unix" class="instructions" style="display: none;">
10-
<p>To install Rust, run the following in your terminal, then follow the onscreen instructions.</p>
10+
<p>要安装 Rust 时,请在终端中运行以下命令,然后按照屏幕上的提示进行操作。</p>
1111
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
1212
</div>
1313

@@ -22,30 +22,30 @@ <h1 class="rustup">安装 Rust</h1>
2222
<div id="platform-instructions-android" class="instructions" style="display: none;">
2323
<p>您似乎正在安卓(Android)操作系统上浏览本页面</p>
2424
<p>
25-
The Rust compiler does not run on Android directly (yet),
26-
but it does make it easy to cross-compile <em>to</em> Android.
27-
Install Rust on a supported host platform and
25+
Rust 编译器(暂时)不能直接在安卓(Android)上运行,
26+
但它确实使得它很容易交叉编译<em></em>安卓(Android)上。
27+
请在支持的主机平台上安装 Rust
2828
<a href="https://github.com/rust-lang-nursery/rustup.rs/#cross-compilation">
29-
follow the cross-compilation instructions
29+
遵循交叉编译指令
3030
</a>
31-
to build Rust applications for Android.
31+
来构建安卓(Android)平台的 Rust 应用程序。
3232
</p>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
3636
<!-- unrecognized platform: ask for help -->
37-
<p>I don't recognize your platform.</p>
37+
<p>无法识别您的平台</p>
3838
<p>
39-
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
40-
you are on one of these platforms and are seeing this then please
41-
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
42-
along with the following values:
39+
可以运行在 Windows, Linux, Mac OS X, FreeBSD NetBSD 上。
40+
如果您正在这些平台上,并且看到这句话,请您
41+
<a href="https://github.com/rust-lang/rust-www/issues/new">报告问题(issue)</a>,
42+
并且提供以下信息:
4343
</p>
4444

4545
<div>
46-
<div>navigator.platform:</div>
46+
<div>navigator.platform:(浏览器.平台)</div>
4747
<div id="nav-plat"></div>
48-
<div>navigator.appVersion:</div>
48+
<div>navigator.appVersion:(浏览器.版本)</div>
4949
<div id="nav-app"></div>
5050
</div>
5151

@@ -97,30 +97,30 @@ <h1 class="rustup">安装 Rust</h1>
9797
<br>
9898

9999
<a id="platform-button" style="display: none;" href="#">
100-
click or press "n" to cycle platforms
100+
点击或按下 “n” 键更换平台
101101
</a>
102102
</div>
103103
</div>
104104

105105
</div>
106106

107-
<h2>Notes about Rust installation</h2>
107+
<h2>关于 Rust 安装的注意事项</h2>
108108

109109
<div class="row">
110110
<div class="col-md-12">
111111

112-
<h3>Toolchain management with <code>rustup</code></h3>
112+
<h3>使用 <code>rustup</code> 管理工具链</h3>
113113

114114
<p>
115-
Rust is installed and managed by the
115+
Rust
116116
<a href="https://github.com/rust-lang-nursery/rustup.rs"><code>rustup</code></a>
117-
tool. Rust has a 6-week
117+
工具来安装和管理。 Rust有一个6周的
118118
<a href="https://github.com/rust-lang/rfcs/blob/master/text/0507-release-channels.md">
119-
rapid release process
120-
</a> and supports a
119+
快速发布过程
120+
</a> 并且支持
121121
<a href="https://forge.rust-lang.org/platform-support.html">
122-
great number of platforms
123-
</a>, so there are many builds of Rust available at any time.
122+
大量的平台
123+
</a>,所以任何时候都有很多Rust构建可用。
124124
<code>rustup</code> manages these builds in a consistent way on every
125125
platform that Rust supports, enabling installation of Rust from the
126126
beta and nightly release channels as well as support for additional
@@ -133,18 +133,18 @@ <h3>Toolchain management with <code>rustup</code></h3>
133133
documentation</a>.
134134
</p>
135135

136-
<h3>Configuring the <code>PATH</code> environment variable</h3>
136+
<h3>配置 <code>PATH</code> 环境变量</h3>
137137

138138
<p>
139-
In the Rust development environment, all tools are installed to the
139+
Rust 开发环境中,所有工具都安装到
140140
<span class="platform-specific not-win" style="display: inline;">
141141
<code>~/.cargo/bin</code>
142142
</span>
143143
<span class="platform-specific win" style="display: none;">
144144
<code>%USERPROFILE%\.cargo\bin</code>
145-
</span> directory,
146-
and this is where you will find the Rust toolchain, including
147-
<code>rustc</code>, <code>cargo</code>, and <code>rustup</code>.
145+
</span> 目录,
146+
并且您能够在这里找到 Rust 工具链,包括
147+
<code>rustc</code><code>cargo</code><code>rustup</code>
148148
</p>
149149

150150
<p>
@@ -160,13 +160,12 @@ <h3>Configuring the <code>PATH</code> environment variable</h3>
160160
</p>
161161

162162
<p>
163-
If, after installation, running <code>rustc --version</code> in the
164-
console fails, this is the most likely reason.
163+
当安装完成之后,如果在控制台运行 <code>rustc --version</code> 失败,这是最可能的原因。
165164
</p>
166165

167166
<div class="platform-specific win">
168167

169-
<h3>Windows considerations</h3>
168+
<h3>Windows 注意事项</h3>
170169
<!-- This anchor is probably linked in the wild and should not be broken -->
171170
<a id="win-foot"></a>
172171

@@ -194,16 +193,14 @@ <h3>Windows considerations</h3>
194193
</div>
195194
</div>
196195

197-
<h2>Other installation methods</h3>
196+
<h2>其他安装方法</h3>
198197

199198
<div class="row">
200199
<div class="col-md-12">
201200
<p>
202-
The installation described above, via
203-
<code>rustup</code>, is the preferred way to install Rust for most developers,
204-
but Rust can be
205-
<a href="other-installers.html">installed via other methods</a>
206-
as well.
201+
上述的通过 <code>rustup</code> 的安装方法是大多数开发者的首选。
202+
但是 Rust 也可以
203+
<a href="other-installers.html">通过其他方法安装</a>
207204
</p>
208205
</div>
209206
</div>

0 commit comments

Comments
 (0)