rust-lang · alexcrichton · Mar 11, 2017 · Feb 25, 2017 · Feb 27, 2017 · Mar 11, 2017
diff --git a/es-ES/contribute-bugs.md b/es-ES/contribute-bugs.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; finding, triaging and fixing issues &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-community.md b/es-ES/contribute-community.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; community building &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-compiler.md b/es-ES/contribute-compiler.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; language, compiler, and the standard library &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-docs.md b/es-ES/contribute-docs.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; documentation &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-libs.md b/es-ES/contribute-libs.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; libraries &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-tools.md b/es-ES/contribute-tools.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &mdash; tooling, IDEs and infrastructure &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/contribute-translations.md b/es-ES/contribute-translations.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Translating rust-lang.org to other languages to adapt internationalization 
 ---
 

diff --git a/es-ES/contribute.md b/es-ES/contribute.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Contributing to Rust &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/faq.md b/es-ES/faq.md
@@ -1,5 +1,5 @@
 ---
-layout: faq
+layout: es-ES/faq
 title: Frequently Asked Questions &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/legal.md b/es-ES/legal.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Rust Legal Policies &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/other-installers.md b/es-ES/other-installers.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Other Installation Methods &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/security.html b/es-ES/security.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Rust Security Policy &middot; The Rust Programming Language
 ---
 

diff --git a/es-ES/user-groups.md b/es-ES/user-groups.md
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: es-ES/default
 title: Rust User Groups &middot; The Rust Programming Language
 ---
 

diff --git a/ja-JP/contribute.md b/ja-JP/contribute.md
@@ -40,6 +40,9 @@ TODO: Write guide to advertising Rust projects to link from
 libs / community building
 -->
 
+We pride ourselves on maintaining civilized discourse, and to that end contributors are expected to follow our [Code of Conduct][coc].
+If you have questions about this please inquire with the [community team][community team].
+
 [#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
 [bugs]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports

diff --git a/zh-CN/conduct.md b/zh-CN/conduct.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: The Rust Code of Conduct &middot; The Rust Programming Language
+title: The Rust Code of Conduct &middot; Rust 程序设计语言
 ---
 
 # The Rust Code of Conduct

diff --git a/zh-CN/contribute-bugs.md b/zh-CN/contribute-bugs.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; finding, triaging and fixing issues &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; finding, triaging and fixing issues &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; finding, triaging and fixing issues

diff --git a/zh-CN/contribute-community.md b/zh-CN/contribute-community.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; community building &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; community building &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; community building

diff --git a/zh-CN/contribute-compiler.md b/zh-CN/contribute-compiler.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; language, compiler, and the standard library &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; language, compiler, and the standard library &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; language, compiler, and the standard library

diff --git a/zh-CN/contribute-docs.md b/zh-CN/contribute-docs.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; documentation &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; documentation &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; documentation

diff --git a/zh-CN/contribute-libs.md b/zh-CN/contribute-libs.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; libraries &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; libraries &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; libraries

diff --git a/zh-CN/contribute-tools.md b/zh-CN/contribute-tools.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Contributing to Rust &mdash; tooling, IDEs and infrastructure &middot; The Rust Programming Language
+title: Contributing to Rust &mdash; tooling, IDEs and infrastructure &middot; Rust 程序设计语言
 ---
 
 # Contributing to Rust &mdash; tooling, IDEs and infrastructure

diff --git a/zh-CN/faq.md b/zh-CN/faq.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/faq
-title: Frequently Asked Questions &middot; The Rust Programming Language
+title: Frequently Asked Questions &middot; Rust 程序设计语言
 ---
 
 # Frequently Asked Questions

diff --git a/zh-CN/legal.md b/zh-CN/legal.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Rust Legal Policies &middot; The Rust Programming Language
+title: Rust Legal Policies &middot; Rust 程序设计语言
 ---
 
 # Copyright

diff --git a/zh-CN/other-installers.md b/zh-CN/other-installers.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Other Installation Methods &middot; The Rust Programming Language
+title: Other Installation Methods &middot; Rust 程序设计语言
 ---
 
 # Other Rust Installation Methods

diff --git a/zh-CN/security.html b/zh-CN/security.html
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Rust Security Policy &middot; The Rust Programming Language
+title: Rust Security Policy &middot; Rust 程序设计语言
 ---
 
 <h1>Rust Security Policy</h1>

diff --git a/zh-CN/team.md b/zh-CN/team.md
@@ -5,7 +5,7 @@ title: Rust 团队 &middot; Rust 程序设计语言
 localized-teams:
   Core team:
     name: 核心团队
-    responsibility: "overall direction of the project, subteam leadership, cross-cutting concerns"
+    responsibility: "把握项目的总体方向、领导子团队、横向关注"
   Language design team:
     name: 语言设计团队
     responsibility: "为语言设计新特性"
@@ -25,7 +25,7 @@ localized-teams:
     name: 文档团队
     responsibility: "确保 Rust 拥有极好的文档"
   Moderation team:
-    name: Moderation team
+    name: 审核团队
     responsibility: "helping uphold the <a href='https://www.rust-lang.org/conduct.html'>code of conduct</a>"
   Rust team alumni:
     name: Rust 团队旧友
@@ -71,9 +71,9 @@ localized-teams:
 
 # Rust 团队
 
-Rust 的项目是由若干个小组分别
+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
@@ -108,7 +108,7 @@ the [Rust security disclosure process](security.html).
     <div class="details">
       <div>irc: {% if person.irc %}{{ person.irc }}{% else %}{{ nick }}{% endif %}</div>
       {% if person.ex-teams %}
-      <div>teams: {% for ex-team in person.ex-teams %}{% if forloop.first == false %}, {% endif %}{{ page.localized-ex-teams[ex-team] | default: ex-team }}{% endfor %}</div>
+      <div>团队: {% for ex-team in person.ex-teams %}{% if forloop.first == false %}, {% endif %}{{ page.localized-ex-teams[ex-team] | default: ex-team }}{% endfor %}</div>
       {% endif %}
     </div>
     <img class="headshot" src="{{ website.avatar | replace:'%nick',nick }}" alt="{{ person.name }}">

diff --git a/zh-CN/user-groups.md b/zh-CN/user-groups.md
@@ -1,6 +1,6 @@
 ---
 layout: zh-CN/default
-title: Rust User Groups &middot; The Rust Programming Language
+title: Rust User Groups &middot; Rust 程序设计语言
 ---
 
 # Rust User Groups