Skip to content

Commit 962a7ad

Browse files
ManishearthManishearth
authored
Merge pull request #1611 from rust-lang/master
Deploy
2 parents 4740216 + 5d6bc4b commit 962a7ad

File tree

23 files changed

+30
-26
lines changed

23 files changed

+30
-26
lines changed

‎Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66

77
[dependencies]
88
lazy_static = "1.2.0"
9-
fluent = "0.15"
9+
fluent = "0.16"
1010
fluent-bundle = "0.6.0"
1111
fluent-syntax = "0.11.0"
1212
fluent-locale = "0.10.1"

‎locales/de/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tools-automation-cargo-doc-link = Zur Webseite
2727
## components/tools/editors.hbs
2828

2929
tools-editor-vscode = VS Code
30-
tools-editor-sublime = Sublime Text 3
30+
tools-editor-sublime = Sublime Text
3131
tools-editor-atom = Atom
3232
tools-editor-idea = IntelliJ IDEA
3333
tools-editor-eclipse = Eclipse

‎locales/en-US/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ tools-rustup-manual-default-windows = If you are running Windows,<br>download an
175175
## components/tools/editors.hbs
176176

177177
tools-editor-vscode = VS Code
178-
tools-editor-sublime = Sublime Text 3
178+
tools-editor-sublime = Sublime Text
179179
tools-editor-atom = Atom
180180
tools-editor-idea = IntelliJ IDEA
181181
tools-editor-eclipse = Eclipse

‎locales/es/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ tools-rustup-manual-default-windows = Si usas Windows, <br>descarga y ejecuta <a
119119
## components/tools/editors.hbs
120120

121121
tools-editor-vscode = VS Code
122-
tools-editor-sublime = Sublime Text 3
122+
tools-editor-sublime = Sublime Text
123123
tools-editor-atom = Atom
124124
tools-editor-idea = IntelliJ IDEA
125125
tools-editor-eclipse = Eclipse

‎locales/fa/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ install-other-methods-link = آموزش بیشتر
1919
## components/tools/editors.hbs
2020

2121
tools-editor-vscode = VS Code
22-
tools-editor-sublime = Sublime Text 3
22+
tools-editor-sublime = Sublime Text
2323
tools-editor-atom = Atom
2424
tools-editor-idea = IntelliJ IDEA
2525
tools-editor-eclipse = Eclipse

‎locales/fr/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ tools-rustup-manual-default-windows = Si vous utilisez Windows,<br> télécharge
104104
## components/tools/editors.hbs
105105

106106
tools-editor-vscode = VS Code
107-
tools-editor-sublime = Sublime Text 3
107+
tools-editor-sublime = Sublime Text
108108
tools-editor-atom = Atom
109109
tools-editor-idea = IntelliJ IDEA
110110
tools-editor-eclipse = Eclipse

‎locales/it/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ tools-rustup-manual-default-windows = Se stai usando Windows,<br>scarica ed eseg
9494
## components/tools/editors.hbs
9595

9696
tools-editor-vscode = VS Code
97-
tools-editor-sublime = Sublime Text 3
97+
tools-editor-sublime = Sublime Text
9898
tools-editor-atom = Atom
9999
tools-editor-idea = Intellij IDEA
100100
tools-editor-eclipse = Eclipse

‎locales/ja/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ tools-rustup-manual-default-windows = Windows上であれば、<br><a href="http
9595
## components/tools/editors.hbs
9696

9797
tools-editor-vscode = VS Code
98-
tools-editor-sublime = Sublime Text 3
98+
tools-editor-sublime = Sublime Text
9999
tools-editor-atom = Atom
100100
tools-editor-idea = IntelliJ IDEA
101101
tools-editor-eclipse = Eclipse

‎locales/ko/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ tools-rustup-wsl-heading = Linux용 Windows 하위 시스템 (WSL)
5454
## components/tools/editors.hbs
5555

5656
tools-editor-vscode = VS Code
57-
tools-editor-sublime = Sublime Text 3
57+
tools-editor-sublime = Sublime Text
5858
tools-editor-atom = Atom
5959
tools-editor-idea = IntelliJ IDEA
6060
tools-editor-eclipse = Eclipse

‎locales/pl/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ tools-rustup-report = Zgłoś problem
3939
## components/tools/editors.hbs
4040

4141
tools-editor-vscode = VS Code
42-
tools-editor-sublime = Sublime Text 3
42+
tools-editor-sublime = Sublime Text
4343
tools-editor-atom = Atom
4444
tools-editor-idea = IntelliJ IDEA
4545
tools-editor-eclipse = Eclipse

‎locales/pt-BR/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ tools-rustup-manual-default-windows = Se você estiver rodando Windows, <br> fa
144144
## components/tools/editors.hbs
145145

