From 27846fdd3eb71a072ab28af7dd07069c6dd622da Mon Sep 17 00:00:00 2001 From: Zhicheng Wang Date: Wed, 11 May 2016 17:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=95=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/docs/ts/latest/guide/style-guide.jade | 4 ---- public/docs/ts/latest/tutorial/index.jade | 4 ++-- public/features.jade | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/public/docs/ts/latest/guide/style-guide.jade b/public/docs/ts/latest/guide/style-guide.jade index 83659d2b08..6a608c2f19 100644 --- a/public/docs/ts/latest/guide/style-guide.jade +++ b/public/docs/ts/latest/guide/style-guide.jade @@ -347,11 +347,7 @@ a(href="#toc") 回到顶部 .s-rule.do :marked **Do** use consistent names for all assets named after what they represent. -<<<<<<< HEAD **做** 为所有东西使用统一的命名：以它们所代表的东西命名 -======= - **做** 为所有财产的使用统一的命名：以它们所代表的东西命名 ->>>>>>> f0e75413c854b8966c506c7c351339c9f5e98512 .s-rule.do :marked diff --git a/public/docs/ts/latest/tutorial/index.jade b/public/docs/ts/latest/tutorial/index.jade index e394d340bd..50a129fe89 100644 --- a/public/docs/ts/latest/tutorial/index.jade +++ b/public/docs/ts/latest/tutorial/index.jade @@ -8,14 +8,14 @@ include ../_util-fns Our grand plan is to build an app to help a staffing agency manage its stable of heroes. Even heroes need to find work. - 我们的终极计划是构建一个程序，来帮助职业介绍所管理英雄选择器（译注：比如WoW登录后看到的那个列表就是“英雄选择器”）。毕竟，英雄们也得养家糊口嘛！ + 我们的终极计划是构建一个程序，来帮助职业介绍所管理英雄围栏（译注：比如WoW登录后看到的那个列表就是“英雄围栏”）。毕竟，英雄们也得养家糊口嘛！ Of course we'll only make a little progress in this tutorial. What we do build will have many of the features we expect to find in a full-blown, data-driven application: acquiring and displaying a list of heroes, editing a selected hero's detail, and navigating among different views of heroic data. - 当然，在这个教程中，我们只完成一小步。我们这次构建的应用将用到很多对特性：获得并显示英雄列表，编辑所选英雄的详情，并在英雄数据的多个视图之间建立导航。这些特性，在全面、数据驱动的应用中经常见到。 + 当然，在这个教程中，我们只完成一小步。我们这次构建的应用将用到很多特性：获得并显示英雄列表，编辑所选英雄的详情，并在英雄数据的多个视图之间建立导航。这些特性，在全面、数据驱动的应用中经常见到。 The Tour of Heroes covers the core fundamentals of Angular. We’ll use built-in directives to show/hide elements and display lists of hero data. diff --git a/public/features.jade b/public/features.jade index e476b6c2a3..7ac9ee3b4d 100644 --- a/public/features.jade +++ b/public/features.jade @@ -71,7 +71,7 @@ div h3 Animation h3 动画 p(class="text-body") Create high performance complex choreographies and animation timelines with very little code through Angular's intuitive API. - p(class="text-body") 通过Angular中直观的API创建高性能复杂编排和动画时间线 —— 只需要非常少量的代码。 + p(class="text-body") 通过Angular中直观简便的API创建高性能复杂编排和动画时间线 —— 只要非常少的代码。 div(class="feature") h3 Accessibility h3 可访问性