146146
tools-editor-vscode = VS Code
147-
tools-editor-sublime = Sublime Text 3
147+
tools-editor-sublime = Sublime Text
148148
tools-editor-atom = Atom
149149
tools-editor-idea = IntelliJ IDEA
150150
tools-editor-eclipse = Eclipse

‎locales/ru/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ tools-rustup-manual-default-windows = Если у вас запущен Windows,
117117
## components/tools/editors.hbs
118118

119119
tools-editor-vscode = VS Code
120-
tools-editor-sublime = Sublime Text 3
120+
tools-editor-sublime = Sublime Text
121121
tools-editor-atom = Atom
122122
tools-editor-idea = IntelliJ IDEA
123123
tools-editor-eclipse = Eclipse

‎locales/tr/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ tools-rustup-manual-default-windows = Eğer Windows kullanıyorsanız <br><a hre
128128
## components/tools/editors.hbs
129129

130130
tools-editor-vscode = { ENGLISH("VS Code") }
131-
tools-editor-sublime = { ENGLISH("Sublime Text 3") }
131+
tools-editor-sublime = { ENGLISH("Sublime Text") }
132132
tools-editor-atom = { ENGLISH("Atom") }
133133
tools-editor-idea = { ENGLISH("IntelliJ IDEA") }
134134
tools-editor-eclipse = { ENGLISH("Eclipse") }

‎locales/zh-CN/learn.ftl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ learn-reference-button = 阅读《参考手册》
4242
learn-nomicon-alt = 双手捧火
4343
learn-nomicon = 《Rust 秘典》是 Unsafe Rust 的黑魔法指南。它有时被称作“死灵书”。
4444
learn-nomicon-button = 阅读《Rust 秘典》
45+
translated-nomicon = https://nomicon.purewhite.io/
46+
translated-nomicon-button = 阅读非官方翻译
4547
learn-unstable-alt = 手洒星光
4648
learn-unstable = 《未稳定特性手册》覆盖了当前只能在 nightly Rust 中使用的还未稳定的特性。
4749
learn-unstable-button = 阅读《未稳定特性手册》

‎locales/zh-CN/policies.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ policies-security-link = 安全信息公示
1212
policies-privacy-link = 隐私声明
1313
policies-reach-out-description = 没有找到您要找的内容？有问题？请联系我们！
1414
policies-reach-out-link = 致信核心团队
15+
policies-translation-warning = 本政策可能是 Rust 社区成员所翻译。若翻译版本有任何与<a href="{ $english }">英文版本</a>冲突之处，以英文版本为准。

‎locales/zh-CN/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ tools-rustup-manual-default-windows = 如果您正在运行 Windows，<br>请下
131131
## components/tools/editors.hbs
132132

133133
tools-editor-vscode = VS Code
134-
tools-editor-sublime = Sublime Text 3
134+
tools-editor-sublime = Sublime Text
135135
tools-editor-atom = Atom
136136
tools-editor-idea = IntelliJ IDEA
137137
tools-editor-eclipse = Eclipse

‎locales/zh-TW/tools.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ tools-rustup-manual-default-windows = 如果您的電腦是 Windows 作業系統
105105
## components/tools/editors.hbs
106106

107107
tools-editor-vscode = VS Code
108-
tools-editor-sublime = Sublime Text 3
108+
tools-editor-sublime = Sublime Text
109109
tools-editor-atom = Atom
110110
tools-editor-idea = IntelliJ IDEA
111111
tools-editor-eclipse = Eclipse

‎src/data/users.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,9 @@
458458
logo: coreos.svg
459459
how: "Tools shipped within the Container Linux distribution as well as internal tooling including documentation transformation and validation."
460460
-
461-
name: 3D Hubs
462-
url: https://www.3dhubs.com/
463-
logo: 3dhubs.png
461+
name: Hubs
462+
url: https://www.hubs.com/
463+
logo: hubs.png
464464
how: "We use Rust to do performance critical heavy lifting in our 3D model processing backend."
465465
-
466466
name: VersionEye

‎static/images/user-logos/3dhubs.png

-23.4 KB
Binary file not shown.

‎static/images/user-logos/hubs.png

5.08 KB
Loading

‎templates/learn/get-started.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fn main() {
101101
{{/fluentparam}}
102102
{{#fluentparam "output"}}
103103
<pre><code class="plaintext">----------------------------
104-
| Hello fellow Rustaceans! |
104+
< Hello fellow Rustaceans! >
105105
----------------------------
106106
\
107107
\

‎templates/learn/index.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
href="https://doc.rust-lang.org/nomicon/index.html">
178178
{{fluent "learn-nomicon-button"}}
179179
</a>
180+
{{#if (fluent "translated-nomicon")}}<a class="button-additional" href={{fluent "translated-nomicon"}}>{{fluent "translated-nomicon-button"}}</a>{{/if}}
180181
</div>
181182
</div>
182183

0 commit comments

Comments
 (0)