diff --git a/aio/content/guide/aot-compiler.md b/aio/content/guide/aot-compiler.md
index 5db3fc288e..2f72c86c9a 100644
--- a/aio/content/guide/aot-compiler.md
+++ b/aio/content/guide/aot-compiler.md
@@ -13,7 +13,7 @@ This guide explains how to build with the AOT compiler using different compiler
   <a href="https://www.youtube.com/watch?v=kW9cJsvcsGo">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.
 
   <a href="https://www.youtube.com/watch?v=kW9cJsvcsGo">观看 Angular 编译器的作者Tobias Bosch 在 AngularConnect 2016 上对编译器的解释。</a>
-  
+
 </div>
 
 {@a overview}
@@ -35,10 +35,8 @@ Angular offers two ways to compile your application:
 JIT compilation is the default when you run the _build-only_ or the _build-and-serve-locally_ CLI commands:
 
 <code-example language="sh" class="code-shell">
-
   ng build
   ng serve
-
 </code-example>
 
 {@a compile}
@@ -46,10 +44,8 @@ JIT compilation is the default when you run the _build-only_ or the _build-and-s
 For AOT compilation, append the `--aot` flags to the _build-only_ or the _build-and-serve-locally_ CLI commands:
 
 <code-example language="sh" class="code-shell">
-
   ng build --aot
   ng serve --aot
-
 </code-example>
 
 <div class="l-sub-section">
@@ -126,6 +122,7 @@ You can control your app compilation by providing template compiler options in t
 `"angularCompilerOptions"` object as shown below:
 
 ```json
+
 {
   "compilerOptions": {
     "experimentalDecorators": true,
@@ -137,6 +134,7 @@ You can control your app compilation by providing template compiler options in t
     ...
   }
 }
+
 ```
 
 ### *skipMetadataEmit*
@@ -316,6 +314,7 @@ In the following example, the `@Component()` metadata object and the class const
 在下列范例中，`@Component()` 元数据对象和类的构造函数会告诉 Angular 如何创建和显示 `TypicalComponent` 的实例。
 
 ```typescript
+
 @Component({
   selector: 'app-typical',
   template: '<div>A typical component for {{data.name}}</div>'
@@ -324,6 +323,7 @@ export class TypicalComponent {
   @Input() data: TypicalData;
   constructor(private someService: SomeService) { ... }
 }
+
 ```
 
 The Angular compiler extracts the metadata _once_ and generates a _factory_ for `TypicalComponent`.
@@ -435,10 +435,12 @@ piece of metadata to generate the application code.
  如果你希望`ngc`立即汇报这些语法错误，而不要生成带有错误信息的`.metadata.json`文件，可以到`tsconfig`中设置 `strictMetadataEmit` 选项。
 
 ```
+
   "angularCompilerOptions": {
    ...
    "strictMetadataEmit" : true
  }
+
  ```
 
 Angular libraries have this option to ensure that all Angular `.metadata.json` files are clean and it is a best practice to do the same when building your own libraries.
@@ -448,6 +450,7 @@ Angular 库通过这个选项来确保所有的 `.metadata.json` 文件都是干
 </div>
 
 {@a function-expression}
+
 {@a arrow-functions}
 
 ### No arrow functions
@@ -458,10 +461,12 @@ and [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Re
 Consider the following component decorator:
 
 ```typescript
+
 @Component({
   ...
   providers: [{provide: server, useFactory: () => new Server()}]
 })
+
 ```
 
 The AOT _collector_ does not support the arrow function, `() => new Server()`, in a metadata expression.
@@ -472,6 +477,7 @@ When the compiler later interprets this node, it reports an error that invites y
 You can fix the error by converting to this:
 
 ```typescript
+
 export function serverFactory() {
   return new Server();
 }
@@ -480,6 +486,7 @@ export function serverFactory() {
   ...
   providers: [{provide: server, useFactory: serverFactory}]
 })
+
 ```
 
 Beginning in version 5, the compiler automatically performs this rewritting while emitting the `.js` file.
@@ -496,6 +503,7 @@ The compiler only supports calls to a small set of functions and will use `new`
 ### Folding
 
 {@a exported-symbols}
+
 The compiler can only resolve references to **_exported_** symbols.
 Fortunately, the _collector_ enables limited use of non-exported symbols through _folding_.
 
@@ -506,12 +514,14 @@ For example, the _collector_ can evaluate the expression `1 + 2 + 3 + 4` and rep
 This process is called _folding_. An expression that can be reduced in this manner is _foldable_.
 
 {@a var-declaration}
+
 The collector can evaluate references to
 module-local `const` declarations and initialized `var` and `let` declarations, effectively removing them from the `.metadata.json` file.
 
 Consider the following component definition:
 
 ```typescript
+
 const template = '<div>{{hero.name}}</div>';
 
 @Component({
@@ -521,6 +531,7 @@ const template = '<div>{{hero.name}}</div>';
 export class HeroComponent {
   @Input() hero: Hero;
 }
+
 ```
 
 The compiler could not refer to the `template` constant because it isn't exported.
@@ -529,6 +540,7 @@ But the _collector_ can _fold_ the `template` constant into the metadata definit
 The effect is the same as if you had written:
 
 ```typescript
+
 @Component({
   selector: 'app-hero',
   template: '<div>{{hero.name}}</div>'
@@ -536,6 +548,7 @@ The effect is the same as if you had written:
 export class HeroComponent {
   @Input() hero: Hero;
 }
+
 ```
 
 There is no longer a reference to `template` and, therefore, nothing to trouble the compiler when it later interprets the _collector's_ output in `.metadata.json`.
@@ -543,6 +556,7 @@ There is no longer a reference to `template` and, therefore, nothing to trouble
 You can take this example a step further by including the `template` constant in another expression:
 
 ```typescript
+
 const template = '<div>{{hero.name}}</div>';
 
 @Component({
@@ -552,6 +566,7 @@ const template = '<div>{{hero.name}}</div>';
 export class HeroComponent {
   @Input() hero: Hero;
 }
+
 ```
 
 The _collector_ reduces this expression to its equivalent _folded_ string:
@@ -600,6 +615,7 @@ Decorated component class members must be public. You cannot make an `@Input()`
 Data bound properties must also be public.
 
 ```typescript
+
 // BAD CODE - title is private
 @Component({
   selector: 'app-root',
@@ -608,9 +624,11 @@ Data bound properties must also be public.
 export class AppComponent {
   private title = 'My App'; // Bad
 }
+
 ```
 
 {@a supported-functions}
+
 Most importantly, the compiler only generates code to create instances of certain classes, support certain decorators, and call certain functions from the following lists.
 
 ### New instances
@@ -650,9 +668,11 @@ methods that return an expression.
 For example, consider the following function:
 
 ```typescript
+
 export function wrapInArray<T>(value: T): T[] {
   return [value];
 }
+
 ```
 
 You can call the `wrapInArray` in a metadata definition because it returns the value of an expression that conforms to the compiler's restrictive JavaScript subset.
@@ -660,19 +680,23 @@ You can call the `wrapInArray` in a metadata definition because it returns the v
 You might use  `wrapInArray()` like this:
 
 ```typescript
+
 @NgModule({
   declarations: wrapInArray(TypicalComponent)
 })
 export class TypicalModule {}
+
 ```
 
 The compiler treats this usage as if you had written:
 
 ```typescript
+
 @NgModule({
   declarations: [TypicalComponent]
 })
 export class TypicalModule {}
+
 ```
 
 The collector is simplistic in its determination of what qualifies as a macro
@@ -692,6 +716,7 @@ the compiler doesn't need to know the expression's value&mdash;it just needs to
 You might write something like:
 
 ```typescript
+
 class TypicalServer {
 
 }
@@ -700,6 +725,7 @@ class TypicalServer {
   providers: [{provide: SERVER, useFactory: () => TypicalServer}]
 })
 export class TypicalModule {}
+
 ```
 
 Without rewriting, this would be invalid because lambdas are not supported and `TypicalServer` is not exported.
@@ -707,6 +733,7 @@ Without rewriting, this would be invalid because lambdas are not supported and `
 To allow this, the compiler automatically rewrites this to something like:
 
 ```typescript
+
 class TypicalServer {
 
 }
@@ -717,6 +744,7 @@ export const ɵ0 = () => new TypicalServer();
   providers: [{provide: SERVER, useFactory: ɵ0}]
 })
 export class TypicalModule {}
+
 ```
 
 This allows the compiler to generate a reference to `ɵ0` in the
@@ -751,6 +779,7 @@ Language features outside of the compiler's [restricted expression syntax](#expr
 can produce this error, as seen in the following example:
 
 ```
+
 // ERROR
 export class Fooish { ... }
 ...
@@ -759,6 +788,7 @@ const prop = typeof Fooish; // typeof is not valid in metadata
   // bracket notation is not valid in metadata
   { provide: 'token', useValue: { [prop]: 'value' } };
   ...
+
 ```
 
 You can use `typeof` and bracket notation in normal application code.
@@ -785,6 +815,7 @@ The compiler encountered a referenced to a locally defined symbol that either wa
 Here's a `provider` example of the problem.
 
 ```
+
 // ERROR
 let foo: number; // neither exported nor initialized
 
@@ -796,26 +827,33 @@ let foo: number; // neither exported nor initialized
   ]
 })
 export class MyComponent {}
+
 ```
+
 The compiler generates the component factory, which includes the `useValue` provider code, in a separate module. _That_ factory module can't reach back to _this_ source module to access the local (non-exported) `foo` variable.
 
 You could fix the problem by initializing `foo`.
 
 ```
+
 let foo = 42; // initialized
+
 ```
 
 The compiler will [fold](#folding) the expression into the provider as if you had written this.
 
 ```
+
   providers: [
     { provide: Foo, useValue: 42 }
   ]
+
 ```
 
 Alternatively, you can fix it by exporting `foo` with the expectation that `foo` will be assigned at runtime when you actually know its value.
 
 ```
+
 // CORRECTED
 export let foo: number; // exported
 
@@ -827,6 +865,7 @@ export let foo: number; // exported
   ]
 })
 export class MyComponent {}
+
 ```
 
 Adding `export` often works for variables referenced in metadata such as `providers` and `animations` because the compiler can generate _references_ to the exported variables in these expressions. It doesn't need the _values_ of those variables.
@@ -836,6 +875,7 @@ in order to generate code.
 For example, it doesn't work for the `template` property.
 
 ```
+
 // ERROR
 export let someTemplate: string; // exported but not initialized
 
@@ -844,6 +884,7 @@ export let someTemplate: string; // exported but not initialized
   template: someTemplate
 })
 export class MyComponent {}
+
 ```
 
 The compiler needs the value of the `template` property _right now_ to generate the component factory.
@@ -869,6 +910,7 @@ The following example tries to set the component's `template` property to the va
 the exported `someTemplate` variable which is declared but _unassigned_.
 
 ```
+
 // ERROR
 export let someTemplate: string;
 
@@ -877,11 +919,13 @@ export let someTemplate: string;
   template: someTemplate
 })
 export class MyComponent {}
+
 ```
 
 You'd also get this error if you imported `someTemplate` from some other module and neglected to initialize it there.
 
 ```
+
 // ERROR - not initialized there either
 import { someTemplate } from './config';
 
@@ -890,6 +934,7 @@ import { someTemplate } from './config';
   template: someTemplate
 })
 export class MyComponent {}
+
 ```
 
 The compiler cannot wait until runtime to get the template information.
@@ -900,6 +945,7 @@ instructions for building the element based on the template.
 To correct this error, provide the initial value of the variable in an initializer clause _on the same line_.
 
 ```
+
 // CORRECTED
 export let someTemplate = '<h1>Greetings from Angular</h1>';
 
@@ -908,6 +954,7 @@ export let someTemplate = '<h1>Greetings from Angular</h1>';
   template: someTemplate
 })
 export class MyComponent {}
+
 ```
 
 <hr>
@@ -926,6 +973,7 @@ For example, you may have defined a class and used it as an injection token in a
 but neglected to export that class.
 
 ```
+
 // ERROR
 abstract class MyStrategy { }
 
@@ -934,6 +982,7 @@ abstract class MyStrategy { }
     { provide: MyStrategy, useValue: ... }
   ]
   ...
+
 ```
 
 Angular generates a class factory in a separate module and that
@@ -941,6 +990,7 @@ factory [can only access exported classes](#exported-symbols).
 To correct this error, export the referenced class.
 
 ```
+
 // CORRECTED
 export abstract class MyStrategy { }
 
@@ -949,6 +999,7 @@ export abstract class MyStrategy { }
     { provide: MyStrategy, useValue: ... }
   ]
   ...
+
 ```
 
 <hr>
@@ -960,6 +1011,7 @@ Metadata referenced a function that wasn't exported.
 For example, you may have set a providers `useFactory` property to a locally defined function that you neglected to export.
 
 ```
+
 // ERROR
 function myStrategy() { ... }
 
@@ -968,6 +1020,7 @@ function myStrategy() { ... }
     { provide: MyStrategy, useFactory: myStrategy }
   ]
   ...
+
 ```
 
 Angular generates a class factory in a separate module and that
@@ -975,6 +1028,7 @@ factory [can only access exported functions](#exported-symbols).
 To correct this error, export the function.
 
 ```
+
 // CORRECTED
 export function myStrategy() { ... }
 
@@ -983,6 +1037,7 @@ export function myStrategy() { ... }
     { provide: MyStrategy, useFactory: myStrategy }
   ]
   ...
+
 ```
 
 <hr>
@@ -1001,6 +1056,7 @@ The compiler does not currently support [function expressions or lambda function
 For example, you cannot set a provider's `useFactory` to an anonymous function or arrow function like this.
 
 ```
+
 // ERROR
   ...
   providers: [
@@ -1008,9 +1064,13 @@ For example, you cannot set a provider's `useFactory` to an anonymous function o
     { provide: OtherStrategy, useFactory: () => { ... } }
   ]
   ...
+
 ```
+
 You also get this error if you call a function or method in a provider's `useValue`.
+
 ```
+
 // ERROR
 import { calculateValue } from './utilities';
 
@@ -1019,12 +1079,12 @@ import { calculateValue } from './utilities';
     { provide: SomeValue, useValue: calculateValue() }
   ]
   ...
+
 ```
 
 To correct this error, export a function from the module and refer to the function in a `useFactory` provider instead.
 
 <code-example linenums="false">
-
 // CORRECTED
 import { calculateValue } from './utilities';
 
@@ -1040,7 +1100,6 @@ export function someValueFactory() {
     { provide: SomeValue, useFactory: someValueFactory }
   ]
   ...
-
 </code-example>
 
 <hr>
@@ -1060,7 +1119,6 @@ The compiler does not support references to variables assigned by [destructuring
 For example, you cannot write something like this:
 
 <code-example linenums="false">
-
 // ERROR
 import { configuration } from './configuration';
 
@@ -1072,13 +1130,11 @@ const {foo, bar} = configuration;
     {provide: Bar, useValue: bar},
   ]
   ...
-
 </code-example>
 
 To correct this error, refer to non-destructured values.
 
 <code-example linenums="false">
-
 // CORRECTED
 import { configuration } from './configuration';
   ...
@@ -1087,7 +1143,6 @@ import { configuration } from './configuration';
     {provide: Bar, useValue: configuration.bar},
   ]
   ...
-
 </code-example>
 
 <hr>
@@ -1103,12 +1158,15 @@ You'll get an error if you reference it in the component constructor,
 which the compiler must statically analyze.
 
 ```
+
 // ERROR
 @Component({ })
 export class MyComponent {
   constructor (private win: Window) { ... }
 }
+
 ```
+
 TypeScript understands ambiant types so you don't import them.
 The Angular compiler does not understand a type that you neglect to export or import.
 
@@ -1130,7 +1188,6 @@ you can finesse the problem in four steps:
 Here's an illustrative example.
 
 <code-example linenums="false">
-
 // CORRECTED
 import { Inject } from '@angular/core';
 
@@ -1146,7 +1203,6 @@ export function _window() { return window; }
 export class MyComponent {
   constructor (@Inject(WINDOW) private win: Window) { ... }
 }
-
 </code-example>
 
 The `Window` type in the constructor is no longer a problem for the compiler because it
@@ -1155,7 +1211,6 @@ uses the `@Inject(WINDOW)` to generate the injection code.
 Angular does something similar with the `DOCUMENT` token so you can inject the browser's `document` object (or an abstraction of it, depending upon the platform in which the application runs).
 
 <code-example linenums="false">
-
 import { Inject }   from '@angular/core';
 import { DOCUMENT } from '@angular/platform-browser';
 
@@ -1163,7 +1218,6 @@ import { DOCUMENT } from '@angular/platform-browser';
 export class MyComponent {
   constructor (@Inject(DOCUMENT) private doc: Document) { ... }
 }
-
 </code-example>
 
 <hr>
@@ -1174,15 +1228,19 @@ The compiler expected a name in an expression it was evaluating.
 This can happen if you use a number as a property name as in the following example.
 
 ```
+
 // ERROR
 provider: [{ provide: Foo, useValue: { 0: 'test' } }]
+
 ```
 
 Change the name of the property to something non-numeric.
 
 ```
+
 // CORRECTED
 provider: [{ provide: Foo, useValue: { '0': 'test' } }]
+
 ```
 
 <hr>
@@ -1195,7 +1253,6 @@ that you referenced in metadata.
 The compiler can understand simple enum values but not complex values such as those derived from computed properties.
 
 <code-example linenums="false">
-
 // ERROR
 enum Colors {
   Red = 1,
@@ -1210,7 +1267,6 @@ enum Colors {
     { provide: StrongColor, useValue: Colors.Blue }  // bad
   ]
   ...
-
 </code-example>
 
 Avoid referring to enums with complicated initializers or computed properties.
@@ -1228,14 +1284,18 @@ _Tagged template expressions are not supported in metadata._
 </div>
 
 The compiler encountered a JavaScript ES2015 [tagged template expression](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#Tagged_template_literals) such as,
+
 ```
+
 // ERROR
 const expression = 'funky';
 const raw = String.raw`A tagged template ${expression} string`;
  ...
  template: '<div>' + raw + '</div>'
  ...
+
 ```
+
 [`String.raw()`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/raw)
 is a _tag function_ native to JavaScript ES2015.
 
@@ -1254,6 +1314,7 @@ This error can occur if you use an expression in the `extends` clause of a class
 Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](https://github.com/angular/angular/pull/17712#discussion_r132025495).
 
 -->
+
 {@a binding-expresion-validation}
 
   ## Phase 3: binding expression validation
@@ -1270,6 +1331,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   For example, consider the following component:
 
   ```typescript
+
   @Component({
     selector: 'my-component',
     template: '{{person.addresss.street}}'
@@ -1277,12 +1339,15 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   class MyComponent {
     person?: Person;
   }
+
   ```
 
   This will produce the following error:
 
   ```
+
   my.component.ts.MyComponent.html(1,1): : Property 'addresss' does not exist on type 'Person'. Did you mean 'address'?
+
   ```
 
   The file name reported in the error message, `my.component.ts.MyComponent.html`, is a synthetic file
@@ -1307,6 +1372,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   interpolation if the value of `person` is initialized as shown below:
 
   ```typescript
+
   @Component({
     selector: 'my-component',
     template: '<span *ngIf="person"> {{person.addresss.street}} </span>'
@@ -1314,6 +1380,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   class MyComponent {
     person?: Person;
   }
+
   ```
 
   Using `*ngIf` allows the TypeScript compiler to infer that the `person` used in the
@@ -1326,7 +1393,9 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   like `*ngIf`. This static member for `*ngIf` is:
 
   ```typescript
+
     public static ngIfUseIfTypeGuard: void;
+
   ```
 
   This declares that the input property `ngIf` of the `NgIf` directive should be treated as a
@@ -1346,6 +1415,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   is suppressed in the example by using `address!.street`.
 
   ```typescript
+
   @Component({
     selector: 'my-component',
     template: '<span *ngIf="person"> {{person.name}} lives on {{address!.street}} </span>'
@@ -1359,6 +1429,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
       this.address = address;
     }
   }
+
   ```
 
   The non-null assertion operator should be used sparingly as refactoring of the component
@@ -1368,6 +1439,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   in the `*ngIf`as shown below:
 
   ```typescript
+
   @Component({
     selector: 'my-component',
     template: '<span *ngIf="person && address"> {{person.name}} lives on {{address.street}} </span>'
@@ -1381,6 +1453,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
       this.address = address;
     }
   }
+
   ```
 
   ### Disabling type checking using `$any()`
@@ -1394,6 +1467,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   by casting `person` to the `any` type.
 
   ```typescript
+
   @Component({
     selector: 'my-component',
     template: '{{$any(person).addresss.street}}'
@@ -1401,6 +1475,7 @@ Chuck: After reviewing your PR comment I'm still at a loss. See [comment there](
   class MyComponent {
     person?: Person;
   }
+
   ```
 
 ## Summary
diff --git a/aio/tools/translator/dict-1.json b/aio/tools/translator/dict-1.json
index d48341365e..1f9824cc43 100644
--- a/aio/tools/translator/dict-1.json
+++ b/aio/tools/translator/dict-1.json
@@ -121,7 +121,7 @@
   },
   {
     "original": "For more information, see [Filters/pipes](guide/ajs-quick-reference#filters-pipes) below.",
-    "translation": "请参见下面[过滤器/管道](guide/ajs-quick-reference#filters-pipes)了解更多信息。",
+    "translation": "请参见下面[过滤器/管道](guide/ajs-quick-reference#filters-pipes)了解更多信息。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -146,7 +146,7 @@
   },
   {
     "original": "For more information, see the [ngFor micro-syntax](guide/template-syntax#microsyntax)\n      section of the [Template Syntax](guide/template-syntax) page.",
-    "translation": "要了解更多信息，请参见[模板语法](guide/template-syntax)中的[ngFor微语法](guide/template-syntax#microsyntax)部分。",
+    "translation": "要了解更多信息，请参见[模板语法](guide/template-syntax)中的[ngFor微语法](guide/template-syntax#microsyntax)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -181,7 +181,7 @@
   },
   {
     "original": "For more information see the [Setup](guide/setup) page.",
-    "translation": "要了解更多，参见[搭建本地开发环境](guide/setup)。",
+    "translation": "要了解更多，参见[搭建本地开发环境](guide/setup)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -314,14 +314,9 @@
     "translation": "`ng-href`指令允许AngularJS对`href`属性进行预处理，以便它能在浏览器获取那个URL之前，使用一个返回适当URL的绑定表达式替换它。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
-  {
-    "original": "In AngularJS, the `ng-href` is often used to activate a route as part of navigation.",
-    "translation": "在AngularJS 中，`ng-href`通常用来作为导航的一部分，激活一个路由。",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
-  },
   {
     "original": "Routing is handled differently in Angular.",
-    "translation": "路由在Angular中的处理方式不同。",
+    "translation": "路由在Angular中的处理方式不同。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -356,7 +351,7 @@
   },
   {
     "original": "In this example, the `<table>` element is removed from the DOM unless the `movies` array has a length greater than zero.",
-    "translation": "在这个例子中，除非`movies`数组的长度大于0，否则`<table>`元素就会被从DOM中移除。",
+    "translation": "在这个例子中，除非`movies`数组的长度大于0，否则`<table>`元素就会被从DOM中移除。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -396,7 +391,7 @@
   },
   {
     "original": "In this example, the table row (`<tr>`) element repeats for each movie object in the collection of movies.",
-    "translation": "在这个例子中，对`movies`集合中的每一个`movie`对象重复渲染了这个表格行元素(`<tr>`)。",
+    "translation": "在这个例子中，对`movies`集合中的每一个`movie`对象重复渲染了这个表格行元素(`<tr>`)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -411,7 +406,7 @@
   },
   {
     "original": "For more information, see [Structural Directives](guide/structural-directives).",
-    "translation": "要了解更多信息，参见[结构性指令](guide/structural-directives)。",
+    "translation": "要了解更多信息，参见[结构性指令](guide/structural-directives)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -421,7 +416,7 @@
   },
   {
     "original": "In this example, the `<div>` element is shown if the `favoriteHero` variable is truthy.",
-    "translation": "在这个例子中，如果`favoriteHero`变量为真，`<div>`元素就会显示出来。",
+    "translation": "在这个例子中，如果`favoriteHero`变量为真，`<div>`元素就会显示出来。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -551,7 +546,7 @@
   },
   {
     "original": "The Angular `currency` pipe is similar although some of the parameters have changed.",
-    "translation": "Angular的`currency`管道和1中很相似，只是有些参数变化了。",
+    "translation": "Angular的`currency`管道和1中很相似，只是有些参数变化了。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -581,17 +576,17 @@
   },
   {
     "original": "The Angular `json` pipe does the same thing.",
-    "translation": "Angular的`json`管道做完全相同的事。",
+    "translation": "Angular的`json`管道做完全相同的事。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
     "original": "Selects up to the first parameter (2) number of items from the collection\n      starting (optionally) at the beginning index (0).",
-    "translation": "从集合中选择从(第二参数指定的)起始索引号(0)开始的最多(第一参数指定的)条目数(2)个条目。",
+    "translation": "从集合中选择从(第二参数指定的)起始索引号(0)开始的最多(第一参数指定的)条目数(2)个条目。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
     "original": "The `SlicePipe` does the same thing but the *order of the parameters is reversed*, in keeping\n      with the JavaScript `Slice` method.\n      The first parameter is the starting index; the second is the limit.\n      As in AngularJS, coding this operation within the component instead could improve performance.",
-    "translation": "`SlicePipe`做同样的事，但是*两个参数的顺序是相反的*，以便于JavaScript中的`slice`方法保持一致。\n      第一个参数是起始索引号，第二个参数是限制的数量。\n      和AngularJS中一样，如果们改用组件中的代码实现此操作，性能将会提升。",
+    "translation": "`SlicePipe`做同样的事，但是*两个参数的顺序是相反的*，以便于JavaScript中的`slice`方法保持一致。\n      第一个参数是起始索引号，第二个参数是限制的数量。\n      和AngularJS中一样，如果们改用组件中的代码实现此操作，性能将会提升。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -601,7 +596,7 @@
   },
   {
     "original": "The Angular `lowercase` pipe does the same thing.",
-    "translation": "Angular的`lowercase`管道和1中的功能完全相同。",
+    "translation": "Angular的`lowercase`管道和1中的功能完全相同。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -616,12 +611,12 @@
   },
   {
     "original": "Angular also has a `percent` pipe, which formats a number as a local percentage\n      as shown in the third example.",
-    "translation": "Angular还有一个`percent`管道，它把一个数组格式化为本地化的(local)百分比格式，如第三个范例所示。",
+    "translation": "Angular还有一个`percent`管道，它把一个数组格式化为本地化的(local)百分比格式，如第三个范例所示。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
     "original": "Displays the collection in the order specified by the expression.\n      In this example, the movie title orders the `movieList`.",
-    "translation": "使用表达式中所指定的方式对集合进行排序。\n      在这个例子中，`movieList`被根据movie的title排序了。",
+    "translation": "使用表达式中所指定的方式对集合进行排序。\n      在这个例子中，`movieList`被根据movie的title排序了。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -676,7 +671,7 @@
   },
   {
     "original": "In AngularJS, an Angular module keeps track of controllers, services, and other code. \n      The second argument defines the list of other modules that this module depends upon.",
-    "translation": "在AngularJS中，Angular模块用来对控制器、服务和其它代码进行跟踪。第二个参数定义该模块依赖的其它模块列表。",
+    "translation": "在AngularJS中，Angular模块用来对控制器、服务和其它代码进行跟踪。第二个参数定义该模块依赖的其它模块列表。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -699,11 +694,6 @@
     "translation": "要了解关于模块的更多知识，参见[NgModules](guide/ngmodule)。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
-  {
-    "original": "### Controller registration",
-    "translation": "### 控制器注册",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
-  },
   {
     "original": "AngularJS has code in each controller that looks up an appropriate Angular module\n      and registers the controller with that module.",
     "translation": "在AngularJS中，在每个控制器中都有一些代码，用于找到合适的Angular模块并把该控制器注册进去。",
@@ -741,7 +731,7 @@
   },
   {
     "original": "In AngularJS, you write the code for the model and methods in a controller function.",
-    "translation": "在Angular1中，我们在控制器函数中写模型和方法的代码。",
+    "translation": "在Angular1中，我们在控制器函数中写模型和方法的代码。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -761,7 +751,7 @@
   },
   {
     "original": "For more information, see the [Components](guide/architecture#components) \n      section of the [Architecture Overview](guide/architecture) page.",
-    "translation": "要了解关于组件的更多信息，参见[架构概览](guide/architecture)中的[组件](guide/architecture#components)部分。",
+    "translation": "要了解关于组件的更多信息，参见[架构概览](guide/architecture)中的[组件](guide/architecture#components)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -791,7 +781,7 @@
   },
   {
     "original": "For more information, see the [Dependency injection](guide/architecture#dependency-injection) \n      section of the [Architecture Overview](guide/architecture).",
-    "translation": "要了解关于依赖注入的更多信息，参见[架构概览](guide/architecture)中的[依赖注入](guide/architecture#dependency-injection)部分。",
+    "translation": "要了解关于依赖注入的更多信息，参见[架构概览](guide/architecture)中的[依赖注入](guide/architecture#dependency-injection)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -806,7 +796,7 @@
   },
   {
     "original": "AngularJS, uses a `link` tag in the head section of the `index.html` file\n      to define the styles for the application.",
-    "translation": "在AngularJS中，我们在`index.html`的`head`区使用`link`标签来为应用程序定义样式。",
+    "translation": "在AngularJS中，我们在`index.html`的`head`区使用`link`标签来为应用程序定义样式。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ajs-quick-reference.md"
   },
   {
@@ -1284,6 +1274,11 @@
     "translation": "Angular应用主要包含组件和它们的HTML模板。\n在浏览器可以渲染应用之前，组件和模板必须要被**Angular编译器**转换为可以执行的JavaScript。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/aot-compiler.md"
   },
+  {
+    "original": "<a href=\"https://www.youtube.com/watch?v=kW9cJsvcsGo\">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.",
+    "translation": "观看编译器作者Tobias Bosch在AngularConnect 2016大会里，对<a href=\"http://v.youku.com/v_show/id_XMTc1NTE4NTkwOA==.html?from=y1.7-1.4\" target=\"_blank\">Angular编译器</a>的演讲。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/aot-compiler.md"
+  },
   {
     "original": "You can compile the app in the browser, at runtime, as the application loads, using the **_just-in-time_ (JIT) compiler**.\nThis is the standard development approach shown throughout the documentation.\nIt's great but it has shortcomings.",
     "translation": "你可以在浏览器中使用*即时编译器*（Just-in-Time - JIT）在运行期间编译该应用，也就是在应用加载时。\n这是本文档中展示过的标准开发方式。\n它很不错，但是有自己的缺点。",
@@ -1804,6 +1799,11 @@
     "translation": "你将需要单独的TypeScript配置文件，像这些：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/aot-compiler.md"
   },
+  {
+    "original": "</header>",
+    "translation": "<header>\n  @Types和node模块\n</header>In the file structure of _this particular sample project_,\nthe `node_modules` folder happens to be two levels up from the project root.\nTherefore, `\"typeRoots\"` must be set to `\"../../node_modules/@types/\"`.",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/aot-compiler.md"
+  },
   {
     "original": "### Tree shaking",
     "translation": "### 摇树优化",
@@ -2014,6 +2014,11 @@
     "translation": "JavaScript 中，每个_文件_是一个模块，文件中定义的所有对象都从属于那个模块。\n通过`export`关键字，模块可以把它的某些对象声明为公共的。\n其它 JavaScript 模块可以使用*import 语句*来访问这些公共对象。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "<a href=\"http://exploringjs.com/es6/ch_modules.html\" >Learn more about the JavaScript module system on the web.</a>\n<a href=\"http://exploringjs.com/es6/ch_modules.html\" target=\"_blank\">学习更多关于 JavaScript 模块的知识。</a>\n</div>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
+  },
   {
     "original": "These are two different and _complementary_ module systems. Use them both to write your apps.",
     "translation": "这两个模块化系统是互补的，我们在写程序时都会用到。",
@@ -2059,6 +2064,11 @@
     "translation": "这两个系统比较容易混淆，因为它们共享相同的词汇 “imports” 和 “exports”。不过没关系，先放一放，随着时间和经验的增长，自然就清楚了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "Learn more from the [NgModules](guide/ngmodule) page.\n更多信息，见 [Angular 模块](guide/ngmodule)。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
+  },
   {
     "original": "## Components",
     "translation": "## 组件",
@@ -2145,8 +2155,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
   {
-    "original": "Metadata tells Angular how to process a class.",
-    "translation": "<p style=\"padding-top:10px\">元数据告诉 Angular 如何处理一个类。</p>",
+    "original": "<p style=\"padding-top:10px\">",
+    "translation": "元数据告诉 Angular 如何处理一个类。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
   {
@@ -2226,7 +2236,7 @@
   },
   {
     "original": "Angular supports **data binding**,\na mechanism for coordinating parts of a template with parts of a component.\nAdd binding markup to the template HTML to tell Angular how to connect both sides.",
-    "translation": "Angular 支持**数据绑定**，一种让模板的各部分与组件的各部分相互合作的机制。\n我们往模板 HTML 中添加绑定标记，来告诉 Angular 如何把二者联系起来。As the diagram shows, there are four forms of data binding syntax. Each form has a direction &mdash; to the DOM, from the DOM, or in both directions.如图所示，数据绑定的语法有四种形式。每种形式都有一个方向 —— 绑定到 DOM 、绑定自 DOM 以及双向绑定。",
+    "translation": "Angular 支持**数据绑定**，一种让模板的各部分与组件的各部分相互合作的机制。\n我们往模板 HTML 中添加绑定标记，来告诉 Angular 如何把二者联系起来。As the diagram shows, there are four forms of data binding syntax. Each form has a direction &mdash; to the DOM, from the DOM, or in both directions.如图所示，数据绑定的语法有四种形式。每种形式都有一个方向 —— 绑定到 DOM 、绑定自 DOM 以及双向绑定。<br class=\"clear\">",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
   {
@@ -2266,7 +2276,7 @@
   },
   {
     "original": "Data binding plays an important role in communication between a template and its component.",
-    "translation": "数据绑定在模板与对应组件的交互中扮演了重要的角色。",
+    "translation": "数据绑定在模板与对应组件的交互中扮演了重要的角色。\n<br class=\"l-clear-both\">",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
   {
@@ -2441,7 +2451,7 @@
   },
   {
     "original": "_Dependency injection_ is a way to supply a new instance of a class\nwith the fully-formed dependencies it requires. Most dependencies are services.\nAngular uses dependency injection to provide new components with the services they need.",
-    "translation": "“依赖注入”是提供类的新实例的一种方式，还负责处理好类所需的全部依赖。大多数依赖都是服务。\nAngular 使用依赖注入来提供新组件以及组件所需的服务。",
+    "translation": "“依赖注入”是提供类的新实例的一种方式，还负责处理好类所需的全部依赖。大多数依赖都是服务。\nAngular 使用依赖注入来提供新组件以及组件所需的服务。<br class=\"clear\">",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/architecture.md"
   },
   {
@@ -2800,7 +2810,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/attribute-directives.md"
   },
   {
-    "original": "file that looks like this:",
+    "original": "Put the template in its own <code>app.component.html</code>\nfile that looks like this:",
     "translation": "我们把这个模板放到它的<code>app.component.html</code>文件中，就像这样：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/attribute-directives.md"
   },
@@ -2819,6 +2829,11 @@
     "translation": "运行应用，就会看到我们的指令确实高亮了段落中的文本。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/attribute-directives.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Your directive isn't working?</h3>",
+    "translation": "### 你的指令没生效？",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/attribute-directives.md"
+  },
   {
     "original": "Did you remember to add the directive to the  `declarations` attribute of `@NgModule`?\nIt is easy to forget!",
     "translation": "你记着设置`@NgModule`的`declarations`数组了吗？它很容易被忘掉。",
@@ -3455,28 +3470,28 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
-    "original": "Feature",
+    "original": "<th>\n      Feature",
     "translation": "特性",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
-    "original": "Polyfill",
+    "original": "<th>\n      Polyfill",
     "translation": "填充库",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
-    "original": "Browsers (Desktop & Mobile)",
+    "original": "<th style=\"width: 50%\">\n      Browsers (Desktop & Mobile)",
     "translation": "浏览器（桌面和移动）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
-    "original": "[Animations](guide/animations)",
+    "original": "<td>\n      [Animations](guide/animations)",
     "translation": "[动画](guide/animations)",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
     "original": "[Web Animations](guide/browser-support#web-animations)",
-    "translation": "[Web 动画](guide/browser-support#web-animations)",
+    "translation": "[Web 动画](guide/browser-support#web-animations)\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
   {
@@ -3489,6 +3504,21 @@
     "translation": "如果你使用下列已废弃的i18n管道：\n    [date](api/common/DeprecatedDatePipe)、[currency](api/common/DeprecatedCurrencyPipe)、[decimal](api/common/DeprecatedDecimalPipe) 和 [percent](api/common/DeprecatedPercentPipe)",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
   },
+  {
+    "original": "All but Chrome, Firefox, Edge, IE11 and Safari 10",
+    "translation": "除了 Chrome、Firefox、Edge、IE11 和 Safari 10 外的所有浏览器",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
+  },
+  {
+    "original": "[NgClass](api/common/NgClass) on SVG elements",
+    "translation": "在 SVG 元素上应用 [NgClass](api/common/NgClass)",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
+  },
+  {
+    "original": "[Http](guide/http) when sending and receiving binary data",
+    "translation": "用 [Http](guide/http) 发送和接收二进制数据",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/browser-support.md"
+  },
   {
     "original": "### Suggested polyfills ##",
     "translation": "### 建议的填充库 ##\nBelow are the polyfills which are used to test the framework itself. They are a good starting point for an application.",
@@ -3934,6 +3964,71 @@
     "translation": "[生命周期钩子](guide/lifecycle-hooks)章现在更加简短，并且对强调了Angular是以什么顺序来调用钩子方法的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/change-log.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">Cheat Sheet</h1>",
+    "translation": "<h1 class=\"no-toc\">速查表</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Bootstrapping",
+    "translation": "启动",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Template syntax",
+    "translation": "模板语法",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Built-in directives",
+    "translation": "内置指令",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Forms",
+    "translation": "表单",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Class decorators",
+    "translation": "类装饰器（decorator）",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Directive configuration",
+    "translation": "指令配置",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Does not support parent-child relationship selectors.",
+    "translation": "但不支持指定父子关系的选择器。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Component configuration",
+    "translation": "组件配置",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Class field decorators for directives and components",
+    "translation": "给指令或组件类用的属性装饰器",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Directive and component change detection and lifecycle hooks",
+    "translation": "指令和组件的变更检测与生命周期钩子",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Dependency injection configuration",
+    "translation": "依赖注入的配置",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
+  {
+    "original": "Routing and navigation",
+    "translation": "路由与导航",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/cheatsheet.md"
+  },
   {
     "original": "# Component Interaction",
     "translation": "# 组件之间的交互",
@@ -4009,6 +4104,11 @@
     "translation": "运行应用程序会显示三个英雄：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "E2E test that all children were instantiated and displayed as expected:",
     "translation": "端到端测试，用于确保所有的子组件都像所期待的那样被初始化并显示出来。",
@@ -4039,6 +4139,11 @@
     "translation": "下面的`NameParentComponent`展示了各种名字的处理方式，包括一个全是空格的名字。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "E2E tests of input property setter with empty and non-empty names:",
     "translation": "端到端测试：输入属性的setter，分别使用空名字和非空名字。",
@@ -4084,6 +4189,11 @@
     "translation": "下面是点击按钮的结果。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "Test that ***both*** input properties are set initially and that button clicks trigger \nthe expected `ngOnChanges` calls and values:",
     "translation": "测试确保***这两个***输入属性值都被初始化了，当点击按钮后，`ngOnChanges`应该被调用，属性的值也符合预期。",
@@ -4124,6 +4234,11 @@
     "translation": "框架(Angular)把事件参数(用`$event`表示)传给事件处理方法，这个方法会处理：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "Test that clicking the *Agree* and *Disagree* buttons update the appropriate counters:",
     "translation": "测试确保点击*Agree*和*Disagree*按钮时，计数器被正确更新。",
@@ -4145,7 +4260,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
   {
-    "original": "{@a countdown-timer-example}  \nThe following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket. It has `start` and `stop` methods that control the clock and it displays a countdown status message in its own template.",
+    "original": "The following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket. It has `start` and `stop` methods that control the clock and it displays a countdown status message in its own template.",
     "translation": "子组件`CountdownTimerComponent`进行倒计时，归零时发射一个导弹。`start`和`stop`方法负责控制时钟并在模板里显示倒计时的状态信息。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
@@ -4174,6 +4289,11 @@
     "translation": "下面是父组件和子组件一起工作时的效果。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "Test that the seconds displayed in the parent template\nmatch the seconds displayed in the child's status message.\nTest also that clicking the *Stop* button pauses the countdown timer:",
     "translation": "测试确保在父组件模板中显示的秒数和子组件状态信息里的秒数同步。它还会点击*Stop*按钮来停止倒计时：",
@@ -4259,6 +4379,11 @@
     "translation": "使用`setTimeout()`来等下一轮，然后改写`seconds()`方法，这样它接下来就会从注入的这个计时器组件里获取秒数的值。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下！</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "Use [the same countdown timer tests](guide/component-interaction#countdown-tests) as before.",
     "translation": "使用和之前[一样的倒计时测试](guide/component-interaction#countdown-tests)。",
@@ -4314,6 +4439,11 @@
     "translation": "*History*日志证明了：在父组件`MissionControlComponent`和子组件`AstronautComponent`之间，信息通过该服务实现了双向传递。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/component-interaction.md"
+  },
   {
     "original": "Tests click buttons of both the parent `MissionControlComponent` and the `AstronautComponent` children\nand verify that the history meets expectations:",
     "translation": "测试确保点击父组件`MissionControlComponent`和子组件`AstronautComponent`两个的组件的按钮时，*History*日志和预期的一样。",
@@ -4736,7 +4866,7 @@
   },
   {
     "original": "Dependency Injection is a powerful pattern for managing code dependencies. \nThis cookbook explores many of the features of Dependency Injection (DI) in Angular.",
-    "translation": "依赖注入是一个用来管理代码依赖的强大模式。在这本“烹饪宝典”中，我们会讨论Angular依赖注入的许多特性。\n{@a toc}",
+    "translation": "依赖注入是一个用来管理代码依赖的强大模式。在这本“烹饪宝典”中，我们会讨论Angular依赖注入的许多特性。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
@@ -4875,7 +5005,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "of the code in this cookbook.",
+    "original": "See the <live-example name=\"dependency-injection-in-action\"></live-example>\nof the code in this cookbook.",
     "translation": "要获取本“烹饪宝典”的代码，**参见<live-example name=\"dependency-injection-in-action\"></live-example>**。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
@@ -5105,7 +5235,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "and confirm that the three `HeroBioComponent` instances have their own cached hero data.",
+    "original": "Find this example in <live-example name=\"dependency-injection-in-action\">live code</live-example>\nand confirm that the three `HeroBioComponent` instances have their own cached hero data.",
     "translation": "到<live-example name=\"dependency-injection-in-action\">在线例子</live-example>中找到这个例子，确认三个`HeroBioComponent`实例拥有自己独立的英雄数据缓存。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
@@ -5205,8 +5335,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
-    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。",
+    "original": "On the other hand, if you restore the `@Host()` decorator and comment out `@Optional`,\nthe application fails for lack of the required logger at the host component level.\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
+    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
@@ -5490,7 +5620,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "for the full source code.",
+    "original": "The function retrieves candidate heroes from the `HeroService`,\ntakes `2` of them to be the runners-up, and returns their concatenated names.\nLook at the <live-example name=\"dependency-injection-in-action\"></live-example>\nfor the full source code.",
     "translation": "该函数从`HeroService`获取英雄参赛者，从中取`2`个作为亚军，并把他们的名字拼接起来。请到<live-example name=\"dependency-injection-in-action\"></live-example>查看全部原代码。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
@@ -5506,7 +5636,7 @@
   },
   {
     "original": "But the token doesn't have to be a class and even when it is a class,\nit doesn't have to be the same type as the returned object.\nThat's the subject of the next section.",
-    "translation": "但令牌不一定都是类，就算它是一个类，它也不一定都返回类型相同的对象。这是下一节的主题。\n{@a class-interface}",
+    "translation": "但令牌不一定都是类，就算它是一个类，它也不一定都返回类型相同的对象。这是下一节的主题。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
@@ -5705,7 +5835,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is set.",
+    "original": "Notice that even though the [@Optional](guide/dependency-injection-in-action#optional) qualifier\nis there for safety,\nthe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is set.",
     "translation": "安全起见，我们添加了[@Optional](guide/dependency-injection-in-action#optional)装饰器，但是<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数确实被设置了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
@@ -5750,7 +5880,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
+    "original": "Unfortunately, this does not work.\nThe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
     "translation": "可惜这样不行。<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数是null。\n*不能通过基类注入父组件*。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection-in-action.md"
   },
@@ -6040,8 +6170,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
   },
   {
-    "original": "{@a ctor-injection}\nThat's super easy. Change the `Car` constructor to a version with DI:",
-    "translation": "{@a ctor-injection}\n答案非常简单。把`Car`的构造函数改造成使用 DI 的版本：",
+    "original": "{@a ctor-injection}",
+    "translation": "答案非常简单。把`Car`的构造函数改造成使用 DI 的版本：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
   },
   {
@@ -6399,6 +6529,16 @@
     "translation": "建议为每个服务类都添加`@Injectable()`，包括那些没有依赖严格来说并不需要它的。因为：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
   },
+  {
+    "original": "<b>Future proofing:</b> No need to remember <code>@Injectable()</code> when you add a dependency later.",
+    "translation": "<b>面向未来:</b> 没有必要记得在后来添加依赖的时候添加 <code>@Injectable()</code>。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
+  },
+  {
+    "original": "<b>Consistency:</b> All services follow the same rules, and you don't have to wonder why a decorator is missing.",
+    "translation": "<b>一致性:</b>所有的服务都遵循同样的规则，不需要考虑为什么某个地方少了一个。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
+  },
   {
     "original": "Injectors are also responsible for instantiating components\nlike `HeroesComponent`. So why doesn't `HeroesComponent` have\n`@Injectable()`?",
     "translation": "注入器同时负责实例化像`HerosComponent`这样的组件。为什么不标记`HerosComponent`为`@Injectable()`呢？",
@@ -6469,11 +6609,6 @@
     "translation": "如果忘了注册这个日志服务，Angular 会在首次查找这个日志服务时，抛出一个异常。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
   },
-  {
-    "original": "",
-    "translation": "EXCEPTION: No provider for Logger! (HeroListComponent -> HeroService -> Logger)\n  (异常：Logger类没有提供商！(HeroListComponent -> HeroService -> Logger))",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
-  },
   {
     "original": "That's Angular telling you that the dependency injector couldn't find the *provider* for the logger.\nIt needed that provider to create a `Logger` to inject into a new\n`HeroService`, which it needed to\ncreate and inject into a new `HeroListComponent`.",
     "translation": "Angular 告诉我们，依赖注入器找不到日志服务的*提供商*。\n在创建`HeroListComponent`的新实例时需要创建并注入`HeroService`，\n而`HeroService`需要创建并注入一个`Logger`实例，\nAngular 需要这个`Logger`实例的提供商来。",
@@ -6729,16 +6864,6 @@
     "translation": "### 非类依赖",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
   },
-  {
-    "original": "What if the dependency value isn't a class? Sometimes the thing you want to inject is a\n  string, function, or object.",
-    "translation": "如果依赖值不是一个类呢？有时候想要注入的东西是一个字符串，函数或者对象。",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
-  },
-  {
-    "original": "Applications often define configuration objects with lots of small facts\n  (like the title of the application or the address of a web API endpoint)\n  but these configuration objects aren't always instances of a class.\n  They can be object literals such as this one:",
-    "translation": "应用程序经常为很多很小的因素定义配置对象（例如应用程序的标题或网络API终点的地址）。\n  但是这些配置对象不总是类的实例，它们可能是对象，如下面这个：",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/dependency-injection.md"
-  },
   {
     "original": "What if you'd like to make this configuration object available for injection?\nYou know you can register an object with a [value provider](guide/dependency-injection#value-provider).",
     "translation": "我们想让这个配置对象在注入时可用，而且知道可以使用[值提供商](guide/dependency-injection#value-provider)来注册一个对象。",
@@ -7219,6 +7344,11 @@
     "translation": "### Webpack（与AOT）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/deployment.md"
   },
+  {
+    "original": "<a href=\"https://webpack.js.org/\" title=\"Webpack 2\">Webpack 2</a> is another\ngreat option for inlining templates and style-sheets, for bundling, minifying, and uglifying the application.\nThe \"[Webpack: an introduction](guide/webpack \"Webpack: an introduction\")\" guide will get you started\nusing webpack with Angular.",
+    "translation": "<a href=\"https://webpack.js.org/\" target=\"_blank\" title=\"Webpack 2\">Webpack 2</a>是另一个选项，它可以内联模板、样式表、打包、最小化和混淆应用。\n\"[Webpack简介](guide/webpack \"Webpack: an introduction\")\"一章中将会教你如何配合Angular使用Webpack。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/deployment.md"
+  },
   {
     "original": "Consider configuring _Webpack_ with the official\n<a href=\"https://github.com/angular/angular-cli/tree/master/packages/%40ngtools/webpack\" title=\"Ahead-of-Time Webpack Plugin\">\nAngular Ahead-of-Time Webpack Plugin</a>.\nThis plugin transpiles the TypeScript application code,\nbundles lazy loaded `NgModules` separately,\nand performs AOT compilation &mdash; without any changes to the source code.",
     "translation": "考虑使用官方的<a href=\"https://github.com/angular/angular-cli/tree/master/packages/%40ngtools/webpack\" target=\"_blank\" title=\"Ahead-of-Time Webpack Plugin\">\nAngular预编译插件</a>来配置*Webpack*。\n这个插件会转译TypeScript代码、独立打包延迟加载的`NgModules`，而且不用对源码做任何修改就能执行AOT编译。",
@@ -7334,11 +7464,6 @@
     "translation": "Angular应用默认运行在开发模式下，正如在浏览器控制台中看到的如下信息：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/deployment.md"
   },
-  {
-    "original": "",
-    "translation": "Angular is running in the development mode. Call enableProdMode() to enable the production mode.\n  （Angular正运行在开发模式下。调用enableProdMode()来启用生产模式）",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/deployment.md"
-  },
   {
     "original": "Switching to production mode can make it run faster by disabling development specific checks such as the dual change detection cycles.",
     "translation": "切换到生产模式可以通过禁用开发环境下特有的检查（比如双重变更检测周期）来让应用运行得更快。",
@@ -7860,7 +7985,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dynamic-component-loader.md"
   },
   {
-    "original": "of the code in this cookbook.",
+    "original": "See the <live-example name=\"dynamic-component-loader\"></live-example>\nof the code in this cookbook.",
     "translation": "到<live-example name=\"cb-dynamic-component-loader\"></live-example>查看本烹饪书的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dynamic-component-loader.md"
   },
@@ -8171,7 +8296,7 @@
   },
   {
     "original": "`formControlName` and `formGroup` are directives defined in\n`ReactiveFormsModule`. The templates can access these directives\ndirectly since you imported `ReactiveFormsModule` from `AppModule`.",
-    "translation": "`formControlName`和`formGroup`是在`ReactiveFormsModule`中定义的指令。我们之所以能在模板中使用它们，是因为我们往`AppModule`中导入了`ReactiveFormsModule`。\n{@a questionnaire-data}",
+    "translation": "`formControlName`和`formGroup`是在`ReactiveFormsModule`中定义的指令。我们之所以能在模板中使用它们，是因为我们往`AppModule`中导入了`ReactiveFormsModule`。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/dynamic-form.md"
   },
   {
@@ -11150,7 +11275,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/http.md"
   },
   {
-    "original": "intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n  \tconst started = Date.now();\n    return next\n      .handle(req)\n      .do(event => {\n        if (event instanceof HttpResponse) {\n          const elapsed = Date.now() - started;\n          console.log(`Request for ${req.urlWithParams} took ${elapsed} ms.`);\n        }\n      });\n  }\n}\n```\nNotice the RxJS `do()` operator&mdash;it adds a side effect to an Observable without affecting the values on the stream. Here, it detects the `HttpResponse` event and logs the time the request took.",
+    "original": "Notice the RxJS `do()` operator&mdash;it adds a side effect to an Observable without affecting the values on the stream. Here, it detects the `HttpResponse` event and logs the time the request took.",
     "translation": "注意 RxJS 的 `do()`操作符 —— 它为可观察对象添加一个副作用，而不会影响到流中的值。这里，它会检测`HttpResponse`的事件，并且记录这个请求花费的时间。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/http.md"
   },
@@ -11235,7 +11360,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/http.md"
   },
   {
-    "original": "*Note that `HttpClient`'s support is only the client half of the XSRF protection scheme.* Your backend service must be configured to set the cookie for your page, and to verify that the header is present on all eligible requests. If not, Angular's default protection will be ineffective.",
+    "original": "<div class=\"alert is-important\">\n*Note that `HttpClient`'s support is only the client half of the XSRF protection scheme.* Your backend service must be configured to set the cookie for your page, and to verify that the header is present on all eligible requests. If not, Angular's default protection will be ineffective.",
     "translation": "*注意，`HttpClient`支持的只是 XSRF 防护方案的客户端这一半。* 我们的后端服务必须配置为给页面设置 cookie ，并且要验证请求头，以确保全都是合法的请求。否则，Angular 默认的这种防护措施就会失效。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/http.md"
   },
@@ -11335,7 +11460,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/i18n.md"
   },
   {
-    "original": "of a JIT-compiled app, translated into Spanish.",
+    "original": "Try this <live-example name=\"i18n\" title=\"i18n Example in Spanish\">live example</live-example>\nof a JIT-compiled app, translated into Spanish.",
     "translation": "**试试** 这个翻译为西班牙语版JiT编译应用的<live-example name=\"i18n\">在线例子</live-example>。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/i18n.md"
   },
@@ -11805,7 +11930,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/i18n.md"
   },
   {
-    "original": "Note that the translation unit `id=introductionHeader` is derived from the [_custom_ `id`](#custom-id \"Set a custom id\") that you set earlier, but **without the `@@` prefix** required in the source HTML.",
+    "original": "<div class=\"l-sub-section\">\nNote that the translation unit `id=introductionHeader` is derived from the [_custom_ `id`](#custom-id \"Set a custom id\") that you set earlier, but **without the `@@` prefix** required in the source HTML.",
     "translation": "注意，翻译单元`id=introductionHeader`派生自[*自定义*`id`](#custom-id \"设置自定义id\")，它设置起来更简单，但是在HTML源码中**不需要`@@`前缀**。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/i18n.md"
   },
@@ -12375,12 +12500,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/language-service.md"
   },
   {
-    "original": "```sh\nnpm install --save-dev @angular/language-service\n```\nAdditionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
+    "original": "Additionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
     "translation": "另外，还要在工程的`tsconfig.json`中添加下列`\"compilerOptions\"`区域：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/language-service.md"
   },
   {
-    "original": "```json\n  \"plugins\": [\n      {\"name\": \"@angular/language-service\"}\n  ]\n```\nNote that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
+    "original": "Note that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
     "translation": "注意，这只是提供了`.ts`文件中的诊断与自动完成。我们需要一个自定义的sublime插件（或修改现有插件）来在 HTML 文件中提供自动完成功能。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/language-service.md"
   },
@@ -12469,6 +12594,11 @@
     "translation": "当Angular使用构造函数新建一个组件或指令后，就会按下面的顺序在特定时刻调用这些生命周期钩子方法：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "Hook",
+    "translation": "钩子",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
+  },
   {
     "original": "Respond when Angular (re)sets data-bound input properties.\n      The method receives a `SimpleChanges` object of current and previous property values.",
     "translation": "当Angular（重新）设置数据绑定输入属性时响应。\n      该方法接受当前和上一属性值的`SimpleChanges`对象",
@@ -12620,7 +12750,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
   },
   {
-    "original": "demonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
+    "original": "The <live-example></live-example>\ndemonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
     "translation": "<live-example></live-example>通过在受控于根组件`AppComponent`的一些组件上进行的一系列练习，演示了生命周期钩子的运作方式。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
   },
@@ -12634,6 +12764,11 @@
     "translation": "下面是每个练习简短的描述：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "Component",
+    "translation": "组件",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
+  },
   {
     "original": "Demonstrates every lifecycle hook.\n      Each hook method writes to the on-screen log.",
     "translation": "展示每个生命周期钩子，每个钩子方法都会在屏幕上显示一条日志。",
@@ -12749,6 +12884,11 @@
     "translation": "不开玩笑了，注意下面两个关键点：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "1. Angular calls hook methods for *directives* as well as components.<br><br>",
+    "translation": "就像对组件一样，Angular也会对*指令*调用这些钩子方法。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/lifecycle-hooks.md"
+  },
   {
     "original": "2. A spy directive can provide insight into a DOM object that you cannot change directly.\nObviously you can't touch the implementation of a native `<div>`.\nYou can't modify a third party component either.\nBut you can watch both with a directive.",
     "translation": "一个侦探(spy)指令可以让我们在无法直接修改DOM对象实现代码的情况下，透视其内部细节。\n显然，你不能修改一个原生`<div>`元素的实现代码。\n你同样不能修改第三方组件。\n但我们用一个指令就能监视它们了。",
@@ -13624,6 +13764,11 @@
     "translation": "更一般地说，[优先把提供商注册进模块中](guide/ngmodule-faq#q-component-or-module)，而不是组件中。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Discussion</h3>",
+    "translation": "<h3 class=\"no-toc\">讨论</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "Angular registers all startup module providers with the application root injector.\nThe services created from root injector providers are available to the entire application.\nThey are _application-scoped_.",
     "translation": "Angular把所有启动期模块的提供商都注册进了应用的根注入器中。\n这些服务是由根注入器中的提供商创建的，并且在整个应用中都可用。\n它们具有*应用级作用域*。",
@@ -13720,7 +13865,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
   {
-    "original": "To demonstrate, run the <live-example name=\"ngmodule\">live example</live-example>.\nModify the `SharedModule` so that it provides the `UserService` rather than the `CoreModule`.\nThen toggle between the \"Contact\" and \"Heroes\" links a few times.\nThe username goes bonkers as the Angular creates a new `UserService` instance each time.\n<!-- CF: \"goes bonkers\" is jargon. Can you describe the behavior in plain English?  -->",
+    "original": "<!-- CF: \"goes bonkers\" is jargon. Can you describe the behavior in plain English?  -->",
     "translation": "自己验证一下吧。\n运行这个<live-example name=\"ngmodule\">在线例子</live-example>。\n修改`SharedModule`，由它来提供`UserService`而不再由`CoreModule`。\n然后在“Contact”和“Heroes”链接之间切换几次。\n由于Angular每次都创建一个新的`UserService`实例，所以用户名变得不正常了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
@@ -14236,7 +14381,7 @@
   },
   {
     "original": "Do *not* import service modules in other feature modules.\n      If you deviate from this guideline, know what you're doing and why.",
-    "translation": "*不要*在任何特性模块中导入它们。\n      如果你要违背这条指导原则，请务必想清楚你在做什么，并要有充分的理由。",
+    "translation": "*不要*在任何特性模块中导入它们。\n      如果你要违背这条指导原则，请务必想清楚你在做什么，并要有充分的理由。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
   {
@@ -14329,6 +14474,16 @@
     "translation": "顶级组件",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "Feature, <code>AppModule</code>",
+    "translation": "特性模块和<code>AppModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
+  {
+    "original": "<code>ContactModule</code> (before routing)",
+    "translation": "<code>ContactModule</code>（路由之前的那个例子）",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "Routed",
     "translation": "路由",
@@ -14354,6 +14509,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>ContactModule</code>, <code>HeroModule</code>, <code>CrisisModule</code>",
+    "translation": "<code>ContactModule</code>、<code>HeroModule</code>、<code>CrisisModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "Routing",
     "translation": "路由",
@@ -14374,6 +14534,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>HttpModule</code>, <code>CoreModule</code>",
+    "translation": "<code>HttpModule</code>、<code>CoreModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "Service",
     "translation": "服务",
@@ -14394,6 +14559,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>HttpModule</code>, <code>CoreModule</code>",
+    "translation": "<code>HttpModule</code>、<code>CoreModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "Widget",
     "translation": "窗口部件",
@@ -14419,6 +14589,11 @@
     "translation": "特性模块",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>CommonModule</code>, <code>SharedModule</code>",
+    "translation": "<code>CommonModule</code>、<code>SharedModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
+  },
   {
     "original": "## What's the difference between Angular and JavaScript Modules?",
     "translation": "## Angular模块和JavaScript模块有什么区别？",
@@ -14480,7 +14655,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
   {
-    "original": "The NgModule is also special in another way.\nUnlike JavaScript modules, an NgModule can extend the _entire_ application with services\nby adding providers to the `@NgModule.providers` list.\n<!-- CF: Should this sentence be a bullet point in the list above? -->",
+    "original": "<!-- CF: Should this sentence be a bullet point in the list above? -->",
     "translation": "Angular模块还有些别的特殊之处。\n不同于JavaScript模块，Angular模块可以通过把服务提供商添加到`@NgModule.providers`数组中来扩展*整个*应用提供的服务。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
@@ -14751,7 +14926,7 @@
   },
   {
     "original": "Both are advanced techniques that few developers ever employ.\n      If you are one of those few, you must add these components to the\n      `entryComponents` list yourself, either programmatically or by hand.",
-    "translation": "所有这些高级技巧是只有极少数开发人员才会去用的。\n      如果你是其中的一位，那么你就不得不自行把这些组件添加到`entryComponents`列表中 —— 无论是用程序添加还是手动添加。",
+    "translation": "所有这些高级技巧是只有极少数开发人员才会去用的。\n      如果你是其中的一位，那么你就不得不自行把这些组件添加到`entryComponents`列表中 —— 无论是用程序添加还是手动添加。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule-faq.md"
   },
   {
@@ -14859,6 +15034,31 @@
     "translation": "本章通过一个基于《英雄指南》的渐进式例子解释了 Angular 的模块。这里是例子演化过程中一些关键节点的在线例子。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "* <live-example plnkr=\"minimal.0\">A minimal NgModule app</live-example>",
+    "translation": "<live-example plnkr=\"minimal.0\">最小的 NgModule 应用</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"contact.1b\">The first contact module</live-example>",
+    "translation": "<live-example plnkr=\"contact.1b\">第一个联系人模块</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"contact.2\">The revised contact module</live-example>",
+    "translation": "<live-example plnkr=\"contact.2\">修改过的联系人模块</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"pre-shared.3\">Just before adding SharedModule</live-example>",
+    "translation": "<live-example plnkr=\"pre-shared.3\">添加 _SharedModule_ 之前</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example>The final version</live-example>",
+    "translation": "<live-example>最终版</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "#### Frequently asked questions (FAQs)",
     "translation": "### 常见问题",
@@ -15019,6 +15219,11 @@
     "translation": "这里的例子演示进行动态引导的方法。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<live-example embedded plnkr=\"minimal.0\" img=\"guide/ngmodule/minimal-plunker.png\">Try the live example.</live-example>",
+    "translation": "<live-example embedded plnkr=\"minimal.0\" img=\"devguide/ngmodule/minimal-plunker.png\">试试在线例子。</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "### Compile ahead-of-time (AOT)",
     "translation": "### 使用预编译器 (AoT - Ahead-Of-Time) 进行静态引导",
@@ -15194,6 +15399,11 @@
     "translation": "要解释这一点，我们可以再加入`ContactComponent`组件，它是一个表单组件，从 Angular 的`FormsModule`中导入了表单支持。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Add the _ContactComponent_</h3>",
+    "translation": "<h3 class=\"no-toc\">添加 _ContactComponent_</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "[Angular forms](guide/forms) are a great way to manage user data entry.",
     "translation": "[Angular 表单](guide/forms)是用来管理用户数据输入的最佳方式之一。",
@@ -15205,7 +15415,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
   {
-    "original": "You can write Angular form components in\ntemplate-driven or\n[reactive](guide/dynamic-form) style.\n<!-- CF: this link goes to a page titled \"Dynamic Forms\". Should the link text be \"dynamic\" instead of \"reactive\"? -->",
+    "original": "<h3 class=\"no-toc\">Angular form styles</h3>",
+    "translation": "### Angular 表单的风格",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
+  {
+    "original": "<!-- CF: this link goes to a page titled \"Dynamic Forms\". Should the link text be \"dynamic\" instead of \"reactive\"? -->",
     "translation": "我们写 Angular 表单组件时，可以使用[_模板驱动式表单_](guide/forms)，\n    也可以使用[_响应式表单_](guide/dynamic-form)。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
@@ -15254,6 +15469,11 @@
     "translation": "退一步说，即使 Angular 有办法识别`ngModel`，`ContactComponent`也不会表现的像 Angular 表单，\n因为本组件表单的表单相关的特性（例如有效性验证）还不可用。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Import the FormsModule</h3>",
+    "translation": "<h3 class=\"no-toc\">导入 FormsModule</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "Add the `FormsModule` to the `AppModule` metadata's `imports` list.",
     "translation": "把`FormsModule`加到`AppModule`元数据中的`imports`列表中：",
@@ -15279,6 +15499,11 @@
     "translation": "**永远不要再次声明属于其它模块的类。**",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Declare the contact component, directive, and pipe</h3>",
+    "translation": "### 声明联系人的组件、指令和管道",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "The application won't compile until you declare the contact component, directive, and pipe.\nUpdate the `declarations` in the  `AppModule` accordingly:",
     "translation": "如果我们没有声明该联系人模块的组件、指令和管道，该应用就会失败。\n更新`AppModule`中的`declarations`元数据，就像这样：",
@@ -15299,6 +15524,11 @@
     "translation": "这解决了在文件中使用指令_类型_时的冲突问题，但是还有另一个问题没有解决，我们将在[后面](guide/ngmodule#resolve-conflicts)讨论它。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Provide the _ContactService_</h3>",
+    "translation": "<h3 class=\"no-toc\">提供 _ContactService_</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "The `ContactComponent` displays contacts retrieved by the `ContactService`,\nwhich Angular injects into its constructor.",
     "translation": "`ContactComponent`显示从`ContactService`服务中获取的联系人信息，该服务是被 Angular 注入到组件的构造函数中的。",
@@ -15319,6 +15549,11 @@
     "translation": "现在，`ContactService`服务就能被注入进该应用中的任何组件了，就像`UserService`一样。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Application-scoped providers</h3>",
+    "translation": "<h3 class=\"no-toc\">全应用范围的提供商</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "The `ContactService` provider is _application_-scoped because Angular\n  registers a module's `providers` with the application's *root injector*.",
     "translation": "`ContactService`的提供商是_全应用_范围的，这是因为 Angular 使用该应用的**根注入器**注册模块的`providers`。",
@@ -15349,6 +15584,11 @@
     "translation": "在[NgModule常见问题](guide/ngmodule-faq)页的[如何把服务的范围限制在一个模块中](guide/ngmodule-faq#q-component-scoped-providers)一节中可以了解更多。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Run the app</h3>",
+    "translation": "<h3 class=\"no-toc\">运行该应用</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "Everything is in place to run the application with its contact editor.",
     "translation": "一切就绪，可以运行该应用及其联系人编辑器了。",
@@ -15359,6 +15599,11 @@
     "translation": "应用的文件结构是这样的：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "</div>",
+    "translation": "Try the example:\n试试这个例子：<live-example embedded plnkr=\"contact.1b\" img=\"guide/ngmodule/contact-1b-plunker.png\"></live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "## Resolve directive conflicts",
     "translation": "## 解决指令冲突",
@@ -15664,6 +15909,11 @@
     "translation": "试试范例的`ContactModule`版。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<live-example embedded plnkr=\"contact.2\" img=\"guide/ngmodule/contact-2-plunker.png\">Try the live example.</live-example>",
+    "translation": "<live-example embedded plnkr=\"contact.2\" img=\"devguide/ngmodule/contact-2-plunker.png\">试试在线例子</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "## Lazy-loading modules with the router",
     "translation": "## 用路由器实现惰性 (lazy) 加载",
@@ -15674,6 +15924,11 @@
     "translation": "英雄职介所这个例子应用继续成长。\n它又增加了两个模块，一个用来管理雇佣的英雄，另一个用来匹配英雄与危机。\n这两个模块都还处于前期开发阶段。\n它们对于整个故事来说无关紧要，这里我们就不逐行讨论了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "Examine and download the complete source for this version from the\n<live-example plnkr=\"pre-shared.3\" img=\"guide/ngmodule/v3-plunker.png\">live example.</live-example>",
+    "translation": "到<live-example plnkr=\"pre-shared.3\" img=\"devguide/ngmodule/v3-plunker.png\">在线例子</live-example>\n试用并下载当前版本的完整代码。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "Some facets of the current application merit discussion are as follows:",
     "translation": "当前应用中还有一些方面值得深入探讨。",
@@ -15720,7 +15975,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
   {
-    "original": "Some file names bear a `.3` extension that indicates\na difference with prior or future versions.\nThe significant differences will be explained in due course.\n<!-- CF: Can you be more specific here? Are the differences explained later in this page or in another page? -->",
+    "original": "<!-- CF: Can you be more specific here? Are the differences explained later in this page or in another page? -->",
     "translation": "有些文件名带有`.3`扩展名，用来和以前/以后的版本区分开。\n我们会在适当的时机解释它们的差异。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
@@ -16084,6 +16339,11 @@
     "translation": "`CoreModule`_提供_了`UserService`。Angular 在该应用的根注入器中注册了它的提供商，\n导致这份`UserService`的实例在每个需要它的组件中都是可用的，无论那个组件时主动加载的还是惰性加载的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Why bother?</h3>",
+    "translation": "<h3 class=\"no-toc\">没必要？</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/ngmodule.md"
+  },
   {
     "original": "This scenario is clearly contrived.\nThe app is too small to worry about a single service file and a tiny, one-time component.",
     "translation": "这个场景设计的是有点生硬。\n该应用太小了，所以其实并不需要拆分出单独的服务文件和小型的、一次性的组件。",
@@ -16339,6 +16599,11 @@
     "translation": "Node.js和npm是做Angular开发的基础。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/npm-packages.md"
   },
+  {
+    "original": "<a href=\"https://docs.npmjs.com/getting-started/installing-node\" title=\"Installing Node.js and updating npm\">\nGet them now</a> if they're not already installed on your machine.",
+    "translation": "如果你的电脑上还没有装过，请<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"Installing Node.js and updating npm\">立即获取它</a>！",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/npm-packages.md"
+  },
   {
     "original": "**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**\nby running the commands `node -v` and `npm -v` in a terminal/console window.\nOlder versions produce errors.",
     "translation": "通过在终端/控制台窗口中运行`node -v`和`npm -v`命令，来**验证下你是否正在使用node `v4.x.x`和npm `3.x.x`**。\n    过老的版本有可能出现问题。",
@@ -16879,6 +17144,11 @@
     "translation": "Angular通过*变更检测*过程来查找绑定值的更改，并在每一次JavaScript事件之后运行：每次按键、鼠标移动、定时器以及服务器的响应。\n这可能会让变更检测显得很昂贵，但是Angular会尽可能降低变更检测的成本。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">No pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">无管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "In the next example, the component uses the default, aggressive change detection strategy to monitor and update\nits display of every hero in the `heroes` array. Here's the template:",
     "translation": "我们下一个例子中的组件使用默认的、激进(昂贵)的变更检测策略来检测和更新`heroes`数组中的每个英雄。下面是它的模板：",
@@ -16894,6 +17164,11 @@
     "translation": "我们可以添加新的英雄，加完之后，Angular就会更新显示。\n`reset`按钮会把`heroes`替换成一个由原来的英雄组成的新数组，重置完之后，Angular就会更新显示。\n如果我们提供了删除或修改英雄的能力，Angular也会检测到那些更改，并更新显示。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\"><i>FlyingHeroesPipe</i></h3>",
+    "translation": "<h3 class=\"no-toc\"><i>“会飞的英雄”管道（FlyingHeroesPipe）</i></h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "Add a `FlyingHeroesPipe` to the `*ngFor` repeater that filters the list of heroes to just those heroes who can fly.",
     "translation": "我们来往`*ngFor`重复器中添加一个`FlyingHeroesPipe`管道，这个管道能过滤出所有会飞的英雄。",
@@ -16964,6 +17239,11 @@
     "translation": "在继续往下走之前，我们先理解一下*纯*和*非纯*之间的区别，从*纯*管道开始。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes</h3>",
+    "translation": "<h3 class=\"no-toc\">纯管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "Angular executes a *pure pipe* only when it detects a *pure change* to the input value.\nA pure change is either a change to a primitive input value (`String`, `Number`, `Boolean`, `Symbol`)\nor a changed object reference (`Date`, `Array`, `Function`, `Object`).",
     "translation": "Angular只有在它检测到输入值发生了*纯变更*时才会执行*纯管道*。\n    ***纯变更***是指对原始类型值(`String`、`Number`、`Boolean`、`Symbol`)的更改，\n    或者对对象引用(`Date`、`Array`、`Function`、`Object`)的更改。",
@@ -16989,6 +17269,11 @@
     "translation": "或者我们也可以完全不用管道。\n有时候，使用组件的属性能比用管道更好的达到目的，这一点我们等后面会再提起。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Impure pipes</h3>",
+    "translation": "### 非纯管道",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "Angular executes an *impure pipe*  during every component change detection cycle.\nAn impure pipe is called often, as often as every keystroke or mouse-move.",
     "translation": "Angular会在每个组件的变更检测周期中执行*非纯管道*。\n非纯管道可能会被调用很多次，和每个按键或每次鼠标移动一样频繁。",
@@ -16999,6 +17284,11 @@
     "translation": "要在脑子里绷着这根弦，我们必须小心翼翼的实现非纯管道。\n一个昂贵、迟钝的管道将摧毁用户体验。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure <i>FlyingHeroesPipe</i></h3>",
+    "translation": "### 非纯版本的*FlyingHeroesPipe*",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "A flip of the switch turns the `FlyingHeroesPipe` into a `FlyingHeroesImpurePipe`.\nThe complete implementation is as follows:",
     "translation": "我们把`FlyingHeroesPipe`换成了`FlyingHeroesImpurePipe`。\n下面是完整的实现：",
@@ -17024,6 +17314,11 @@
     "translation": "唯一的重大改动就是管道。\n  我们可以在<live-example></live-example>中确认，当我们输入新的英雄甚至修改#[code heroes]数组时，这个#[i 会飞的英雄]的显示也跟着更新了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">The impure <i>AsyncPipe</i></h3>",
+    "translation": "<h3 id='async-pipe'>\n  非纯  <i>AsyncPipe</i>\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "The Angular `AsyncPipe` is an interesting example of an impure pipe.\nThe `AsyncPipe` accepts a `Promise` or `Observable` as input\nand subscribes to the input automatically, eventually returning the emitted values.",
     "translation": "Angular的`AsyncPipe`是一个有趣的非纯管道的例子。\n  `AsyncPipe`接受一个`Promise`或`Observable`作为输入，并且自动订阅这个输入，最终返回它们给出的值。",
@@ -17044,6 +17339,11 @@
     "translation": "这个Async管道节省了组件的样板代码。\n组件不用订阅这个异步数据源，而且不用在被销毁时取消订阅(如果订阅了而忘了反订阅容易导致隐晦的内存泄露)。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure caching pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">一个非纯而且带缓存的管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "Write one more impure pipe, a pipe that makes an HTTP request.",
     "translation": "我们来写更多的非纯管道：一个向服务器发起HTTP请求的管道。",
@@ -17104,6 +17404,11 @@
     "translation": "[JsonPipe](api/common/JsonPipe)为你诊断数据绑定的某些神秘错误或为做进一步绑定而探查数据时，提供了一个简单途径。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes and pure functions</h3>",
+    "translation": "### 纯管道与纯函数",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/pipes.md"
+  },
   {
     "original": "A pure pipe uses pure functions.\nPure functions process inputs and return values without detectable side effects.\nGiven the same input, they should always return the same output.",
     "translation": "纯管道使用纯函数。\n纯函数是指在处理输入并返回结果时，不会产生任何副作用的函数。\n给定相同的输入，它们总是返回相同的输出。",
@@ -17209,6 +17514,11 @@
     "translation": "你还可以 <a href=\"generated/zips/cli-quickstart/cli-quickstart.zip\" target=\"_blank\">下载这个例子</a> 。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='devenv'>\n  Step 1. Set up the Development Environment\n</h2>",
+    "translation": "<h2 id='devenv'>\n  步骤1. 设置开发环境\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
+  },
   {
     "original": "You need to set up your development environment before you can do anything.",
     "translation": "在开始工作之前，我们必须设置好开发环境。",
@@ -17229,6 +17539,11 @@
     "translation": "然后全局安装 **[Angular CLI](https://github.com/angular/angular-cli)** 。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='create-proj'>\n  Step 2. Create a new project\n</h2>",
+    "translation": "<h2 id='create-proj'>\n  步骤2. 创建新项目\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
+  },
   {
     "original": "Open a terminal window.",
     "translation": "打开终端窗口。",
@@ -17244,6 +17559,11 @@
     "translation": "请耐心等待。\n创建新项目需要花费很多时间，大多数时候都是在安装那些npm包。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='serve'>\n  Step 3: Serve the application\n</h2>",
+    "translation": "<h2 id='serve'>\n  步骤3. 启动开发服务器\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
+  },
   {
     "original": "Go to the project directory and launch the server.",
     "translation": "进入项目目录，并启动服务器。",
@@ -17264,6 +17584,11 @@
     "translation": "本应用会用一条消息来跟你打招呼：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='first-component'>\n  Step 4: Edit your first Angular component\n</h2>",
+    "translation": "<h2 id='first-component'>\n  步骤4. 编辑我们的第一个Angular组件\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
+  },
   {
     "original": "The CLI created the first Angular component for you.\nThis is the _root component_ and it is named `app-root`.\nYou can find it in `./src/app/app.component.ts`.",
     "translation": "这个CLI为我们创建了第一个Angular组件。\n它就是名叫`app-root`的*根组件*。\n你可以在`./src/app/app.component.ts`目录下找到它。",
@@ -17340,12 +17665,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
-    "original": "File",
+    "original": "<table width=\"100%\">\n  <col width=\"20%\">\n  </col>\n  <col width=\"80%\">\n  </col>\n  <tr>\n    <th>\n      File",
     "translation": "文件",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
-    "original": "Purpose",
+    "original": "</th>\n    <th>\n      Purpose",
     "translation": "用途",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
@@ -17361,7 +17686,7 @@
   },
   {
     "original": "A folder where you can put images and anything else to be copied wholesale\n      when you build your application.",
-    "translation": "这个文件夹下你可以放图片等任何东西，在构建应用时，它们全都会拷贝到发布包中。",
+    "translation": "这个文件夹下你可以放图片等任何东西，在构建应用时，它们全都会拷贝到发布包中。\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
@@ -17371,7 +17696,7 @@
   },
   {
     "original": "Every site wants to look good on the bookmark bar.\n      Get started with your very own Angular icon.",
-    "translation": "每个网站都希望自己在书签栏中能好看一点。\n      请把它换成你自己的图标。",
+    "translation": "每个网站都希望自己在书签栏中能好看一点。\n      请把它换成你自己的图标。\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
@@ -17415,12 +17740,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
-    "original": "File",
+    "original": "<table width=\"100%\">\n  <col width=\"20%\">\n  </col>\n  <col width=\"80%\">\n  </col>\n  <tr>\n    <th>\n      File",
     "translation": "文件",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
   {
-    "original": "Purpose",
+    "original": "</th>\n    <th>\n      Purpose",
     "translation": "用途",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/quickstart.md"
   },
@@ -18126,17 +18451,17 @@
   },
   {
     "original": "the value of a `FormControl`.",
-    "translation": "`FormControl`的值。",
+    "translation": "`FormControl`的值。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/reactive-forms.md"
   },
   {
     "original": "the validity of a `FormControl`. Possible values: `VALID`,\n       `INVALID`, `PENDING`, or `DISABLED`.",
-    "translation": "`FormControl`的有效性。可能的值有`VALID`、`INVALID`、`PENDING`或`DISABLED`。",
+    "translation": "`FormControl`的有效性。可能的值有`VALID`、`INVALID`、`PENDING`或`DISABLED`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/reactive-forms.md"
   },
   {
     "original": "`true` if the user has _not_ changed the value in the UI.\n       Its opposite is `myControl.dirty`.",
-    "translation": "如果用户*尚未*改变过这个控件的值，则为`true`。它总是与`myControl.dirty`相反。",
+    "translation": "如果用户*尚未*改变过这个控件的值，则为`true`。它总是与`myControl.dirty`相反。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/reactive-forms.md"
   },
   {
@@ -19000,23 +19325,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Property",
-    "translation": "属性",
+    "original": "<table>\n  <tr>\n    <th>\n      Property",
+    "translation": "属性\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Description",
-    "translation": "描述",
+    "original": "<th>\n      Description",
+    "translation": "描述\n    </th>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
     "original": "An `Observable` of the route path(s), represented as an array of strings for each part of the route path.",
-    "translation": "路由路径的`Observable`对象，是一个由路由路径中的各个部分组成的字符串数组。",
+    "translation": "路由路径的`Observable`对象，是一个由路由路径中的各个部分组成的字符串数组。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
     "original": "An `Observable` that contains the `data` object provided for the route. Also contains any resolved values from the [resolve guard](#resolve-guard).",
-    "translation": "一个`Observable`，其中包含提供给路由的`data`对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。",
+    "translation": "一个`Observable`，其中包含提供给路由的`data`对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -19031,7 +19356,7 @@
   },
   {
     "original": "The name of the `RouterOutlet` used to render the route. For an unnamed outlet, the outlet name is _primary_.",
-    "translation": "要把该路由渲染到的`RouterOutlet`的名字。对于无名路由，它的路由名是`primary`，而不是空串。",
+    "translation": "要把该路由渲染到的`RouterOutlet`的名字。对于无名路由，它的路由名是`primary`，而不是空串。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -19041,7 +19366,7 @@
   },
   {
     "original": "The route's parent `ActivatedRoute` when this route is a [child route](#child-routing-component).",
-    "translation": "当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级`ActivatedRoute`。",
+    "translation": "当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级`ActivatedRoute`。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -19080,12 +19405,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Router Event",
+    "original": "<table>\n  <tr>\n    <th>\n      Router Event",
     "translation": "路由器事件",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Description",
+    "original": "<th>\n      Description",
     "translation": "描述",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
@@ -19155,13 +19480,18 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Displays the application component for the active URL.\n        Manages navigation from one component to the next.",
-    "translation": "为激活的URL显示应用组件。管理从一个组件到另一个组件的导航",
+    "original": "<code>Router</code>",
+    "translation": "<code>Router</code>（路由器）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "A separate NgModule that provides the necessary service providers\n        and directives for navigating through application views.",
-    "translation": "一个独立的Angular模块，用于提供所需的服务提供商，以及用来在应用视图之间进行导航的指令。",
+    "original": "<code>RouterModule</code>",
+    "translation": "<code>RouterModule</code>（路由器模块）",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
+  },
+  {
+    "original": "<code>Routes</code>",
+    "translation": "<code>Routes</code>（路由数组）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -19170,8 +19500,13 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Defines how the router should navigate to a component based on a URL pattern.\n        Most routes consist of a path and a component type.",
-    "translation": "定义路由器该如何根据URL模式（pattern）来导航到组件。大多数路由都由路径和组件类构成。",
+    "original": "<code>Route</code>",
+    "translation": "<code>Route</code>（路由）",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
+  },
+  {
+    "original": "<code>RouterOutlet</code>",
+    "translation": "<code>RouterOutlet</code>（路由出口）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -19180,28 +19515,38 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "The directive for binding a clickable HTML element to\n        a route. Clicking an element with a <code>routerLink</code> directive\n        that is bound to a <i>link parameters array</i> triggers a navigation.",
-    "translation": "该指令用来把一个可点击的HTML元素绑定到路由。\n        点击带有绑定到<i>字符串</i>或<i>链接参数数组</i>的<code>routerLink</code>指令的元素就会触发一次导航。",
+    "original": "<code>RouterLink</code>",
+    "translation": "<code>RouterLink</code>（路由链接）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "The directive for adding/removing classes from an HTML element when an associated\n        <code>routerLink</code> contained on or inside the element becomes active/inactive.",
-    "translation": "当HTML元素上或元素内的<code>routerLink</code>变为激活或非激活状态时，该指令为这个HTML元素添加或移除CSS类。",
+    "original": "<code>RouterLinkActive</code>",
+    "translation": "<code>RouterLinkActive</code>（活动路由链接）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "A service that is provided to each route component that contains route specific\n        information such as route parameters, static data, resolve data, global query params, and the global fragment.",
-    "translation": "为每个路由组件提供提供的一个服务，它包含特定于路由的信息，比如路由参数、静态数据、解析数据、全局查询参数和全局碎片（fragment）。",
+    "original": "<code>ActivatedRoute</code>",
+    "translation": "<code>ActivatedRoute</code>（激活的路由）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "The current state of the router including a tree of the currently activated\n        routes together with convenience methods for traversing the route tree.",
-    "translation": "路由器的当前状态包含了一棵由程序中激活的路由构成的树。它包含一些用于遍历路由树的快捷方法。",
+    "original": "<code>RouterState</code>",
+    "translation": "<code>RouterState</code>（路由器状态）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "An array that the router interprets as a routing instruction.\n        You can bind that array toa <code>RouterLink</code>  or pass the array as an argument to\n        the <code>Router.navigate</code> method.",
-    "translation": "这个数组会被路由器解释成一个路由操作指南。我们可以把一个<code>RouterLink</code>绑定到该数组，或者把它作为参数传给<code>Router.navigate</code>方法。",
+    "original": "<b><i>Link parameters array</i></b>",
+    "translation": "<i>链接参数数组</i>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
+  },
+  {
+    "original": "<b><i>Routing component</i></b>",
+    "translation": "<b><i>路由组件</i></b>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
+  },
+  {
+    "original": "An Angular component with a <code>RouterOutlet</code> that displays views based on router navigations.",
+    "translation": "一个带有<code>RouterOutlet</code>的Angular组件，它根据路由器的导航来显示相应的视图。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -20290,23 +20635,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Member",
-    "translation": "成员",
+    "original": "<table>\n  <tr>\n    <th>\n      Member",
+    "translation": "成员\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "Description",
-    "translation": "描述",
+    "original": "<th>\n      Description",
+    "translation": "描述\n    </th>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
     "original": "Returns `true` if the parameter name is in the map of parameters.",
-    "translation": "如果参数名位于参数列表中，就返回 `true` 。",
+    "translation": "如果参数名位于参数列表中，就返回 `true` 。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
     "original": "Returns the parameter name value (a `string`) if present, or `null` if the parameter name is not in the map. Returns the _first_ element if the parameter value is actually an array of values.",
-    "translation": "如果这个map中有参数名对应的参数值（字符串），就返回它，否则返回`null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。",
+    "translation": "如果这个map中有参数名对应的参数值（字符串），就返回它，否则返回`null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -21701,7 +22046,7 @@
   },
   {
     "original": "Now you have given the user a safeguard against unsaved changes.",
-    "translation": "现在，我们已经给了用户一个能保护未保存更改的安全守卫。\n{@a Resolve}",
+    "translation": "现在，我们已经给了用户一个能保护未保存更改的安全守卫。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
@@ -22345,7 +22690,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
   {
-    "original": "where you can download the final source code.",
+    "original": "You've covered a lot of ground in this guide and the application is too big to reprint here.\nPlease visit the <live-example title=\"Router Sample in Plunker\"></live-example>\nwhere you can download the final source code.",
     "translation": "本章中涉及到了很多背景知识，而且本应用程序也太大了，所以没法在这里显示。请访问<live-example title=\"Router Sample in Plunker\"></live-example>，在那里你可以下载最终的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/router.md"
   },
@@ -22634,6 +22979,11 @@
     "translation": "运行<live-example></live-example>来试用本页的代码。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h2 id='report-issues'>\nReporting vulnerabilities\n</h2>",
+    "translation": "<h2 id='report-issues'>\n举报漏洞\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "To report vulnerabilities in Angular itself, email us at [security@angular.io](mailto:security@angular.io).",
     "translation": "给我们（[security@angular.io](mailto:security@angular.io)）发邮件，报告Angular本身的漏洞。",
@@ -22644,6 +22994,11 @@
     "translation": "要了解关于“谷歌如何处理安全问题”的更多信息，参见[谷歌的安全哲学](https://www.google.com/about/appsecurity/)。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h2 id='best-practices'>\nBest practices\n</h2>",
+    "translation": "<h2 id='best-practices'>\n最佳实践\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "* **Keep current with the latest Angular library releases.**\nWe regularly update the Angular libraries, and these updates may fix security defects discovered in\nprevious versions. Check the Angular [change\nlog](https://github.com/angular/angular/blob/master/CHANGELOG.md) for security-related updates.",
     "translation": "**及时把Angular包更新到最新版本。**\n我们会频繁的更新Angular库，这些更新可能会修复之前版本中发现的安全漏洞。查看Angular的[更新记录](https://github.com/angular/angular/blob/master/CHANGELOG.md)，了解与安全有关的更新。",
@@ -22794,6 +23149,11 @@
     "translation": "服务器端构造的HTML很容易受到注入攻击。当需要在服务器端生成HTML时（比如Angular应用的初始页面），\n  务必使用一个能够自动进行无害化处理以防范XSS漏洞的后端模板语言。不要在服务器端使用模板语言生成Angular模板，\n  这样会带来很高的“模板注入”风险。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h2 id='bypass-security-apis'>\n  Trusting safe values\n</h2>",
+    "translation": "<h2 id='bypass-security-apis'>\n  信任安全值\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "Sometimes applications genuinely need to include executable code, display an `<iframe>` from some\nURL, or construct potentially dangerous URLs. To prevent automatic sanitization in any of these\nsituations, you can tell Angular that you inspected a value, checked how it was generated, and made\nsure it will always be secure. But *be careful*. If you trust a value that might be malicious, you\nare introducing a security vulnerability into your application. If in doubt, find a professional\nsecurity reviewer.",
     "translation": "有时候，应用程序确实需要包含可执行的代码，比如使用URL显示`<iframe>`，或者构造出有潜在危险的URL。\n    为了防止在这种情况下被自动无害化，你可以告诉Angular：我已经审查了这个值，检查了它是怎么生成的，并确信它总是安全的。\n    但是**千万要小心**！如果你信任了一个可能是恶意的值，就会在应用中引入一个安全漏洞。如果你有疑问，请找一个安全专家复查下。",
@@ -22819,11 +23179,21 @@
     "translation": "如果需要把用户输入转换为一个可信任的值，我们可以很方便的在控制器方法中处理。下面的模板允许用户输入一个YouTube视频的ID，\n  然后把相应的视频加载到`<iframe>`中。`<iframe src>`是一个“资源URL”的安全环境，因为不可信的源码可能作为文件下载到本地，被毫无防备的用户执行。\n  所以我们要调用一个控制器方法来构造一个新的、可信任的视频URL，然后把它绑定到`<iframe src>`。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h2 id='http'>\n  HTTP-level vulnerabilities\n</h2>",
+    "translation": "<h2 id='http'>\n  HTTP级别的漏洞\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "Angular has built-in support to help prevent two common HTTP vulnerabilities, cross-site request\nforgery (CSRF or XSRF) and cross-site script inclusion (XSSI). Both of these must be mitigated primarily\non the server side, but Angular provides helpers to make integration on the client side easier.",
     "translation": "Angular内置了一些支持来防范两个常见的HTTP漏洞：跨站请求伪造（XSRF）和跨站脚本包含（XSSI）。\n  这两个漏洞主要在服务器端防范，但是Angular也自带了一些辅助特性，可以让客户端的集成变得更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h3 id='xsrf'>\n  Cross-site request forgery\n</h3>",
+    "translation": "<h3 id='xsrf'>\n  跨站请求伪造（XSRF）\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "In a cross-site request forgery (CSRF or XSRF), an attacker tricks the user into visiting\na different web page (such as `evil.com`) with malignant code that secretly sends a malicious request\nto the application's web server (such as `example-bank.com`).",
     "translation": "在跨站请求伪造（XSRF或CSFR）中，攻击者欺骗用户，让他们访问一个假冒页面(例如`evil.com`)，\n该页面带有恶意代码，秘密的向你的应用程序服务器发送恶意请求(例如`example-bank.com`)。",
@@ -22869,6 +23239,11 @@
     "translation": "参见Dave Smith在<a href=\"https://www.youtube.com/watch?v=9inczw6qtpY\" target=\"_blank\" title=\"Cross Site Request Funkery Securing Your Angular Apps From Evil Doers\">AngularConnect 2016关于XSRF的演讲</a>。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h3 id='xssi'>\n  Cross-site script inclusion (XSSI)\n</h3>",
+    "translation": "<h3 id='xssi'>\n  跨站脚本包含(XSSI)\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "Cross-site script inclusion, also known as JSON vulnerability, can allow an attacker's website to\nread data from a JSON API. The attack works on older browsers by overriding native JavaScript\nobject constructors, and then including an API URL using a `<script>` tag.",
     "translation": "跨站脚本包含，也被称为Json漏洞，它可以允许一个攻击者的网站从JSON API读取数据。这种攻击发生在老的浏览器上，\n它重写原生JavaScript对象的构造函数，然后使用`<script>`标签包含一个API的URL。",
@@ -22889,6 +23264,11 @@
     "translation": "要学习更多这方面的知识，请参见[谷歌Web安全博客文章](https://security.googleblog.com/2011/05/website-security-for-webmasters.html)的XSSI小节。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
   },
+  {
+    "original": "<h2 id='code-review'>\n  Auditing Angular applications\n</h2>",
+    "translation": "<h2 id='code-review'>\n  审计Angular应用程序\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/security.md"
+  },
   {
     "original": "Angular applications must follow the same security principles as regular web applications, and\nmust be audited as such. Angular-specific APIs that should be audited in a security review,\nsuch as the [_bypassSecurityTrust_](guide/security#bypass-security-apis) methods, are marked in the documentation\nas security sensitive.",
     "translation": "Angular应用应该遵循和常规Web应用一样的安全原则并按照这些原则进行审计。Angular中某些应该在安全评审中被审计的API（\n比如[_bypassSecurityTrust_](guide/security#bypass-security-apis) API）都在文档中被明确标记为安全性敏感的。",
@@ -22906,7 +23286,7 @@
   },
   {
     "original": "See the <live-example name=\"set-document-title\"></live-example>.",
-    "translation": "参见",
+    "translation": "参见<live-example name=\"set-document-title\"></live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/set-document-title.md"
   },
   {
@@ -23016,12 +23396,12 @@
   },
   {
     "original": "File",
-    "translation": "文件",
+    "translation": "文件\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Purpose",
-    "translation": "用途",
+    "translation": "用途\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23035,8 +23415,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
-    "original": "as _live examples_.",
-    "translation": "在live example中试试",
+    "original": "Try the <live-example name=\"setup\">sample application</live-example> \n      and the <live-example name=\"setup\" plnkr=\"quickstart-specs\">unit test</live-example>\n      as _live examples_.",
+    "translation": "在live example中试试<live-example name=\"setup\">范例程序</live-example>和<live-example name=\"setup\" plnkr=\"quickstart-specs\">单元测试</live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23101,7 +23481,7 @@
   },
   {
     "original": "A list of files that you can delete if you want to purge your setup of the\n      original QuickStart Seed testing and git maintenance artifacts.\n      See instructions in the optional\n      [_Deleting non-essential files_](guide/setup#non-essential \"Setup: Deleting non-essential files\") section.\n      *Do this only in the beginning to avoid accidentally deleting your own tests and git setup!*",
-    "translation": "这个列表中的文件在清理时可以删除，它是原始的“快速上手”种子工程中的测试和git维护文件。\n      步骤参见可选的[删除非必要文件](guide/setup#non-essential \"Setup: Deleting non-essential files\")部分。\n      *只在最初做这件事，以免不小心删除了你自己的测试文件和git配置！*",
+    "translation": "这个列表中的文件在清理时可以删除，它是原始的“快速上手”种子工程中的测试和git维护文件。\n      步骤参见可选的[删除非必要文件](guide/setup#non-essential \"Setup: Deleting non-essential files\")部分。\n      *只在最初做这件事，以免不小心删除了你自己的测试文件和git配置！*\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23116,17 +23496,17 @@
   },
   {
     "original": "Contains command scripts for running the application,\n      running tests, and more. Enter `npm run` for a listing.\n      <a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\"\n         title=\"npm scripts for Angular documentation samples\">Read more</a> about them.",
-    "translation": "包含了一些命令脚本，用来运行应用、运行测试与其他。输入`npm run`来查看命令列表。\n      到<a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\" \n         target=\"_blank\" title=\"Angular 文档例子的 npm 脚本\">这里</a>阅读更多关于它们的说明。",
+    "translation": "包含了一些命令脚本，用来运行应用、运行测试与其他。输入`npm run`来查看命令列表。\n      到<a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\" \n         target=\"_blank\" title=\"Angular 文档例子的 npm 脚本\">这里</a>阅读更多关于它们的说明。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Configuration for the\n      <a href=\"http://www.protractortest.org/\" title=\"Protractor: end-to-end testing for Angular\">protractor</a>\n      _end-to-end_ (e2e) test runner.",
-    "translation": "<a href=\"http://www.protractortest.org/\" target=\"_blank\" title=\"Protractor: Angular 的端对端测试\">protractor</a> *端对端* (e2e) 测试器运行器的配置。",
+    "translation": "<a href=\"http://www.protractortest.org/\" target=\"_blank\" title=\"Protractor: Angular 的端对端测试\">protractor</a> *端对端* (e2e) 测试器运行器的配置。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Instruction for using this git repository in your project.\n      Worth reading before deleting.",
-    "translation": "项目中使用这个 git 库的说明。\n      在删除前值得阅读。",
+    "translation": "项目中使用这个 git 库的说明。\n      在删除前值得阅读。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23141,7 +23521,7 @@
   },
   {
     "original": "Don't touch this file unless you are fully versed in SystemJS configuration.",
-    "translation": "除非你完全理解 SystemJS 的配置，不要修改它。",
+    "translation": "除非你完全理解 SystemJS 的配置，不要修改它。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23161,7 +23541,7 @@
   },
   {
     "original": "This file defines linting rules favored by the \n      [Angular style guide](guide/styleguide) and by the authors of the documentation.",
-    "translation": "该文件定义了 [Angular 风格指南](guide/styleguide)与本文档站作者喜爱的语法检查规则。",
+    "translation": "该文件定义了 [Angular 风格指南](guide/styleguide)与本文档站作者喜爱的语法检查规则。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -23204,6 +23584,11 @@
     "translation": "## 下载",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"Download the QuickStart seed repository\">Download the QuickStart seed</a>\nand unzip it into your project folder. Then perform the remaining steps with these terminal commands.",
+    "translation": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"下载《快速上手》种子库\">下载《快速上手》种子</a>\n并解压到你的项目目录中。然后执行下面的命令完成剩余步骤。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
+  },
   {
     "original": "`npm start` fails in _Bash for Windows_ in versions earlier than the Creator's Update (April 2017).",
     "translation": "在*Bash for Windows*中`npm start`可能会失败，因为到2017-01为止它还不支持访问网络上的服务器。",
@@ -23286,7 +23671,7 @@
   },
   {
     "original": "Defines `AppModule`, the [root module](guide/bootstrapping \"AppModule: the root module\") that tells Angular how to assemble the application.\n      Right now it declares only the `AppComponent`. \n      Soon there will be more components to declare.",
-    "translation": "定义`AppModule`，[根模块](guide/bootstrapping \"AppModule: 根模块\")为 Angular 描述如何组装应用。\n      目前，它只声明了`AppComponent`。\n      不久，它将声明更多组件。",
+    "translation": "定义`AppModule`，[根模块](guide/bootstrapping \"AppModule: 根模块\")为 Angular 描述如何组装应用。\n      目前，它只声明了`AppComponent`。\n      不久，它将声明更多组件。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
   },
   {
@@ -23314,6 +23699,11 @@
     "translation": "Node.js 和 npm 对使用 Angular 和其他平台进行现代网络开发是至关重要的。\nNode 驱动客户端开发和构建工具。\n*npm* 包管理器本身是 *node* 应用，用于安装 JavaScript 库。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"Installing Node.js and updating npm\">\n</a> if they're not already installed on your machine.",
+    "translation": "如果你的电脑没有安装它们，<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"安装 Node.js 和更新 npm\">\n立刻安装它们</a>。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
+  },
   {
     "original": "**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**\nby running the commands `node -v` and `npm -v` in a terminal/console window.\nOlder versions produce errors.",
     "translation": "在终端/控制器窗口运行命令`node -v`和`npm -v`，来**确认你运行的 node 是`v4.x.x`或更高，npm 为`3.x.x`或更高。**\n老版本会产生错误。",
@@ -23329,6 +23719,11 @@
     "translation": "## 附录：为何在本地开发",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
   },
+  {
+    "original": "<live-example title=\"QuickStart Seed in Plunker\">Live coding</live-example> in the browser is a great way to explore Angular.",
+    "translation": "在浏览器中<live-example title=\"QuickStart Seed in Plunker\">在线编程</live-example>是很好的探索 Angular 的方法。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/setup.md"
+  },
   {
     "original": "Links on almost every documentation page open completed samples in the browser.\nYou can play with the sample code, share your changes with friends, and download and run the code on your own machine.",
     "translation": "几乎每章文档里面的链接都在浏览器中打开完整的例子。\n你可以用这些代码做实验，或者与朋友共享你的修改，或者下载并在你自己的电脑上运行这些代码。",
@@ -24194,6 +24589,11 @@
     "translation": "随着应用程序的成长，本法则会变得越来越重要。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Small functions",
     "translation": "### 小函数",
@@ -24239,6 +24639,11 @@
     "translation": "**为何？**简单函数可避免易在大函数中产生的隐蔽性错误，例如与外界共享变量、创建意外的闭包或与依赖之间产生意外耦合等。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Naming",
     "translation": "## 命名",
@@ -24284,6 +24689,11 @@
     "translation": "**为何？**目录名和文件名应该清楚的传递它们的意图。\n例如，`app/heroes/hero-list.component.ts`包含了一个用来管理英雄列表的组件。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Separate file names with dots and dashes",
     "translation": "### 使用点和横杠来分隔文件名",
@@ -24334,6 +24744,11 @@
     "translation": "**为何？**为自动化任务提供模式匹配。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Symbols and file names",
     "translation": "### 符号名与文件名",
@@ -24384,6 +24799,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Service names",
     "translation": "### 服务名",
@@ -24434,6 +24854,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Bootstrapping",
     "translation": "### 引导",
@@ -24469,6 +24894,11 @@
     "translation": "**为何？**这是从其它技术平台借鉴的常用约定。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Directive selectors",
     "translation": "### 指令选择器",
@@ -24494,6 +24924,11 @@
     "translation": "**为何？**Angular HTML 解析器是大小写敏感的，它识别小写驼峰写法。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Custom prefix for components",
     "translation": "### 为组件添加自定义前缀",
@@ -24564,6 +24999,11 @@
     "translation": "**为何？**指令更加容易被识别。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Pipe names",
     "translation": "### 管道名",
@@ -24594,6 +25034,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Unit test file names",
     "translation": "### 单元测试文件名",
@@ -24625,28 +25070,33 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
-    "original": "Test Type",
+    "original": "<th>\n      Test Type",
     "translation": "测试类型",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
-    "original": "File Names",
+    "original": "<th>\n      File Names",
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
     "original": "Components",
-    "translation": "组件",
+    "translation": "组件\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
     "original": "Services",
-    "translation": "服务",
+    "translation": "服务\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
     "original": "Pipes",
-    "translation": "管道",
+    "translation": "管道\n    </td>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
@@ -24675,18 +25125,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
-    "original": "Test Type",
+    "original": "<th>\n      Test Type",
     "translation": "测试类型",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
-    "original": "File Names",
+    "original": "<th>\n      File Names",
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
     "original": "End-to-End Tests",
-    "translation": "端到端测试",
+    "translation": "端到端测试\n    </td>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
@@ -24744,6 +25199,11 @@
     "translation": "**为何？**`RoutingModule`是一种专门用来配置 Angular 路由器的模块。\n“类名和文件名保持一致”的约定使这些模块易于发现和验证。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Coding conventions",
     "translation": "## 编程约定",
@@ -24779,6 +25239,11 @@
     "translation": "**为何？**类可以被实例化和构造实例。根据约定，用大写驼峰命名法来标识可构造的东西。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Constants",
     "translation": "### 常量",
@@ -24829,6 +25294,11 @@
     "translation": "**为何？**传统的大写蛇形命名法仍然很流行、很普遍，特别是在第三方模块中。\n修改它们没多大价值，还会有破坏现有代码和文档的风险。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Interfaces",
     "translation": "### 接口",
@@ -24874,6 +25344,11 @@
     "translation": "**为何？**在 Angular 依赖注入系统中，接口类可以作为服务提供商的查找令牌。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Properties and methods",
     "translation": "### 属性和方法",
@@ -24909,6 +25384,11 @@
     "translation": "**为何？** TypeScript 工具让识别私有或公有属性和方法变得很简单。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Import line spacing",
     "translation": "### 导入语句中的空行",
@@ -24944,6 +25424,11 @@
     "translation": "**为何？**按字母顺序排列可以让阅读和定位本地导入更加容易。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Application structure and NgModules",
     "translation": "## 应用程序结构与 Angular 模块",
@@ -24964,6 +25449,11 @@
     "translation": "所有内容都遵循每个文件一个特性的原则。每个组件、服务和管道都在自己的文件里。\n所有第三方程序包保存到其它目录里，而不是`src`目录。\n你不会修改它们，所以不希望它们弄乱我们的应用程序。\n使用本指南介绍的文件命名约定。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "#### Style 04-01",
     "translation": "#### 风格 04-01",
@@ -24984,6 +25474,11 @@
     "translation": "**为何？**LIFT提供了一致的结构，它具有扩展性强、模块化的特性。因为容易快速锁定代码，提高了开发者的效率。\n另外，检查应用结构是否合理的方法是问问自己：我们能快速打开与此特性有关的所有文件并开始工作吗？",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Locate",
     "translation": "### 定位",
@@ -25004,6 +25499,11 @@
     "translation": "**为何？**\n要想高效的工作，就必须能迅速找到文件，特别是当不知道（或不记得）文件*名*时。\n把相关的文件一起放在一个直观的位置可以节省时间。\n富有描述性的目录结构会让你和后面的维护者眼前一亮。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Identify",
     "translation": "### 识别",
@@ -25039,6 +25539,11 @@
     "translation": "当你有一组小型、紧密相关的特性时，违反*一物一文件*的规则可能会更好，\n这种情况下单一文件可能会比多个文件更容易发现和理解。注意这个例外。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Flat",
     "translation": "### 扁平",
@@ -25070,7 +25575,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
   {
-    "original": "On the other hand,\n<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\">psychologists believe</a>\nthat humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
+    "original": "that humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
     "translation": "另一方面，<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\" target=\"_blank\">心理学家们相信</a>，\n当关注的事物超过 9 个时，人类就会开始感到吃力。\n所以，当一个文件夹中的文件有 10 个或更多个文件时，可能就是创建子目录的时候了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
@@ -25079,6 +25584,11 @@
     "translation": "还是根据你自己的舒适度而定吧。\n除非创建新文件夹能有显著的价值，否则尽量使用扁平结构。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### _T-DRY_ (Try to be _DRY_)",
     "translation": "### *T-DRY*（尽量不重复自己）",
@@ -25104,6 +25614,11 @@
     "translation": "**为何？**虽然 DRY 很重要，但如果要以牺牲 LIFT 的其它原则为代价，那就不值得了。\n这也就是为什么它被称为 *T-DRY*。\n例如，把组件命名为`hero-view.component.html`是多余的，因为带有`.html`扩展名的文件显然就是一个视图 (view)。\n但如果它不那么显著，或不符合常规，就把它写出来。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Overall structural guidelines",
     "translation": "### 总体结构的指导原则",
@@ -25154,6 +25669,11 @@
     "translation": "把组件放在专用目录中的方式广受欢迎，对于小型应用，还可以保持组件扁平化（而不是放在专用目录中）。\n这样会把四个文件放在现有目录中，也会减少目录的嵌套。无论你如何选择，请保持一致。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### _Folders-by-feature_ structure",
     "translation": "### 按特性组织的目录结构",
@@ -25204,6 +25724,16 @@
     "translation": "**为何？**Angular 模块隔离、测试和复用特性更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<div class='file-tree-reference'>\n  <a href=\"#file-tree\">Refer to this _folder and file structure_ example.</a>  <a href=\"#file-tree\">点这里查看目录和文件结构的范例</a>\n</div>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### App _root module_",
     "translation": "### 应用的*根模块*",
@@ -25234,6 +25764,11 @@
     "translation": "**为何？**能让定位和识别根模块变得更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Feature modules",
     "translation": "### 特性模块",
@@ -25294,6 +25829,11 @@
     "translation": "**为何？**特性模块易于隔离，以便测试。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Shared feature module",
     "translation": "### 共享特性模块",
@@ -25364,6 +25904,11 @@
     "translation": "**为何？**对于单例服务，你不希望每个模块都有自己的实例。\n而如果`SharedModule`提供了一个服务，那就有可能发生这种情况。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Core feature module",
     "translation": "### 核心特性模块",
@@ -25454,6 +25999,11 @@
     "translation": "`AppModule`变得更小了，因为很多应用根部的类都被移到了其它模块中。\n`AppModule`变得稳定了，因为你将会往其它模块中添加特性组件和服务提供商，而不是这个`AppModule`。\n`AppModule`把工作委托给了导入的模块，而不是亲力亲为。\n`AppModule`聚焦在它自己的主要任务上：作为整个应用的总指挥。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Prevent re-import of the core module",
     "translation": "### 防止多次导入`CoreModule`",
@@ -25484,6 +26034,11 @@
     "translation": "**为何？**守卫会禁止创建单例服务的多个实例。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Lazy Loaded folders",
     "translation": "### 惰性加载的目录",
@@ -25509,6 +26064,11 @@
     "translation": "**为何？**这种目录让标识和隔离这些特性内容变得更轻松。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Never directly import lazy loaded folders",
     "translation": "### 永远不要直接导入惰性加载的目录",
@@ -25529,6 +26089,11 @@
     "translation": "**为何？**直接导入并使用此模块会立即加载它，而原本的设计意图是按需加载它。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Components",
     "translation": "## 组件",
@@ -25554,6 +26119,11 @@
     "translation": "**为何？**保持元素命名与[自定义元素](https://www.w3.org/TR/custom-elements/)命名规范一致。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Components as elements",
     "translation": "### 把组件当做元素",
@@ -25579,6 +26149,11 @@
     "translation": "**为何？**查看组件模板的 HTML 时，更容易识别一个符号是组件还是指令。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Extract templates and styles to their own files",
     "translation": "### 把模板和样式提取到它们自己的文件",
@@ -25629,6 +26204,11 @@
     "translation": "**为何？**`./`前缀是相对URL的标准语法，不必依赖Angular的特殊处理，如果没有前缀则不行。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Decorate _input_ and _output_ properties",
     "translation": "### 内联输入和输出属性装饰器",
@@ -25669,6 +26249,11 @@
     "translation": "**为何？**把装饰器放到同一行可以精简代码，同时更易于识别输入或输出属性。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Avoid aliasing _inputs_ and _outputs_",
     "translation": "### 避免为输入和输出属性指定别名",
@@ -25694,6 +26279,11 @@
     "translation": "**为何？**如果指令名也同时用作*输入*属性，而且指令名无法准确描述这个属性的用途时，应该使用别名。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Member sequence",
     "translation": "### 成员顺序",
@@ -25719,6 +26309,11 @@
     "translation": "**为何？**把类的成员按照统一的顺序排列，易于阅读，能立即识别出组件的哪个成员服务于何种目的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Delegate complex component logic to services",
     "translation": "### 把逻辑放到服务里",
@@ -25759,6 +26354,11 @@
     "translation": "**为何？**保持组件苗条、精简和聚焦。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Don't prefix _output_ properties",
     "translation": "### 不要给输出属性加前缀",
@@ -25789,6 +26389,11 @@
     "translation": "**为何？**Angular 允许[另一种备选语法](guide/template-syntax#binding-syntax) `on-*`。如果事件的名字本身带有前缀`on`，那么绑定的表达式可能是`on-onEvent`。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Put presentation logic in the component class",
     "translation": "### 把表现层逻辑放到组件类里",
@@ -25814,6 +26419,11 @@
     "translation": "**为何？**将组件的表现层逻辑放到组件类而非模板里，可以增强测试性、维护性和重复使用性。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Directives",
     "translation": "## 指令",
@@ -25844,6 +26454,11 @@
     "translation": "**为何？**一个元素可以使用多个属性型指令。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### _HostListener_/_HostBinding_ decorators versus _host_ metadata",
     "translation": "### *HostListener* 和 *HostBinding* 装饰器 vs. 组件元数据 *host*",
@@ -25879,6 +26494,11 @@
     "translation": "**为何？**`host`元数据只是一个便于记忆的名字而已，并不需要额外的 ES 导入。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Services",
     "translation": "## 服务",
@@ -25909,6 +26529,11 @@
     "translation": "**为何？**服务是共享状态性内存数据的理想载体。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Single responsibility",
     "translation": "### 单一职责",
@@ -25939,6 +26564,11 @@
     "translation": "**为何？**当某个服务有多个职责时，每个注入它的组件或服务都会承担这些职责的全部开销。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Providing a service",
     "translation": "### 提供一个服务",
@@ -25959,6 +26589,11 @@
     "translation": "**为何？** Angular 注入器是层次化的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<div class=\"s-why\">",
+    "translation": "**Why?** When providing the service to a top level component, \nthat instance is shared and available to all child components of that top level component.**为何？**在顶层组件提供服务时，该服务实例在所有子组件中可见并共享。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "**Why?** This is ideal when a service is sharing methods or state.",
     "translation": "**为何？**服务是共享方法或状态的理想载体。",
@@ -25969,6 +26604,11 @@
     "translation": "**为何？**当不同的两个组件需要一个服务的不同的实例时，上面的方法这就不理想了。在这种情况下，对于需要崭新和单独服务实例的组件，最好在组件级提供服务。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Use the @Injectable() class decorator",
     "translation": "### 使用 @Injectable() 类装饰器",
@@ -25994,6 +26634,11 @@
     "translation": "**为何？**当服务只接受类型令牌相关的依赖时，比起在每个构造函数参数上使用`@Inject()`，`@Injectable()`的语法简洁多了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Data Services",
     "translation": "## 数据服务",
@@ -26039,6 +26684,11 @@
     "translation": "数据服务应该封装这些细节。这样，在服务内部修改细节，就不会影响到它的消费者。并且更容易通过实现一个模拟服务来对消费者进行测试。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Lifecycle hooks",
     "translation": "## 生命周期钩子",
@@ -26049,6 +26699,11 @@
     "translation": "使用生命周期钩子来介入到 Angular 暴露的重要事件里。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### Implement lifecycle hook interfaces",
     "translation": "### 实现生命周期钩子接口",
@@ -26069,6 +26724,11 @@
     "translation": "**为何？**如果使用强类型的方法签名，编译器和编辑器可以帮你揪出拼写错误。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "## Appendix",
     "translation": "## 附录",
@@ -26079,6 +26739,11 @@
     "translation": "有用的 Angular 工具和小提示",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "#### Style A-01",
     "translation": "#### 风格 A-01",
@@ -26094,6 +26759,11 @@
     "translation": "**考虑**调整 codelyzer 的规则来满足你的需求。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "### File templates and snippets",
     "translation": "### 文档模板和代码片段",
@@ -26129,6 +26799,11 @@
     "translation": "**考虑**使用 [Vim](http://www.vim.org/) 的[代码片断](https://github.com/mhartington/vim-angular2-snippets)来实施本风格指南。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/styleguide.md"
+  },
   {
     "original": "# Template Syntax",
     "translation": "# 模板语法",
@@ -26254,6 +26929,16 @@
     "translation": "赋值 (`=`, `+=`, `-=`, ...)",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
+  {
+    "original": "* chaining expressions with <code>;</code> or <code>,</code>",
+    "translation": "使用`;`或`,`的链式表达式",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators (`++` and `--`)",
     "translation": "自增或自减操作符 (`++`和`--`)",
@@ -26429,6 +27114,11 @@
     "translation": "然而，某些 JavaScript 语法仍然是不允许的：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators, `++` and `--`",
     "translation": "自增和自减运算符：`++`和`--`",
@@ -26559,6 +27249,26 @@
     "translation": "样式",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "One-way",
+    "translation": "单向",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
+  {
+    "original": "from view target",
+    "translation": "从视图目标",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
+  {
+    "original": "to data source",
+    "translation": "到数据源",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
+  {
+    "original": "<div class=\"alert is-important\">",
+    "translation": "译注：由于 HTML attribute 和 DOM property 在中文中都被翻译成了“属性”，无法区分，\n而接下来的部分重点是对它们进行比较。",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "Binding types other than interpolation have a **target name** to the left of the equal sign,\neither surrounded by punctuation (`[]`, `()`) or preceded by a prefix (`bind-`, `on-`, `bindon-`).",
     "translation": "除了插值表达式之外的绑定类型，在等号左边是**目标名**，\n  无论是包在括号中 (`[]`、`()`) 还是用前缀形式 (`bind-`、`on-`、`bindon-`) 。",
@@ -27039,6 +27749,11 @@
     "translation": "插值表达式处理 script 标签与属性绑定有所不同，但是二者都只渲染没有危害的内容。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "<figure>\n  <img src='generated/images/guide/template-syntax/evil-title.png' alt=\"evil title made safe\">\n</figure>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "## Attribute, class, and style bindings",
     "translation": "## attribute、class 和 style 绑定",
@@ -27089,11 +27804,6 @@
     "translation": "会得到这个错误：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
-  {
-    "original": "",
-    "translation": "Template parse errors:\n  Can't bind to 'colspan' since it isn't a known native property\n  （模板解析错误：不能绑定到 'colspan'，因为它不是已知的原生属性）",
-    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
-  },
   {
     "original": "As the message says, the `<td>` element does not have a `colspan` property.\nIt has the \"colspan\" *attribute*, but\ninterpolation and property binding can set only *properties*, not attributes.",
     "translation": "正如提示中所说，`<td>`元素没有`colspan`属性。\n  但是插值表达式和属性绑定只能设置*属性*，不能设置 attribute。",
@@ -27289,6 +27999,11 @@
     "translation": "如果事件属于指令（回想一下，组件是指令的一种），那么`$event`具体是什么由指令决定。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "### Custom events with <span class=\"syntax\">EventEmitter</span>",
+    "translation": "### 使用 <span class=\"syntax\">EventEmitter</span> 实现自定义事件",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "Directives typically raise custom events with an Angular [EventEmitter](api/core/EventEmitter).\nThe directive creates an `EventEmitter` and exposes it as a property.\nThe directive calls `EventEmitter.emit(payload)` to fire an event, passing in a message payload, which can be anything.\nParent directives listen for the event by binding to this property and accessing the payload through the `$event` object.",
     "translation": "通常，指令使用 Angular [EventEmitter](api/core/EventEmitter) 来触发自定义事件。\n指令创建一个`EventEmitter`实例，并且把它作为属性暴露出来。\n指令调用`EventEmitter.emit(payload)`来触发事件，可以传入任何东西作为消息载荷。\n父指令通过绑定到这个属性来监听事件，并通过`$event`对象来访问载荷。",
@@ -27544,6 +28259,11 @@
     "translation": "你既可以在初始化时调用`setCurrentStyles()`，也可以在所依赖的属性变化时调用。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "### NgModel - Two-way binding to form elements with <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "### NgModel - 使用<span class=\"syntax\">[(ngModel)]</span>双向绑定到表单元素",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "When developing data entry forms, you often both display a data property and\nupdate that property when the user makes changes.",
     "translation": "当开发数据输入表单时，我们通常都要既显示数据属性又根据用户的更改去修改那个属性。",
@@ -27569,6 +28289,11 @@
     "translation": "导入`FormsModule`并让`[(ngModel)]`可用的代码如下：",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "#### Inside <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "#### <span class=\"syntax\">[(ngModel)]</span>内幕",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "Looking back at the `name` binding, note that\nyou could have achieved the same result with separate bindings to\nthe `<input>` element's  `value` property and `input` event.",
     "translation": "回头看看`name`绑定，注意，你可以通过分别绑定到`<input>`元素的`value`属性和`input`事件来达到同样的效果。",
@@ -27899,6 +28624,11 @@
     "translation": "有了`trackBy`，则只有修改了`id`的按钮才会触发元素替换。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "<figure >\n  <img src=\"generated/images/guide/template-syntax/ng-for-track-by-anim.gif\" alt=\"trackBy\">\n</figure>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "### The _NgSwitch_ directives",
     "translation": "### `NgSwitch`指令",
@@ -27969,6 +28699,11 @@
     "translation": "我们可以在模板中的任何地方引用模板引用变量。\n比如声明在`<input>`上的`phone`变量就是在模板另一侧的`<button>`上使用的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">How a reference variable gets its value</h3>",
+    "translation": "### 模板引用变量怎么得到它的值？",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "In most cases, Angular sets the reference variable's value to the element on which it was declared.\nIn the previous example, `phone` refers to the _phone number_ `<input>` box.\nThe phone button click handler passes the _input_ value to the component's `callPhone` method.\nBut a directive can change that behavior and set the value to something else, such as itself.\nThe `NgForm` directive does that.",
     "translation": "大多数情况下，Angular会把模板引用变量的值设置为声明它的那个元素。\n在上一个例子中，`phone`引用的是表示*电话号码*的`<input>`框。\n\"拨号\"按钮的点击事件处理器把这个*input*值传给了组件的`callPhone`方法。\n不过，指令也可以修改这种行为，让这个值引用到别处，比如它自身。\n`NgForm`指令就是这么做的。",
@@ -27994,6 +28729,11 @@
     "translation": "原生的`<form>`元素没有`form`属性，但`NgForm`指令有。这就解释了为何当`heroForm.form.valid`是无效时我们可以禁用提交按钮，\n并能把整个表单控件树传给父组件的`onSubmit`方法。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Template reference variable warning notes</h3>",
+    "translation": "<h3 class=\"no-toc\">关于模板引用变量的提醒</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "A template _reference_ variable (`#phone`) is _not_ the same as a template _input_ variable (`let phone`)\nsuch as you might see in an [`*ngFor`](guide/template-syntax#template-input-variable).\nLearn the difference in the [_Structural Directives_](guide/structural-directives#template-input-variable) guide.",
     "translation": "模板*引用*变量 (`#phone`) 和[`*ngFor`](guide/template-syntax#template-input-variable)部分看到过的模板*输入*变量 (`let phone`) 是不同的。\n要了解详情，参见[结构型指令](guide/structural-directives#template-input-variable)一章。",
@@ -28334,6 +29074,11 @@
     "translation": "如果我们打开了严格控制检测，那就要用到这个模板操作符，而其它情况下则是可选的。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
   },
+  {
+    "original": "<a href=\"#top-of-page\">back to top</a>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/template-syntax.md"
+  },
   {
     "original": "## Summary",
     "translation": "## 小结",
@@ -28466,7 +29211,7 @@
   },
   {
     "original": "The [karma test runner](https://karma-runner.github.io/1.0/index.html)\n      is ideal for writing and running unit tests while developing the application.\n      It can be an integral part of the project's development and continuous integration processes.\n      This guide describes how to set up and run tests with karma.",
-    "translation": "[karma测试运行器](https://karma-runner.github.io/1.0/index.html)是在开发应用的过程中\n      编写和运行单元测试的理想工具。\n      它能成为项目开发和连续一体化进程的不可分割的一部分。本章讲述了如何用Karma设置和运行测试程序。",
+    "translation": "[karma测试运行器](https://karma-runner.github.io/1.0/index.html)是在开发应用的过程中\n      编写和运行单元测试的理想工具。\n      它能成为项目开发和连续一体化进程的不可分割的一部分。本章讲述了如何用Karma设置和运行测试程序。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -28805,7 +29550,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
-    "original": "The **`By`** class is an Angular testing utility that produces useful predicates.\nIts `By.css` static method produces a\n<a href=\"https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors\">standard CSS selector</a>\npredicate that filters the same way as a jQuery selector.",
+    "original": "predicate that filters the same way as a jQuery selector.",
     "translation": "**`By`**类是Angular测试工具之一，它生成有用的predicate。\n它的`By.css`静态方法产生<a href=\"https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors\" target=\"_blank\">标准CSS选择器</a>\npredicate，与JQuery选择器相同的方式过滤。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
@@ -28904,6 +29649,11 @@
     "translation": "与其怀疑测试工具会不会执行变更检测，本章中的例子**总是显式**调用`detectChanges()`。\n即使是在不需要的时候，频繁调用`detectChanges()`没有任何什么坏处。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
+  },
   {
     "original": "## Test a component with an external template",
     "translation": "## 测试带有外部模板的组件",
@@ -29039,6 +29789,11 @@
     "translation": "这样做也没坏处，如果你将来可能会把模板重构到独立的文件中去，那就可以调用`compileComponents`。\n不过本章中的这些测试只会在必要时才调用`compileComponents`。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
+  },
   {
     "original": "## Test a component with a dependency",
     "translation": "## 测试有依赖的组件",
@@ -29555,7 +30310,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
-    "original": "The first parameter is the _element-to-click_. If you wish, you can pass a\ncustom event object as the second parameter. The default is a (partial)\n<a href=\"https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button\">left-button mouse event object</a>\naccepted by many handlers including the `RouterLink` directive.",
+    "original": "accepted by many handlers including the `RouterLink` directive.",
     "translation": "第一个参数是**用来点击的元素**。如果你愿意，可以将自定义的事件对象传递给第二个参数。\n默认的是（局部的）<a href=\"https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button\" target=\"_blank\">鼠标左键事件对象</a>，\n它被许多事件处理器接受，包括`RouterLink`指令。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
@@ -29739,6 +30494,11 @@
     "translation": "不要在调用`inject`以后再试图配置`TestBed`。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
+  {
+    "original": "<a href=\"#top\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
+  },
   {
     "original": "### Test a routed component with parameters",
     "translation": "### 测试带有路由和路由参数的组件\nClicking a _Dashboard_ hero triggers navigation to `heroes/:id`, where `:id`\nis a route parameter whose value is the `id` of the hero to edit. \nThat URL matches a route to the `HeroDetailComponent`.",
@@ -29934,6 +30694,11 @@
     "translation": "这里是一些更多的`HeroDetailComponent`测试程序，进一步的展示了这一点。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
+  {
+    "original": "</code-example>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
+  },
   {
     "original": "## Setup with module imports",
     "translation": "## 模块导入imports的配置",
@@ -30656,12 +31421,12 @@
   },
   {
     "original": "Runs the body of a test (`it`) or setup (`beforeEach`) function within a special _async test zone_.\n      See [discussion above](guide/testing#async).",
-    "translation": "在特殊的**async测试区域**运行测试程序（`it`)或者设置（`beforeEach`）的主体。\n      参见[上面的讨论](guide/testing#async).",
+    "translation": "在特殊的**async测试区域**运行测试程序（`it`)或者设置（`beforeEach`）的主体。\n      参见[上面的讨论](guide/testing#async).\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Runs the body of a test (`it`) within a special _fakeAsync test zone_, enabling\n      a linear control flow coding style. See [discussion above](guide/testing#fake-async).",
-    "translation": "在特殊的**fakeAsync测试区域**运行测试程序（`it`）的主体，造就控制流更加线性的代码风格。\n      参见[上面的讨论](guide/testing#fake-async).",
+    "translation": "在特殊的**fakeAsync测试区域**运行测试程序（`it`）的主体，造就控制流更加线性的代码风格。\n      参见[上面的讨论](guide/testing#fake-async).\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30781,27 +31546,27 @@
   },
   {
     "original": "Create an instance of a component of type `T` based on the current `TestBed` configuration.\n      After calling `compileComponent`, the `TestBed` configuration is frozen for the duration of the current spec.",
-    "translation": "基于当前`TestBed`的配置创建一个类型为T的组件实例。\n      一旦调用，`TestBed`的配置就会在当前测试期间被冻结。",
+    "translation": "基于当前`TestBed`的配置创建一个类型为T的组件实例。\n      一旦调用，`TestBed`的配置就会在当前测试期间被冻结。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given `NgModule`. Recall that modules can import other modules.\n      The `overrideModule` method can reach deeply into the current testing module to\n      modify one of these inner modules.",
-    "translation": "替换指定的`NgModule`的元数据。回想一下，模块可以导入其他模块。\n      `overrideModule`方法可以深入到当前测试模块深处，修改其中一个内部模块。",
+    "translation": "替换指定的`NgModule`的元数据。回想一下，模块可以导入其他模块。\n      `overrideModule`方法可以深入到当前测试模块深处，修改其中一个内部模块。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given component class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定组件类的元数据，该组件类可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定组件类的元数据，该组件类可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given directive class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定指令类的元数据，该指令可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定指令类的元数据，该指令可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given pipe class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定管道类的元数据，该管道可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定管道类的元数据，该管道可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30841,7 +31606,7 @@
   },
   {
     "original": "Specify the Angular compiler factory, a `PlatformRef`, and a default Angular testing module.\n      Alternatives for non-browser platforms are available in the general form\n      `@angular/platform-<platform_name>/testing/<platform_name>`.",
-    "translation": "指定Angular编译器工厂，`PlatformRef`，和默认Angular测试模块。\n      以`@angular/platform-<platform_name>/testing/<platform_name>`的形式提供非浏览器平台的替代品。",
+    "translation": "指定Angular编译器工厂，`PlatformRef`，和默认Angular测试模块。\n      以`@angular/platform-<platform_name>/testing/<platform_name>`的形式提供非浏览器平台的替代品。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30891,7 +31656,7 @@
   },
   {
     "original": "The instance of the component class created by `TestBed.createComponent`.",
-    "translation": "被`TestBed.createComponent`创建的组件类实例。",
+    "translation": "被`TestBed.createComponent`创建的组件类实例。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30901,12 +31666,12 @@
   },
   {
     "original": "The `debugElement` provides insight into the component and its DOM element during test and debugging.\n      It's a critical property for testers. The most interesting members are covered [below](guide/testing#debug-element-details).",
-    "translation": "`debugElement`在测试和调试期间，提供对组件及其DOM元素的访问。\n      它是测试者至关重要的属性。它最有用的成员在[下面](guide/testing#debug-element-details)有所介绍。",
+    "translation": "`debugElement`在测试和调试期间，提供对组件及其DOM元素的访问。\n      它是测试者至关重要的属性。它最有用的成员在[下面](guide/testing#debug-element-details)有所介绍。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "The native DOM element at the root of the component.",
-    "translation": "组件的原生根DOM元素。",
+    "translation": "组件的原生根DOM元素。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30956,7 +31721,7 @@
   },
   {
     "original": "Runs `checkNoChanges`afterwards to confirm that there are no circular updates unless\n      called as `detectChanges(false)`;",
-    "translation": "之后，运行`checkNoChanges`，来确认没有循环更新，除非它被这样调用：`detectChanges(false)`。",
+    "translation": "之后，运行`checkNoChanges`，来确认没有循环更新，除非它被这样调用：`detectChanges(false)`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30976,12 +31741,12 @@
   },
   {
     "original": "Do a change detection run to make sure there are no pending changes.\n      Throws an exceptions if there are.",
-    "translation": "运行一次变更检测来确认没有待处理的变化。如果有未处理的变化，它将抛出一个错误。",
+    "translation": "运行一次变更检测来确认没有待处理的变化。如果有未处理的变化，它将抛出一个错误。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "If the fixture is currently _stable_, returns `true`.\n      If there are async tasks that have not completed, returns `false`.",
-    "translation": "如果fixture当前是**稳定的**，则返回`true`。\n      如果有异步任务没有完成，则返回`false`。",
+    "translation": "如果fixture当前是**稳定的**，则返回`true`。\n      如果有异步任务没有完成，则返回`false`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -30991,7 +31756,7 @@
   },
   {
     "original": "To resume testing after completion of asynchronous activity or\n      asynchronous change detection, hook that promise.\n      See [above](guide/testing#when-stable).",
-    "translation": "钩住这个承诺，以在异步行为或者异步变更检测之后继续测试。参见[上面](guide/testing#when-stable)。",
+    "translation": "钩住这个承诺，以在异步行为或者异步变更检测之后继续测试。参见[上面](guide/testing#when-stable)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -31031,27 +31796,27 @@
   },
   {
     "original": "The corresponding DOM element in the browser (null for WebWorkers).",
-    "translation": "与浏览器中DOM元素对应（WebWorkers时，值为null）。",
+    "translation": "与浏览器中DOM元素对应（WebWorkers时，值为null）。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Calling `query(predicate: Predicate<DebugElement>)` returns the first `DebugElement`\n      that matches the [predicate](guide/testing#query-predicate) at any depth in the subtree.",
-    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中第一个匹配[predicate](guide/testing#query-predicate)的`DebugElement`。",
+    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中第一个匹配[predicate](guide/testing#query-predicate)的`DebugElement`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "Calling `queryAll(predicate: Predicate<DebugElement>)` returns all `DebugElements`\n      that matches the [predicate](guide/testing#query-predicate) at any depth in subtree.",
-    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中所有匹配[predicate](guide/testing#query-predicate)`DebugElement`。",
+    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中所有匹配[predicate](guide/testing#query-predicate)`DebugElement`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "The host dependency injector.\n      For example, the root element's component instance injector.",
-    "translation": "宿主依赖注入器。\n      比如，根元素的组件实例注入器。",
+    "translation": "宿主依赖注入器。\n      比如，根元素的组件实例注入器。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
     "original": "The element's own component instance, if it has one.",
-    "translation": "元素自己的组件实例（如果有）。",
+    "translation": "元素自己的组件实例（如果有）。  \n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -31061,7 +31826,7 @@
   },
   {
     "original": "When an element is repeated within `*ngFor`, the context is an `NgForRow` whose `$implicit`\n      property is the value of the row instance value.\n      For example, the `hero` in `*ngFor=\"let hero of heroes\"`.",
-    "translation": "当一个元素被`*ngFor`重复，它的上下文为`NgForRow`，它的`$implicit`属性值是该行的实例值。\n      比如，`*ngFor=\"let hero of heroes\"`里的`hero`。",
+    "translation": "当一个元素被`*ngFor`重复，它的上下文为`NgForRow`，它的`$implicit`属性值是该行的实例值。\n      比如，`*ngFor=\"let hero of heroes\"`里的`hero`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -31096,7 +31861,7 @@
   },
   {
     "original": "This component's injector lookup tokens.\n      Includes the component itself plus the tokens that the component lists in its `providers` metadata.",
-    "translation": "组件注入器的查询令牌。\n      包括组件自己的令牌和组件的`providers`元数据中列出来的令牌。",
+    "translation": "组件注入器的查询令牌。\n      包括组件自己的令牌和组件的`providers`元数据中列出来的令牌。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -31186,7 +31951,7 @@
   },
   {
     "original": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)\n      loads the application and test files.\n      This script tells SystemJS where to find those files and how to load them.\n      It's the same version of `systemjs.config.js` you installed during [setup](guide/testing#setup).",
-    "translation": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)加载应用文件和测试文件。\n      这个脚本告诉SystemJS到哪里去找那些文件，以及如何加载它们。\n      它和你在[环境设置](guide/testing#setup)期间安装的那个`systemjs.config.js`是同一个版本。",
+    "translation": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)加载应用文件和测试文件。\n      这个脚本告诉SystemJS到哪里去找那些文件，以及如何加载它们。\n      它和你在[环境设置](guide/testing#setup)期间安装的那个`systemjs.config.js`是同一个版本。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -31201,7 +31966,7 @@
   },
   {
     "original": "The sample version for this guide adds the **model barrel**\n      to the SystemJs `packages` configuration.",
-    "translation": "本章的例子中把**模型桶（barrel）*添加到了SystemJS的`packages`配置中。",
+    "translation": "本章的例子中把**模型桶（barrel）*添加到了SystemJS的`packages`配置中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/testing.md"
   },
   {
@@ -32570,7 +33335,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
   {
-    "original": "`@types/angular` is declared as a UMD module, and due to the way\n<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\">UMD typings</a>\nwork, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
+    "original": "work, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
     "translation": "`@types/angular`声明为UMD模块，根据<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\" target=\"_blank\">UMD类型</a>\n的工作方式，一旦你在文件中有一条ES6的`import`语句，所有的UMD类型化的模型必须都通过`import`语句导入，\n而是不是全局可用。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
@@ -33081,22 +33846,22 @@
   },
   {
     "original": "The repeater matcher relies on AngularJS `ng-repeat`",
-    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`",
+    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
   {
     "original": "The repeater matcher relies on AngularJS `ng-repeat`",
-    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`",
+    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
   {
     "original": "The model matcher relies on AngularJS `ng-model`",
-    "translation": "model匹配器依赖于AngularJS中的`ng-model`",
+    "translation": "model匹配器依赖于AngularJS中的`ng-model`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
   {
     "original": "The model matcher relies on AngularJS `ng-model`",
-    "translation": "model匹配器依赖于AngularJS中的`ng-model`",
+    "translation": "model匹配器依赖于AngularJS中的`ng-model`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/upgrade.md"
   },
   {
@@ -33206,7 +33971,7 @@
   },
   {
     "original": "Run the <live-example></live-example>.",
-    "translation": "运行",
+    "translation": "运行<live-example></live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/user-input.md"
   },
   {
@@ -33376,7 +34141,7 @@
   },
   {
     "original": "A nice aspect of this approach is that the component gets clean data values from the view.\nIt no longer requires knowledge of the `$event` and its structure.",
-    "translation": "这个方法最漂亮的一点是：组件代码从视图中获得了干净的数据值。再也不用了解`$event`变量及其结构了。\n{@a key-event}",
+    "translation": "这个方法最漂亮的一点是：组件代码从视图中获得了干净的数据值。再也不用了解`$event`变量及其结构了。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/user-input.md"
   },
   {
@@ -33514,6 +34279,11 @@
     "translation": "如果你希望使用**ASP.NET Core**并体验全新项目，\n    参见_预览版_<a href=\"http://blog.stevensanderson.com/2016/10/04/angular2-template-for-visual-studio/\" target=\"_blank\">ASP.NET Core + Angular template for Visual Studio 2015</a>。 \n    注意，最终代码与本文不对应，请适当调节。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq1'>\nPrerequisite: Node.js\n</h2>",
+    "translation": "<h2 id='prereq1'>\n前提条件: Node.js\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "Install **[Node.js® and npm](https://nodejs.org/en/download/)**\nif they are not already on your machine.",
     "translation": "如果你的电脑里没有Node.js®和npm，请安装**[它们](https://nodejs.org/en/download/)**。",
@@ -33524,6 +34294,11 @@
     "translation": "在终端或者控制台中运行`node -v`和`npm -v`，**请确认你的Node版本为`4.6.x`或更高，npm的版本为`3.x.x`或更高**。老版本会引起错误。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq2'>\nPrerequisite: Visual Studio 2015 Update 3\n</h2>",
+    "translation": "<h2 id='prereq2'>\n前提条件: Visual Studio 2015 Update 3\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "The minimum requirement for developing Angular applications with Visual Studio is Update 3.\nEarlier versions do not follow the best practices for developing applications with TypeScript.\nTo view your version of Visual Studio 2015, go to `Help | About Visual Studio`.",
     "translation": "使用Visual Studio开发Angular应用程序的最低要求是Update 3。\n早期版本没有遵循使用TypeScript开发应用程序的最佳实践。\n要查看你的Visual Studio 2015版本号，到`Help | About Visual Studio`。",
@@ -33534,6 +34309,11 @@
     "translation": "如果还没有，安装**[Visual Studio 2015 Update 3](https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs)**。或者使用`Tools | Extensions and Updates`来直接在Visual Studio 2015中更新到Update 3。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq3'>\nPrerequisite: Configure External Web tools\n</h2>",
+    "translation": "<h2 id='prereq3'>\n前提条件: 配置External Web tools\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "Configure Visual Studio to use the global external web tools instead of the tools that ship with Visual Studio:",
     "translation": "配置Visual Studio来使用全局External Web Tools，而非Visual Studio默认的工具：",
@@ -33569,6 +34349,11 @@
     "translation": "Visual Studio将优先在当前的工作区查找外部工具，如果没有找到，便查找全局路径，如果还没有找到，Visual Studio就使用自带的工具版本。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq4'>\nPrerequisite: Install TypeScript 2.2 for Visual Studio 2015\n</h2>",
+    "translation": "<h2 id='prereq4'>\n前提条件: 安装TypeScript 2.2 for Visual Studio 2015\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "While Visual Studio Update 3 ships with TypeScript support out of the box, it currently doesn’t ship with TypeScript 2.2, \nwhich you need to develop Angular applications.",
     "translation": "Visual Studio Update 3自带TypeScript支持，但是它的TypeScript版本开发Angular应用需要的不是2.2。",
@@ -33599,11 +34384,21 @@
     "translation": "至此，Visual Studio准备好了。重新启动Visual Stuido，这样我们可以有一个崭新的开始。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='download'>\nStep 1: Download the QuickStart files\n</h2>",
+    "translation": "<h2 id='download'>\n第一步: 现在“快速上手”文件\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "[Download the QuickStart source](https://github.com/angular/quickstart)\nfrom GitHub. If you downloaded as a zip file, extract the files.",
     "translation": "从GitHub[下载“快速上手”的源代码](https://github.com/angular/quickstart)。如果下载的是一个压缩的zip文件，解压它。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='create-project'>\nStep 2: Create the Visual Studio ASP.NET project\n</h2>",
+    "translation": "<h2 id='create-project'>\n第二步：创建Visual Studio ASP.net项目\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "Create the ASP.NET 4.x project in the usual way as follows:",
     "translation": "按照下列步骤创建ASP.NET 4.x项目：",
@@ -33634,6 +34429,11 @@
     "translation": "本烹饪宝典选择了`Empty`模板，它没有添加过任何目录，没有身份验证，没有服务器托管。为你的项目选择合适的模板和选项。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='copy'>\n  Step 3: Copy the QuickStart files into the ASP.NET project folder\n</h2>",
+    "translation": "<h2 id='copy'>\n  第三步: 把“快速上手”的文件复制到ASP.NET项目所在的目录\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "Copy the QuickStart files you downloaded from GitHub into the folder containing the `.csproj` file.\nInclude the files in the Visual Studio project as follows:",
     "translation": "拷贝从GitHub下载的“快速上手”文件到包含`.csproj`文件的目录中。按照下面的步骤把它们加到Visual Studio中：",
@@ -33654,6 +34454,11 @@
     "translation": "src/app目录（如果询问是否要搜索TypeScript类型，回答*No*）",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='restore'> Step 4: Restore the required packages </h2>",
+    "translation": "<h2 id='restore'> 第四步: 恢复需要的包 </h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "Restore the packages required for an Angular application as follows:",
     "translation": "按下面的步骤恢复Angular应用程序需要的包：",
@@ -33689,6 +34494,11 @@
     "translation": "**不要**将`node_modules`目录添加到项目中，让它隐藏。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='build-and-run'>\n  Step 5: Build and run the app\n</h2>",
+    "translation": "<h2 id='build-and-run'>\n  第五步：构建和运行应用\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/visual-studio-2015.md"
+  },
   {
     "original": "First, ensure that `src/index.html` is set as the start page.\nRight-click `index.html` in Solution Explorer and select option `Set As Start Page`.",
     "translation": "首先，确认`src/index.html`已被设置为开始页面。\n  在Solution Explorer中，右键点击`index.html`，选择选项`Set As Start Page`。",
@@ -34454,6 +35264,11 @@
     "translation": "这里又是TypeScript的入口点文件，它定义了`polyfills`和`vendor`这两个包。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/webpack.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Highlights</h3>",
+    "translation": "### 重点：",
+    "sourceFile": "/Users/twer/private/GDE/content-1/guide/webpack.md"
+  },
   {
     "original": "* There are no `<script>` or `<link>` tags in the `index.html`. \nThe `HtmlWebpackPlugin` inserts them dynamically at runtime.",
     "translation": "在`index.html`中没有&lt;script&gt;或&lt;link&gt;标签。\n  `HtmlWebpackPlugin`会在运行时动态插入它们。",
@@ -34471,7 +35286,7 @@
   },
   {
     "original": "* The `vendor.ts` consists of vendor dependency `import` statements that drive the `vendor.js` bundle.\n  The application imports these modules too; they'd be duplicated in the `app.js` bundle\n  if the `CommonsChunkPlugin` hadn't detected the overlap and removed them from `app.js`.",
-    "translation": "`vendor.ts`由`import`提供商依赖的语句组成，它最终决定了`vender.js`的内容。\n  本应用也导入这些模块，如果没有`CommonsChunkPlugin`插件检测出这种重叠，并且把它们从`app.js`中移除，它们就会同时出现在`app.js`包中。\n{@a conclusion}",
+    "translation": "`vendor.ts`由`import`提供商依赖的语句组成，它最终决定了`vender.js`的内容。\n  本应用也导入这些模块，如果没有`CommonsChunkPlugin`插件检测出这种重叠，并且把它们从`app.js`中移除，它们就会同时出现在`app.js`包中。",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/webpack.md"
   },
   {
@@ -34494,11 +35309,41 @@
     "translation": "[回到顶部](guide/webpack#top)",
     "sourceFile": "/Users/twer/private/GDE/content-1/guide/webpack.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">What is Angular?</h1>",
+    "translation": "<h1 class=\"no-toc\">什么是 Angular？</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
   {
     "original": "Angular is a platform that makes it easy to build applications with the web. Angular combines declarative templates, dependency injection, end to end tooling, and integrated best practices to solve development challenges. Angular empowers developers to build applications that live on the web, mobile, or the desktop",
     "translation": "Angular 是一个开发平台。它能帮你更轻松的构建 Web 应用。Angular 集声明式模板、依赖注入、端到端工具和一些最佳实践于一身，为你解决开发方面的各种挑战。Angular 为开发者提升构建 Web、手机或桌面应用的能力。",
     "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
   },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "体验 Angular",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
+  {
+    "original": "</a>",
+    "translation": "<a href=\"guide/quickstart\" class=\"docs-card\" title=\"Angular 快速上手\">\n      <section>开始使用 Angular</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "快速上手",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
+  {
+    "original": "</a>",
+    "translation": "<a href=\"guide/architecture\" class=\"docs-card\" title=\"Angular 架构\">\n      <section>基本原理</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "架构",
+    "sourceFile": "/Users/twer/private/GDE/content-1/marketing/docs.md"
+  },
   {
     "original": "## Assumptions",
     "translation": "## 基本假设",
@@ -34615,7 +35460,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/index.md"
   },
   {
-    "original": "You'll use built-in directives to show and hide elements and display lists of hero data.\nYou'll create components to display hero details and show an array of heroes.\nYou'll use one-way data binding for read-only data. You'll add editable fields to update a model\nwith two-way data binding. You'll bind component methods to user events, like keystrokes and clicks.\nYou'll enable users to select a hero from a master list and edit that hero in the details view. You'll\nformat data with pipes. You'll create a shared service to assemble the heroes.\nAnd you'll use routing to navigate among different views and their components.\n<!-- CF: Should this be a bullet list? -->",
+    "original": "<!-- CF: Should this be a bullet list? -->",
     "translation": "我们将使用内置指令来显示 / 隐藏元素，并且显示英雄数据的列表。\n  我们将创建组件来显示英雄的详情和英雄列表。\n  我们将对只读数据使用单向数据绑定。我们将添加一些可编辑字段，并通过双向数据绑定更新模型。\n  我们将把组件上的方法绑定到用户事件上，比如按键和点击。\n  我们将让用户能从主列表视图中选择一个英雄，然后在详情视图中编辑它。\n  我们将通过管道对数据进行格式化。\n  我们将创建一个共享服务来管理我们的英雄们。\n  我们将使用路由在不同的视图及其组件之间进行导航。",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/index.md"
   },
@@ -34694,6 +35539,11 @@
     "translation": "现在就开始构建一个简单的[英雄编辑器](tutorial/toh-pt1 \"英雄编辑器\")吧！",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/index.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "### 阅读指南（译者）",
+    "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt1.md"
+  },
   {
     "original": "## Setup to develop locally",
     "translation": "## 为本地开发搭建环境",
@@ -35859,11 +36709,6 @@
     "translation": "*注入器*还不知道该如何创建`HeroService`。\n如果现在运行我们的代码，Angular 就会失败，并报错：",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt4.md"
   },
-  {
-    "original": "",
-    "translation": "EXCEPTION: No provider for HeroService! (AppComponent -> HeroService)\n  (异常：没有 HeroService 的提供商！(AppComponent -> HeroService))",
-    "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt4.md"
-  },
   {
     "original": "To teach the injector how to make a `HeroService`,\nadd the following `providers` array property to the bottom of the component metadata\nin the `@Component` call.",
     "translation": "我们还得注册一个`HeroService`**提供商**，来告诉*注入器*如何创建`HeroService`。\n要做到这一点，我们在`@Component`组件的元数据底部添加`providers`数组属性如下：",
@@ -35941,7 +36786,7 @@
   },
   {
     "original": "The app should run as expected, showing a list of heroes and a hero detail view\nwhen you click on a hero name.",
-    "translation": "我们的应用将会像期望的那样运行，显示英雄列表，并且在我们点击英雄的名字时，显示英雄的详情。\n{@a async}",
+    "translation": "我们的应用将会像期望的那样运行，显示英雄列表，并且在我们点击英雄的名字时，显示英雄的详情。",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt4.md"
   },
   {
@@ -36364,6 +37209,11 @@
     "translation": "我们的第一个草稿版就像这样：",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt5.md"
   },
+  {
+    "original": "Remove <i>HeroService</i> from the <i>HeroesComponent</i> providers",
+    "translation": "从<i>HeroesComponent</i>的<code>providers</code>中移除<i>HeroService</i>",
+    "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt5.md"
+  },
   {
     "original": "Go back to the `HeroesComponent` and **remove the `HeroService`** from its `providers` array.\nWe are *promoting* this service from the `HeroesComponent` to the root `NgModule`.\nWe ***do not want two copies*** of this service at two different levels of our app.",
     "translation": "回到`HeroesComponent`，并从`providers`数组中**移除`HeroService`**。\n把它从`HeroesComponent`*提升*到根`NgModule`中。\n我们不希望在应用的两个不同层次上存在它的***两个副本***。",
@@ -37995,7 +38845,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt6.md"
   },
   {
-    "original": "and add it to the `declarations` array.",
+    "original": "Finally, import `HeroSearchComponent` from\n<code>hero-search.component.ts</code>\nand add it to the `declarations` array.",
     "translation": "最后，从<span ngio-ex>hero-search.component.ts</span>中导入`HeroSearchComponent`并将其添加到`declarations`数组中。",
     "sourceFile": "/Users/twer/private/GDE/content-1/tutorial/toh-pt6.md"
   },
diff --git a/aio/tools/translator/dict-2.json b/aio/tools/translator/dict-2.json
index 7545b8768e..770dd0f8c4 100644
--- a/aio/tools/translator/dict-2.json
+++ b/aio/tools/translator/dict-2.json
@@ -121,7 +121,7 @@
   },
   {
     "original": "For more information, see [Filters/pipes](guide/ajs-quick-reference#filters-pipes) below.",
-    "translation": "请参见下面[过滤器/管道](guide/ajs-quick-reference#filters-pipes)了解更多信息。",
+    "translation": "请参见下面[过滤器/管道](guide/ajs-quick-reference#filters-pipes)了解更多信息。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -146,7 +146,7 @@
   },
   {
     "original": "For more information, see the [ngFor micro-syntax](guide/template-syntax#microsyntax)\n      section of the [Template Syntax](guide/template-syntax) page.",
-    "translation": "要了解更多信息，请参见[模板语法](guide/template-syntax)中的[ngFor微语法](guide/template-syntax#microsyntax)部分。",
+    "translation": "要了解更多信息，请参见[模板语法](guide/template-syntax)中的[ngFor微语法](guide/template-syntax#microsyntax)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -309,14 +309,9 @@
     "translation": "`ng-href`指令允许AngularJS对`href`属性进行预处理，以便它能在浏览器获取那个URL之前，使用一个返回适当URL的绑定表达式替换它。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
-  {
-    "original": "In AngularJS, the `ng-href` is often used to activate a route as part of navigation.",
-    "translation": "在AngularJS 中，`ng-href`通常用来作为导航的一部分，激活一个路由。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
-  },
   {
     "original": "Routing is handled differently in Angular.",
-    "translation": "路由在Angular中的处理方式不同。",
+    "translation": "路由在Angular中的处理方式不同。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -351,7 +346,7 @@
   },
   {
     "original": "In this example, the `<table>` element is removed from the DOM unless the `movies` array has a length greater than zero.",
-    "translation": "在这个例子中，除非`movies`数组的长度大于0，否则`<table>`元素就会被从DOM中移除。",
+    "translation": "在这个例子中，除非`movies`数组的长度大于0，否则`<table>`元素就会被从DOM中移除。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -391,7 +386,7 @@
   },
   {
     "original": "In this example, the table row (`<tr>`) element repeats for each movie object in the collection of movies.",
-    "translation": "在这个例子中，对`movies`集合中的每一个`movie`对象重复渲染了这个表格行元素(`<tr>`)。",
+    "translation": "在这个例子中，对`movies`集合中的每一个`movie`对象重复渲染了这个表格行元素(`<tr>`)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -406,7 +401,7 @@
   },
   {
     "original": "For more information, see [Structural Directives](guide/structural-directives).",
-    "translation": "要了解更多信息，参见[结构性指令](guide/structural-directives)。",
+    "translation": "要了解更多信息，参见[结构性指令](guide/structural-directives)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -416,7 +411,7 @@
   },
   {
     "original": "In this example, the `<div>` element is shown if the `favoriteHero` variable is truthy.",
-    "translation": "在这个例子中，如果`favoriteHero`变量为真，`<div>`元素就会显示出来。",
+    "translation": "在这个例子中，如果`favoriteHero`变量为真，`<div>`元素就会显示出来。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -546,7 +541,7 @@
   },
   {
     "original": "The Angular `currency` pipe is similar although some of the parameters have changed.",
-    "translation": "Angular的`currency`管道和1中很相似，只是有些参数变化了。",
+    "translation": "Angular的`currency`管道和1中很相似，只是有些参数变化了。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -576,17 +571,17 @@
   },
   {
     "original": "The Angular `json` pipe does the same thing.",
-    "translation": "Angular的`json`管道做完全相同的事。",
+    "translation": "Angular的`json`管道做完全相同的事。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
     "original": "Selects up to the first parameter (2) number of items from the collection\n      starting (optionally) at the beginning index (0).",
-    "translation": "从集合中选择从(第二参数指定的)起始索引号(0)开始的最多(第一参数指定的)条目数(2)个条目。",
+    "translation": "从集合中选择从(第二参数指定的)起始索引号(0)开始的最多(第一参数指定的)条目数(2)个条目。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
     "original": "The `SlicePipe` does the same thing but the *order of the parameters is reversed*, in keeping\n      with the JavaScript `Slice` method.\n      The first parameter is the starting index; the second is the limit.\n      As in AngularJS, coding this operation within the component instead could improve performance.",
-    "translation": "`SlicePipe`做同样的事，但是*两个参数的顺序是相反的*，以便于JavaScript中的`slice`方法保持一致。\n      第一个参数是起始索引号，第二个参数是限制的数量。\n      和AngularJS中一样，如果们改用组件中的代码实现此操作，性能将会提升。",
+    "translation": "`SlicePipe`做同样的事，但是*两个参数的顺序是相反的*，以便于JavaScript中的`slice`方法保持一致。\n      第一个参数是起始索引号，第二个参数是限制的数量。\n      和AngularJS中一样，如果们改用组件中的代码实现此操作，性能将会提升。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -596,7 +591,7 @@
   },
   {
     "original": "The Angular `lowercase` pipe does the same thing.",
-    "translation": "Angular的`lowercase`管道和1中的功能完全相同。",
+    "translation": "Angular的`lowercase`管道和1中的功能完全相同。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -611,12 +606,12 @@
   },
   {
     "original": "Angular also has a `percent` pipe, which formats a number as a local percentage\n      as shown in the third example.",
-    "translation": "Angular还有一个`percent`管道，它把一个数组格式化为本地化的(local)百分比格式，如第三个范例所示。",
+    "translation": "Angular还有一个`percent`管道，它把一个数组格式化为本地化的(local)百分比格式，如第三个范例所示。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
     "original": "Displays the collection in the order specified by the expression.\n      In this example, the movie title orders the `movieList`.",
-    "translation": "使用表达式中所指定的方式对集合进行排序。\n      在这个例子中，`movieList`被根据movie的title排序了。",
+    "translation": "使用表达式中所指定的方式对集合进行排序。\n      在这个例子中，`movieList`被根据movie的title排序了。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -671,7 +666,7 @@
   },
   {
     "original": "In AngularJS, an Angular module keeps track of controllers, services, and other code.\n      The second argument defines the list of other modules that this module depends upon.",
-    "translation": "在AngularJS中，Angular模块用来对控制器、服务和其它代码进行跟踪。第二个参数定义该模块依赖的其它模块列表。",
+    "translation": "在AngularJS中，Angular模块用来对控制器、服务和其它代码进行跟踪。第二个参数定义该模块依赖的其它模块列表。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -736,7 +731,7 @@
   },
   {
     "original": "In AngularJS, you write the code for the model and methods in a controller function.",
-    "translation": "在Angular1中，我们在控制器函数中写模型和方法的代码。",
+    "translation": "在Angular1中，我们在控制器函数中写模型和方法的代码。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -756,7 +751,7 @@
   },
   {
     "original": "For more information, see the [Components](guide/architecture#components)\n      section of the [Architecture Overview](guide/architecture) page.",
-    "translation": "要了解关于组件的更多信息，参见[架构概览](guide/architecture)中的[组件](guide/architecture#components)部分。",
+    "translation": "要了解关于组件的更多信息，参见[架构概览](guide/architecture)中的[组件](guide/architecture#components)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -786,7 +781,7 @@
   },
   {
     "original": "For more information, see the [Dependency injection](guide/architecture#dependency-injection)\n      section of the [Architecture Overview](guide/architecture).",
-    "translation": "要了解关于依赖注入的更多信息，参见[架构概览](guide/architecture)中的[依赖注入](guide/architecture#dependency-injection)部分。",
+    "translation": "要了解关于依赖注入的更多信息，参见[架构概览](guide/architecture)中的[依赖注入](guide/architecture#dependency-injection)部分。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -801,7 +796,7 @@
   },
   {
     "original": "AngularJS, uses a `link` tag in the head section of the `index.html` file\n      to define the styles for the application.",
-    "translation": "在AngularJS中，我们在`index.html`的`head`区使用`link`标签来为应用程序定义样式。",
+    "translation": "在AngularJS中，我们在`index.html`的`head`区使用`link`标签来为应用程序定义样式。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ajs-quick-reference.md"
   },
   {
@@ -1269,11 +1264,21 @@
     "translation": "本章描述了如何使用 AOT 编译器，以及如何书写能被 AOT 编译的 Angular 元数据。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/aot-compiler.md"
   },
+  {
+    "original": "<a href=\"https://www.youtube.com/watch?v=kW9cJsvcsGo\">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.",
+    "translation": "<a href=\"https://www.youtube.com/watch?v=kW9cJsvcsGo\">观看 Angular 编译器的作者Tobias Bosch 在 AngularConnect 2016 上对编译器的解释。</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/aot-compiler.md"
+  },
   {
     "original": "## Angular compilation",
     "translation": "## 概览",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/aot-compiler.md"
   },
+  {
+    "original": "<code-example language=\"sh\" class=\"code-shell\">\n  ng build --aot\n  ng serve --aot\n</code-example>",
+    "translation": "Angular应用主要包含组件和它们的HTML模板。\n在浏览器可以渲染应用之前，组件和模板必须要被**Angular编译器**转换为可以执行的JavaScript。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/aot-compiler.md"
+  },
   {
     "original": "See the [CLI documentation](https://github.com/angular/angular-cli/wiki) for details, especially the [`build` topic](https://github.com/angular/angular-cli/wiki/build).",
     "translation": "要了解更多，请参见[CLI 文档](https://github.com/angular/angular-cli/wiki)，特别是[`build` 这个主题](https://github.com/angular/angular-cli/wiki/build)。",
@@ -1584,6 +1589,11 @@
     "translation": "JavaScript 中，每个_文件_是一个模块，文件中定义的所有对象都从属于那个模块。\n通过`export`关键字，模块可以把它的某些对象声明为公共的。\n其它 JavaScript 模块可以使用*import 语句*来访问这些公共对象。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "<a href=\"http://exploringjs.com/es6/ch_modules.html\" >Learn more about the JavaScript module system on the web.</a>\n<a href=\"http://exploringjs.com/es6/ch_modules.html\" target=\"_blank\">学习更多关于 JavaScript 模块的知识。</a>\n</div>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
+  },
   {
     "original": "These are two different and _complementary_ module systems. Use them both to write your apps.",
     "translation": "这两个模块化系统是互补的，我们在写程序时都会用到。",
@@ -1629,6 +1639,11 @@
     "translation": "这两个系统比较容易混淆，因为它们共享相同的词汇 “imports” 和 “exports”。不过没关系，先放一放，随着时间和经验的增长，自然就清楚了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "Learn more from the [NgModules](guide/ngmodule) page.\n更多信息，见 [Angular 模块](guide/ngmodule)。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
+  },
   {
     "original": "## Components",
     "translation": "## 组件",
@@ -1715,8 +1730,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
   {
-    "original": "Metadata tells Angular how to process a class.",
-    "translation": "<p style=\"padding-top:10px\">元数据告诉 Angular 如何处理一个类。</p>",
+    "original": "<p style=\"padding-top:10px\">",
+    "translation": "元数据告诉 Angular 如何处理一个类。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
   {
@@ -1796,7 +1811,7 @@
   },
   {
     "original": "Angular supports **data binding**,\na mechanism for coordinating parts of a template with parts of a component.\nAdd binding markup to the template HTML to tell Angular how to connect both sides.",
-    "translation": "Angular 支持**数据绑定**，一种让模板的各部分与组件的各部分相互合作的机制。\n我们往模板 HTML 中添加绑定标记，来告诉 Angular 如何把二者联系起来。As the diagram shows, there are four forms of data binding syntax. Each form has a direction &mdash; to the DOM, from the DOM, or in both directions.如图所示，数据绑定的语法有四种形式。每种形式都有一个方向 —— 绑定到 DOM 、绑定自 DOM 以及双向绑定。",
+    "translation": "Angular 支持**数据绑定**，一种让模板的各部分与组件的各部分相互合作的机制。\n我们往模板 HTML 中添加绑定标记，来告诉 Angular 如何把二者联系起来。As the diagram shows, there are four forms of data binding syntax. Each form has a direction &mdash; to the DOM, from the DOM, or in both directions.如图所示，数据绑定的语法有四种形式。每种形式都有一个方向 —— 绑定到 DOM 、绑定自 DOM 以及双向绑定。<br class=\"clear\">",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
   {
@@ -1836,7 +1851,7 @@
   },
   {
     "original": "Data binding plays an important role in communication between a template and its component.",
-    "translation": "数据绑定在模板与对应组件的交互中扮演了重要的角色。",
+    "translation": "数据绑定在模板与对应组件的交互中扮演了重要的角色。\n<br class=\"l-clear-both\">",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
   {
@@ -2011,7 +2026,7 @@
   },
   {
     "original": "_Dependency injection_ is a way to supply a new instance of a class\nwith the fully-formed dependencies it requires. Most dependencies are services.\nAngular uses dependency injection to provide new components with the services they need.",
-    "translation": "“依赖注入”是提供类的新实例的一种方式，还负责处理好类所需的全部依赖。大多数依赖都是服务。\nAngular 使用依赖注入来提供新组件以及组件所需的服务。",
+    "translation": "“依赖注入”是提供类的新实例的一种方式，还负责处理好类所需的全部依赖。大多数依赖都是服务。\nAngular 使用依赖注入来提供新组件以及组件所需的服务。<br class=\"clear\">",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/architecture.md"
   },
   {
@@ -2450,7 +2465,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/attribute-directives.md"
   },
   {
-    "original": "",
+    "original": "Begin by adding `Input` to the list of symbols imported from `@angular/core`.\n<code-example path=\"attribute-directives/src/app/highlight.directive.3.ts\" linenums=\"false\" title=\"src/app/highlight.directive.ts (imports)\" region=\"imports\"></code-example>",
     "translation": "我们先从`@angular/core`中导入`Input`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/attribute-directives.md"
   },
@@ -2729,11 +2744,6 @@
     "translation": "Angular 模块类描述应用的部件是如何组合在一起的。\n每个应用都至少有一个 Angular 模块，也就是*根*模块，用来[引导](#main)并运行应用。\n你可以为它取任何名字。常规名字是`AppModule`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/bootstrapping.md"
   },
-  {
-    "original": "The [**Angular CLI**](https://cli.angular.io/) produces a new project with the following minimal `AppModule`.\nYou evolve this module as your application grows.",
-    "translation": "[开发环境](guide/setup)讲解了如何使用下面这个最小的`AppModule`来创建一个新项目。\n这个模块随着应用的成长而演变。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/bootstrapping.md"
-  },
   {
     "original": "After the `import` statements, you come to a class adorned with the\n**`@NgModule`** [_decorator_](guide/glossary#decorator '\"Decorator\" explained').",
     "translation": "`import`语句之后，可以看到一个**`@NgModule`**[装饰器](guide/glossary#decorator '\"Decorator\" explained')修饰的类。",
@@ -2821,7 +2831,7 @@
   },
   {
     "original": "**Only `@NgModule` classes** go in the `imports` array. Do not put any other kind of class in `imports`.",
-    "translation": "`imports`数组中应该**只有`NgModule`类**。不要放置其它类型的类。",
+    "translation": "`imports`数组中应该**只有`NgModule`类**。不要放置其它类型的类。\n</div>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/bootstrapping.md"
   },
   {
@@ -3080,17 +3090,17 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
   {
-    "original": "Feature",
+    "original": "<th>\n      Feature",
     "translation": "特性",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
   {
-    "original": "Polyfill",
+    "original": "<th>\n      Polyfill",
     "translation": "填充库",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
   {
-    "original": "Browsers (Desktop & Mobile)",
+    "original": "<th style=\"width: 50%\">\n      Browsers (Desktop & Mobile)",
     "translation": "浏览器（桌面和移动）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
@@ -3100,7 +3110,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
   {
-    "original": "All current browsers.\n      Enabled by default.\n      Can remove If you always use AOT and only use Angular decorators.",
+    "original": "<td>\n      All current browsers.\n      Enabled by default.\n      Can remove If you always use AOT and only use Angular decorators.",
     "translation": "默认对目前的所有浏览器都启用了。如果总是使用 AOT 模式，并且只使用 Angular 自带的装饰器，那么可以移除它。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
@@ -3111,7 +3121,7 @@
   },
   {
     "original": "[Web Animations](guide/browser-support#web-animations)",
-    "translation": "[Web 动画](guide/browser-support#web-animations)",
+    "translation": "[Web 动画](guide/browser-support#web-animations)\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
   {
@@ -3124,6 +3134,21 @@
     "translation": "如果你使用下列已废弃的i18n管道：\n    [date](api/common/DeprecatedDatePipe)、[currency](api/common/DeprecatedCurrencyPipe)、[decimal](api/common/DeprecatedDecimalPipe) 和 [percent](api/common/DeprecatedPercentPipe)",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
   },
+  {
+    "original": "All but Chrome, Firefox, Edge, IE11 and Safari 10",
+    "translation": "除了 Chrome、Firefox、Edge、IE11 和 Safari 10 外的所有浏览器",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
+  },
+  {
+    "original": "[NgClass](api/common/NgClass) on SVG elements",
+    "translation": "在 SVG 元素上应用 [NgClass](api/common/NgClass)",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
+  },
+  {
+    "original": "[Http](guide/http) when sending and receiving binary data",
+    "translation": "用 [Http](guide/http) 发送和接收二进制数据",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/browser-support.md"
+  },
   {
     "original": "### Suggested polyfills ##",
     "translation": "### 建议的填充库 ##\nBelow are the polyfills which are used to test the framework itself. They are a good starting point for an application.",
@@ -3574,6 +3599,71 @@
     "translation": "[生命周期钩子](guide/lifecycle-hooks)章现在更加简短，并且对强调了Angular是以什么顺序来调用钩子方法的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/change-log.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">Cheat Sheet</h1>",
+    "translation": "<h1 class=\"no-toc\">速查表</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Bootstrapping",
+    "translation": "启动",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Template syntax",
+    "translation": "模板语法",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Built-in directives",
+    "translation": "内置指令",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Forms",
+    "translation": "表单",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Class decorators",
+    "translation": "类装饰器（decorator）",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Directive configuration",
+    "translation": "指令配置",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Does not support parent-child relationship selectors.",
+    "translation": "但不支持指定父子关系的选择器。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Component configuration",
+    "translation": "组件配置",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Class field decorators for directives and components",
+    "translation": "给指令或组件类用的属性装饰器",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Directive and component change detection and lifecycle hooks",
+    "translation": "指令和组件的变更检测与生命周期钩子",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Dependency injection configuration",
+    "translation": "依赖注入的配置",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
+  {
+    "original": "Routing and navigation",
+    "translation": "路由与导航",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/cheatsheet.md"
+  },
   {
     "original": "# Component Interaction",
     "translation": "# 组件之间的交互",
@@ -3649,6 +3739,11 @@
     "translation": "运行应用程序会显示三个英雄：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "E2E test that all children were instantiated and displayed as expected:",
     "translation": "端到端测试，用于确保所有的子组件都像所期待的那样被初始化并显示出来。",
@@ -3679,6 +3774,11 @@
     "translation": "下面的`NameParentComponent`展示了各种名字的处理方式，包括一个全是空格的名字。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "E2E tests of input property setter with empty and non-empty names:",
     "translation": "端到端测试：输入属性的setter，分别使用空名字和非空名字。",
@@ -3724,6 +3824,11 @@
     "translation": "下面是点击按钮的结果。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "Test that ***both*** input properties are set initially and that button clicks trigger \nthe expected `ngOnChanges` calls and values:",
     "translation": "测试确保***这两个***输入属性值都被初始化了，当点击按钮后，`ngOnChanges`应该被调用，属性的值也符合预期。",
@@ -3764,6 +3869,11 @@
     "translation": "框架(Angular)把事件参数(用`$event`表示)传给事件处理方法，这个方法会处理：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "Test that clicking the *Agree* and *Disagree* buttons update the appropriate counters:",
     "translation": "测试确保点击*Agree*和*Disagree*按钮时，计数器被正确更新。",
@@ -3785,7 +3895,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
   {
-    "original": "{@a countdown-timer-example}  \nThe following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket. It has `start` and `stop` methods that control the clock and it displays a countdown status message in its own template.",
+    "original": "The following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket. It has `start` and `stop` methods that control the clock and it displays a countdown status message in its own template.",
     "translation": "子组件`CountdownTimerComponent`进行倒计时，归零时发射一个导弹。`start`和`stop`方法负责控制时钟并在模板里显示倒计时的状态信息。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
@@ -3814,6 +3924,11 @@
     "translation": "下面是父组件和子组件一起工作时的效果。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "Test that the seconds displayed in the parent template\nmatch the seconds displayed in the child's status message.\nTest also that clicking the *Stop* button pauses the countdown timer:",
     "translation": "测试确保在父组件模板中显示的秒数和子组件状态信息里的秒数同步。它还会点击*Stop*按钮来停止倒计时：",
@@ -3899,6 +4014,11 @@
     "translation": "使用`setTimeout()`来等下一轮，然后改写`seconds()`方法，这样它接下来就会从注入的这个计时器组件里获取秒数的值。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下！</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "Use [the same countdown timer tests](guide/component-interaction#countdown-tests) as before.",
     "translation": "使用和之前[一样的倒计时测试](guide/component-interaction#countdown-tests)。",
@@ -3954,6 +4074,11 @@
     "translation": "*History*日志证明了：在父组件`MissionControlComponent`和子组件`AstronautComponent`之间，信息通过该服务实现了双向传递。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "### 测试",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/component-interaction.md"
+  },
   {
     "original": "Tests click buttons of both the parent `MissionControlComponent` and the `AstronautComponent` children\nand verify that the history meets expectations:",
     "translation": "测试确保点击父组件`MissionControlComponent`和子组件`AstronautComponent`两个的组件的按钮时，*History*日志和预期的一样。",
@@ -4336,11 +4461,11 @@
   },
   {
     "original": "Dependency Injection is a powerful pattern for managing code dependencies. \nThis cookbook explores many of the features of Dependency Injection (DI) in Angular.",
-    "translation": "依赖注入是一个用来管理代码依赖的强大模式。在这本“烹饪宝典”中，我们会讨论Angular依赖注入的许多特性。\n{@a toc}",
+    "translation": "依赖注入是一个用来管理代码依赖的强大模式。在这本“烹饪宝典”中，我们会讨论Angular依赖注入的许多特性。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "of the code in this cookbook.",
+    "original": "See the <live-example name=\"dependency-injection-in-action\"></live-example>\nof the code in this cookbook.",
     "translation": "要获取本“烹饪宝典”的代码，**参见<live-example name=\"dependency-injection-in-action\"></live-example>**。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
@@ -4570,7 +4695,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "and confirm that the three `HeroBioComponent` instances have their own cached hero data.",
+    "original": "Find this example in <live-example name=\"dependency-injection-in-action\">live code</live-example>\nand confirm that the three `HeroBioComponent` instances have their own cached hero data.",
     "translation": "到<live-example name=\"dependency-injection-in-action\">在线例子</live-example>中找到这个例子，确认三个`HeroBioComponent`实例拥有自己独立的英雄数据缓存。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
@@ -4670,8 +4795,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
-    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。",
+    "original": "On the other hand, if you restore the `@Host()` decorator and comment out `@Optional`,\nthe application fails for lack of the required logger at the host component level.\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
+    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
@@ -4955,7 +5080,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "for the full source code.",
+    "original": "The function retrieves candidate heroes from the `HeroService`,\ntakes `2` of them to be the runners-up, and returns their concatenated names.\nLook at the <live-example name=\"dependency-injection-in-action\"></live-example>\nfor the full source code.",
     "translation": "该函数从`HeroService`获取英雄参赛者，从中取`2`个作为亚军，并把他们的名字拼接起来。请到<live-example name=\"dependency-injection-in-action\"></live-example>查看全部原代码。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
@@ -4971,7 +5096,7 @@
   },
   {
     "original": "But the token doesn't have to be a class and even when it is a class,\nit doesn't have to be the same type as the returned object.\nThat's the subject of the next section.",
-    "translation": "但令牌不一定都是类，就算它是一个类，它也不一定都返回类型相同的对象。这是下一节的主题。\n{@a class-interface}",
+    "translation": "但令牌不一定都是类，就算它是一个类，它也不一定都返回类型相同的对象。这是下一节的主题。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
@@ -5170,7 +5295,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is set.",
+    "original": "Notice that even though the [@Optional](guide/dependency-injection-in-action#optional) qualifier\nis there for safety,\nthe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is set.",
     "translation": "安全起见，我们添加了[@Optional](guide/dependency-injection-in-action#optional)装饰器，但是<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数确实被设置了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
@@ -5215,7 +5340,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
+    "original": "Unfortunately, this does not work.\nThe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
     "translation": "可惜这样不行。<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数是null。\n*不能通过基类注入父组件*。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection-in-action.md"
   },
@@ -5769,11 +5894,6 @@
     "translation": "类型参数，虽然是可选的，但可以向开发者和开发工具传达类型信息。\n而且这个令牌的描述信息也可以为开发者提供帮助。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection.md"
   },
-  {
-    "original": "Register the dependency provider using the `InjectionToken` object:",
-    "translation": "使用这个`InjectionToken`对象注册依赖的提供商：",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/dependency-injection.md"
-  },
   {
     "original": "Now you can inject the configuration object into any constructor that needs it, with\nthe help of an `@Inject` decorator:",
     "translation": "现在，在`@Inject`装饰器的帮助下，这个配置对象可以注入到任何需要它的构造函数中：",
@@ -5914,14 +6034,19 @@
     "translation": "把输出目录（默认为`dist/`）下的*每个文件*都复制到到服务器上的某个目录下。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
+  {
+    "original": "3. If you copy the files into a server _sub-folder_, append the build flag, `--base-href` and set the `<base href>` appropriately.<br><br>",
+    "translation": "如果要把文件部署到服务器上的*某个子路径*下，构建时还要添加`--base-href`（基地址）标识，并设置合适的`<base href>`。<br><br>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
+  },
   {
     "original": "For example, if the `index.html` is on the server at `/my/app/index.html`, set the _base href_  to\n  `<base href=\"/my/app/\">` like this.",
     "translation": "比如，如果 `index.html` 位于服务器上的 `/my/app/index.html` 路径下，就要把 *base href* 设置为 `<base href=\"/my/app/\">`，就像这样：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
   {
-    "original": "Learn more about the role of `<base href>` [below](guide/deployment#base-tag).",
-    "translation": "我们会看到在生成的 `dist/index.html` 中 `",
+    "original": "You'll see that the `<base href>` is set properly in the generated `dist/index.html`.<br><br>\n  If you copy to the server's root directory, omit this step and leave the `<base href>` alone.<br><br>\n  Learn more about the role of `<base href>` [below](guide/deployment#base-tag).",
+    "translation": "我们会看到在生成的 `dist/index.html` 中 `<base href>` 已经被设置好了。<br><br>\n  如果复制到服务器的根目录下，就省略这个步骤，并且让 `<base href>` 保持原样。<br><br> \n  要了解 `<base href>` 的作用，参见 [下面](guide/deployment#base-tag) 的内容。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
   {
@@ -5979,11 +6104,6 @@
     "translation": "Angular应用默认运行在开发模式下，正如在浏览器控制台中看到的如下信息：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
-  {
-    "original": "",
-    "translation": "Angular is running in the development mode. Call enableProdMode() to enable the production mode.\n  （Angular正运行在开发模式下。调用enableProdMode()来启用生产模式）",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
-  },
   {
     "original": "Switching to _production mode_ can make it run faster by disabling development specific checks such as the dual change detection cycles.",
     "translation": "切换到生产模式可以通过禁用开发环境下特有的检查（比如双重变更检测周期）来让应用运行得更快。",
@@ -6094,26 +6214,11 @@
     "translation": "#### 生产服务器",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
-  {
-    "original": "* [NGinx](http://nginx.org/): use `try_files`, as described in\n[Front Controller Pattern Web Apps](https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#front-controller-pattern-web-apps),\nmodified to serve `index.html`:",
-    "translation": "[NGinx](http://nginx.org/)：使用`try_files`指向`index.html`，详细描述见[Web应用的前端控制器模式](https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#front-controller-pattern-web-apps)。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
-  },
-  {
-    "original": "* [IIS](https://www.iis.net/): add a rewrite rule to `web.config`, similar to the one shown\n[here](http://stackoverflow.com/a/26152011/2116927):",
-    "translation": "[IIS](https://www.iis.net/)：往`web.config`中添加一条重写规则，类似于[这里](http://stackoverflow.com/a/26152011/2116927)：",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
-  },
   {
     "original": "* [GitHub Pages](https://pages.github.com/): you can't\n[directly configure](https://github.com/isaacs/github/issues/408)\nthe GitHub Pages server, but you can add a 404 page.\nCopy `index.html` into `404.html`.\nIt will still be served as the 404 response, but the browser will process that page and load the app properly.\nIt's also a good idea to\n[serve from `docs/` on master](https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/#publishing-your-github-pages-site-from-a-docs-folder-on-your-master-branch)\nand to\n[create a `.nojekyll` file](https://www.bennadel.com/blog/3181-including-node-modules-and-vendors-folders-in-your-github-pages-site.htm)",
     "translation": "[GitHub页面服务](https://pages.github.com/)：我们没办法[直接配置](https://github.com/isaacs/github/issues/408) Github的页面服务，但可以添加一个404页，只要把`index.html`复制到`404.html`就可以了。\n  它仍然会给出一个404响应，但是浏览器将会正确处理该页，并正常加载该应用。\n  使用[在主分支的`docs/`下启动服务](https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/#publishing-your-github-pages-site-from-a-docs-folder-on-your-master-branch)\n  并[创建一个`.nojekyll`文件](https://www.bennadel.com/blog/3181-including-node-modules-and-vendors-folders-in-your-github-pages-site.htm)也是一个好办法。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
   },
-  {
-    "original": "* [Firebase hosting](https://firebase.google.com/docs/hosting/): add a\n[rewrite rule](https://firebase.google.com/docs/hosting/url-redirects-rewrites#section-rewrites).",
-    "translation": "[Firebase主机服务](https://firebase.google.com/docs/hosting/)：添加一条[重写规则](https://firebase.google.com/docs/hosting/url-redirects-rewrites#section-rewrites)。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/deployment.md"
-  },
   {
     "original": "### Requesting services from a different server (CORS)",
     "translation": "### 请求来自另一个服务器的服务（CORS）",
@@ -6490,7 +6595,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dynamic-component-loader.md"
   },
   {
-    "original": "of the code in this cookbook.",
+    "original": "See the <live-example name=\"dynamic-component-loader\"></live-example>\nof the code in this cookbook.",
     "translation": "到<live-example name=\"cb-dynamic-component-loader\"></live-example>查看本烹饪书的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dynamic-component-loader.md"
   },
@@ -6801,7 +6906,7 @@
   },
   {
     "original": "`formControlName` and `formGroup` are directives defined in\n`ReactiveFormsModule`. The templates can access these directives\ndirectly since you imported `ReactiveFormsModule` from `AppModule`.",
-    "translation": "`formControlName`和`formGroup`是在`ReactiveFormsModule`中定义的指令。我们之所以能在模板中使用它们，是因为我们往`AppModule`中导入了`ReactiveFormsModule`。\n{@a questionnaire-data}",
+    "translation": "`formControlName`和`formGroup`是在`ReactiveFormsModule`中定义的指令。我们之所以能在模板中使用它们，是因为我们往`AppModule`中导入了`ReactiveFormsModule`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/dynamic-form.md"
   },
   {
@@ -7581,7 +7686,7 @@
   },
   {
     "original": "Find the `<input>` tag for *Name* and update it like this:",
-    "translation": "找到 *Name* 对应的`",
+    "translation": "找到 *Name* 对应的`<input>`标签，并且像这样修改它：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
   {
@@ -7596,7 +7701,7 @@
   },
   {
     "original": "You need one more addition to display the data. Declare\na template variable for the form. Update the `<form>` tag with\n`#heroForm=\"ngForm\"` as follows:",
-    "translation": "我们需要更多的工作来显示数据。在表单中声明一个模板变量。往`",
+    "translation": "我们需要更多的工作来显示数据。在表单中声明一个模板变量。往`<form>`标签中加入`#heroForm=\"ngForm\"`，代码如下：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
   {
@@ -7649,6 +7754,11 @@
     "translation": "修改之后，这个表单的核心是这样的：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "* Each input element has an `id` property that is used by the `label` element's `for` attribute\nto match the label to its input control.\n每个 input 元素都有`id`属性，`label`元素的`for`属性用它来匹配到对应的输入控件。* Each input element has a `name` property that is required by Angular forms to register the control with the form.",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
+  },
   {
     "original": "If you run the app  now and change every hero model property, the form might display like this:",
     "translation": "如果现在运行本应用，修改 Hero 模型的每个属性，表单是这样的：",
@@ -7709,11 +7819,6 @@
     "translation": "控件的值有效。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
-  {
-    "original": "Temporarily add a [template reference variable](guide/template-syntax#ref-vars) named `spy`\nto the _Name_ `<input>` tag and use it to display the input's CSS classes.",
-    "translation": "往姓名`<input>`标签上添加名叫 **spy** 的临时[模板引用变量](guide/template-syntax#ref-vars)，\n然后用这个 spy 来显示它上面的所有 CSS 类。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
-  },
   {
     "original": "Now run the app and look at the _Name_ input box.\nFollow these steps *precisely*:",
     "translation": "现在，运行本应用，并让*姓名*输入框获得焦点。\n然后严格按照下面四个步骤来做：",
@@ -7854,11 +7959,6 @@
     "translation": "英雄的*超能力*选项是必填的。\n  只要愿意，可以往`<select>`上添加相同的错误处理。\n  但没有必要，这个选择框已经限制了“超能力”只能选有效值。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
-  {
-    "original": "Now you'll add a new hero in this form.\nPlace a *New Hero* button at the bottom of the form and bind its click event to a `newHero` component method.",
-    "translation": "我们希望在这个表单中添加新的英雄。\n  在表单的底部放置“New Hero（新增英雄）”按钮，并把它的点击事件绑定到`newHero`组件。",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
-  },
   {
     "original": "Run the application again, click the *New Hero* button, and the form clears.\nThe *required* bars to the left of the input box are red, indicating invalid `name` and `power` properties.\nThat's understandable as these are required fields.\nThe error messages are hidden because the form is pristine; you haven't changed anything yet.",
     "translation": "再次运行应用，点击 *New Hero* 按钮，表单被清空了。\n输入框左侧的*必填项*竖条是红色的，表示`name`和`power`属性是无效的。\n这可以理解，因为有一些必填字段。\n错误信息是隐藏的，因为表单还是全新的，还没有修改任何东西。",
@@ -7894,11 +7994,6 @@
     "translation": "在填表完成之后，用户还应该能提交这个表单。\n“Submit（提交）”按钮位于表单的底部，它自己不做任何事，但因为有特殊的 type 值 (`type=\"submit\"`)，所以会触发表单提交。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
-  {
-    "original": "A \"form submit\" is useless at the moment.\nTo make it useful, bind the form's `ngSubmit` event property\nto the hero form component's `onSubmit()` method:",
-    "translation": "现在这样仅仅触发“表单提交”是没用的。\n要让它有用，就要把该表单的`ngSubmit`事件属性绑定到英雄表单组件的`onSubmit()`方法上：",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
-  },
   {
     "original": "You'd already defined a template reference variable,\n`#heroForm`, and initialized it with the value \"ngForm\".\nNow, use that variable to access the form with the Submit button.",
     "translation": "我们已经定义了一个模板引用变量`#heroForm`，并且把赋值为“ngForm”。\n现在，就可以在“Submit”按钮中访问这个表单了。",
@@ -7961,12 +8056,7 @@
   },
   {
     "original": "Wrap the form in a `<div>` and bind\nits `hidden` property to the `HeroFormComponent.submitted` property.",
-    "translation": "先把表单包裹进`",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
-  },
-  {
-    "original": "The main form is visible from the start because the\n`submitted` property is false until you submit the form,\nas this fragment from the `HeroFormComponent` shows:",
-    "translation": "主表单从一开始就是可见的，因为`submitted`属性是 false，直到提交了这个表单。\n来自`HeroFormComponent`的代码片段告诉了我们这一点：",
+    "translation": "先把表单包裹进`<div>`中，再把它的`hidden`属性绑定到`HeroFormComponent.submitted`属性。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
   {
@@ -7974,11 +8064,6 @@
     "translation": "当点击 Submit 按钮时，`submitted`标志会变成 true，并且表单像预想中一样消失了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
   },
-  {
-    "original": "Now the app needs to show something else while the form is in the submitted state.\nAdd the following HTML below the `<div>` wrapper you just wrote:",
-    "translation": "现在，当表单处于已提交状态时，需要显示一些别的东西。\n在刚刚写的`",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/forms.md"
-  },
   {
     "original": "There's the hero again, displayed read-only with interpolation bindings.\nThis `<div>` appears only while the component is in the submitted state.",
     "translation": "英雄又出现了，它通过插值表达式绑定显示为只读内容。\n这一小段 HTML 只在组件处于已提交状态时才会显示。",
@@ -9745,7 +9830,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/http.md"
   },
   {
-    "original": "intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n  \tconst started = Date.now();\n    return next\n      .handle(req)\n      .do(event => {\n        if (event instanceof HttpResponse) {\n          const elapsed = Date.now() - started;\n          console.log(`Request for ${req.urlWithParams} took ${elapsed} ms.`);\n        }\n      });\n  }\n}\n```\nNotice the RxJS `do()` operator&mdash;it adds a side effect to an Observable without affecting the values on the stream. Here, it detects the `HttpResponse` event and logs the time the request took.",
+    "original": "Notice the RxJS `do()` operator&mdash;it adds a side effect to an Observable without affecting the values on the stream. Here, it detects the `HttpResponse` event and logs the time the request took.",
     "translation": "注意 RxJS 的 `do()`操作符 —— 它为可观察对象添加一个副作用，而不会影响到流中的值。这里，它会检测`HttpResponse`的事件，并且记录这个请求花费的时间。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/http.md"
   },
@@ -9830,7 +9915,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/http.md"
   },
   {
-    "original": "*Note that `HttpClient`'s support is only the client half of the XSRF protection scheme.* Your backend service must be configured to set the cookie for your page, and to verify that the header is present on all eligible requests. If not, Angular's default protection will be ineffective.",
+    "original": "<div class=\"alert is-important\">\n*Note that `HttpClient`'s support is only the client half of the XSRF protection scheme.* Your backend service must be configured to set the cookie for your page, and to verify that the header is present on all eligible requests. If not, Angular's default protection will be ineffective.",
     "translation": "*注意，`HttpClient`支持的只是 XSRF 防护方案的客户端这一半。* 我们的后端服务必须配置为给页面设置 cookie ，并且要验证请求头，以确保全都是合法的请求。否则，Angular 默认的这种防护措施就会失效。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/http.md"
   },
@@ -10445,12 +10530,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/language-service.md"
   },
   {
-    "original": "```sh\nnpm install --save-dev @angular/language-service\n```\nAdditionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
+    "original": "Additionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
     "translation": "另外，还要在工程的`tsconfig.json`中添加下列`\"compilerOptions\"`区域：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/language-service.md"
   },
   {
-    "original": "```json\n  \"plugins\": [\n      {\"name\": \"@angular/language-service\"}\n  ]\n```\nNote that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
+    "original": "Note that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
     "translation": "注意，这只是提供了`.ts`文件中的诊断与自动完成。我们需要一个自定义的sublime插件（或修改现有插件）来在 HTML 文件中提供自动完成功能。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/language-service.md"
   },
@@ -10539,6 +10624,11 @@
     "translation": "当Angular使用构造函数新建一个组件或指令后，就会按下面的顺序在特定时刻调用这些生命周期钩子方法：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "Hook",
+    "translation": "钩子",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
+  },
   {
     "original": "Respond when Angular (re)sets data-bound input properties.\n      The method receives a `SimpleChanges` object of current and previous property values.",
     "translation": "当Angular（重新）设置数据绑定输入属性时响应。\n      该方法接受当前和上一属性值的`SimpleChanges`对象",
@@ -10690,7 +10780,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
   },
   {
-    "original": "demonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
+    "original": "The <live-example></live-example>\ndemonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
     "translation": "<live-example></live-example>通过在受控于根组件`AppComponent`的一些组件上进行的一系列练习，演示了生命周期钩子的运作方式。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
   },
@@ -10704,6 +10794,11 @@
     "translation": "下面是每个练习简短的描述：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "Component",
+    "translation": "组件",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
+  },
   {
     "original": "Demonstrates every lifecycle hook.\n      Each hook method writes to the on-screen log.",
     "translation": "展示每个生命周期钩子，每个钩子方法都会在屏幕上显示一条日志。",
@@ -10819,6 +10914,11 @@
     "translation": "不开玩笑了，注意下面两个关键点：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "1. Angular calls hook methods for *directives* as well as components.<br><br>",
+    "translation": "就像对组件一样，Angular也会对*指令*调用这些钩子方法。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/lifecycle-hooks.md"
+  },
   {
     "original": "2. A spy directive can provide insight into a DOM object that you cannot change directly.\nObviously you can't touch the implementation of a native `<div>`.\nYou can't modify a third party component either.\nBut you can watch both with a directive.",
     "translation": "一个侦探(spy)指令可以让我们在无法直接修改DOM对象实现代码的情况下，透视其内部细节。\n显然，你不能修改一个原生`<div>`元素的实现代码。\n你同样不能修改第三方组件。\n但我们用一个指令就能监视它们了。",
@@ -11689,6 +11789,11 @@
     "translation": "更一般地说，[优先把提供商注册进模块中](guide/ngmodule-faq#q-component-or-module)，而不是组件中。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Discussion</h3>",
+    "translation": "<h3 class=\"no-toc\">讨论</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "Angular registers all startup NgModule providers with the application root injector.\nThe services created from root injector providers are available to the entire application.\nThey are _application-scoped_.",
     "translation": "Angular把所有启动期模块的提供商都注册进了应用的根注入器中。\n这些服务是由根注入器中的提供商创建的，并且在整个应用中都可用。\n它们具有*应用级作用域*。",
@@ -12186,7 +12291,7 @@
   },
   {
     "original": "Don't provide application-wide singleton services in a routed feature module\n      or in an NgModule that the routed module imports.",
-    "translation": "不要在路由特性模块及其导入的模块中提供*全应用级*的单例服务。",
+    "translation": "不要在路由特性模块及其导入的模块中提供*全应用级*的单例服务。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
   {
@@ -12286,7 +12391,7 @@
   },
   {
     "original": "Do *not* import service modules in other feature modules.\n      If you deviate from this guideline, know what you're doing and why.",
-    "translation": "*不要*在任何特性模块中导入它们。\n      如果你要违背这条指导原则，请务必想清楚你在做什么，并要有充分的理由。",
+    "translation": "*不要*在任何特性模块中导入它们。\n      如果你要违背这条指导原则，请务必想清楚你在做什么，并要有充分的理由。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
   {
@@ -12379,6 +12484,16 @@
     "translation": "顶级组件",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "Feature, <code>AppModule</code>",
+    "translation": "特性模块和<code>AppModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
+  {
+    "original": "<code>ContactModule</code> (before routing)",
+    "translation": "<code>ContactModule</code>（路由之前的那个例子）",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "Routed",
     "translation": "路由",
@@ -12404,6 +12519,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>ContactModule</code>, <code>HeroModule</code>, <code>CrisisModule</code>",
+    "translation": "<code>ContactModule</code>、<code>HeroModule</code>、<code>CrisisModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "Routing",
     "translation": "路由",
@@ -12424,6 +12544,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>HttpModule</code>, <code>CoreModule</code>",
+    "translation": "<code>HttpModule</code>、<code>CoreModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "Service",
     "translation": "服务",
@@ -12444,6 +12569,11 @@
     "translation": "无",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>HttpModule</code>, <code>CoreModule</code>",
+    "translation": "<code>HttpModule</code>、<code>CoreModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "Widget",
     "translation": "窗口部件",
@@ -12469,6 +12599,11 @@
     "translation": "特性模块",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<code>CommonModule</code>, <code>SharedModule</code>",
+    "translation": "<code>CommonModule</code>、<code>SharedModule</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
+  },
   {
     "original": "## What's the difference between Angular NgModules and JavaScript Modules?",
     "translation": "## Angular模块和JavaScript模块有什么区别？",
@@ -12530,7 +12665,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
   {
-    "original": "The NgModule is also special in another way.\nUnlike JavaScript modules, an NgModule can extend the _entire_ application with services\nby adding providers to the `@NgModule.providers` list.\n<!-- CF: Should this sentence be a bullet point in the list above? -->",
+    "original": "<!-- CF: Should this sentence be a bullet point in the list above? -->",
     "translation": "Angular模块还有些别的特殊之处。\n不同于JavaScript模块，Angular模块可以通过把服务提供商添加到`@NgModule.providers`数组中来扩展*整个*应用提供的服务。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
@@ -12791,7 +12926,7 @@
   },
   {
     "original": "Both are advanced techniques that few developers ever employ.\n      If you are one of those few, you must add these components to the\n      `entryComponents` list yourself, either programmatically or by hand.",
-    "translation": "所有这些高级技巧是只有极少数开发人员才会去用的。\n      如果你是其中的一位，那么你就不得不自行把这些组件添加到`entryComponents`列表中 —— 无论是用程序添加还是手动添加。",
+    "translation": "所有这些高级技巧是只有极少数开发人员才会去用的。\n      如果你是其中的一位，那么你就不得不自行把这些组件添加到`entryComponents`列表中 —— 无论是用程序添加还是手动添加。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule-faq.md"
   },
   {
@@ -12814,6 +12949,31 @@
     "translation": "本章通过一个基于《英雄指南》的渐进式例子解释了 Angular 的模块。这里是例子演化过程中一些关键节点的在线例子。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
   },
+  {
+    "original": "* <live-example plnkr=\"minimal.0\">The initial app</live-example>",
+    "translation": "<live-example plnkr=\"minimal.0\">最小的 NgModule 应用</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"contact.1b\">The first contact module</live-example>",
+    "translation": "<live-example plnkr=\"contact.1b\">第一个联系人模块</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"contact.2\">The revised contact module</live-example>",
+    "translation": "<live-example plnkr=\"contact.2\">修改过的联系人模块</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example plnkr=\"pre-shared.3\">Just before adding SharedModule</live-example>",
+    "translation": "<live-example plnkr=\"pre-shared.3\">添加 _SharedModule_ 之前</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
+  {
+    "original": "* <live-example>The final version</live-example>",
+    "translation": "<live-example>最终版</live-example>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
   {
     "original": "#### Frequently asked questions (FAQs)",
     "translation": "### 常见问题",
@@ -12994,6 +13154,11 @@
     "translation": "如果*不借助CLI的帮助*，就要自己把下列*联系人编辑器*文件添加到项目中。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Run the app</h3>",
+    "translation": "<h3 class=\"no-toc\">运行该应用</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
   {
     "original": "Everything is in place to run the application with its contact editor.",
     "translation": "一切就绪，可以运行该应用及其联系人编辑器了。",
@@ -13189,6 +13354,11 @@
     "translation": "`ContactModule`仍然会在应用启动时被主动加载。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
   },
+  {
+    "original": "You can examine the complete source for this version of the app in\nthe <live-example plnkr=\"pre-shared.3\" img=\"guide/ngmodule/v3-plunker.png\">live example.</live-example>",
+    "translation": "`HeroModule`和`CrisisModule`会被惰性加载。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
   {
     "original": "The revised `AppComponent` template has\na title, three links, and a `<router-outlet>`.",
     "translation": "我们从这个`AppComponent`新模板的顶部看起：标题、三个链接和`<router-outlet>`。",
@@ -13404,6 +13574,11 @@
     "translation": "`CoreModule`_提供_了`UserService`。Angular 在该应用的根注入器中注册了它的提供商，\n导致这份`UserService`的实例在每个需要它的组件中都是可用的，无论那个组件时主动加载的还是惰性加载的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Why bother?</h3>",
+    "translation": "<h3 class=\"no-toc\">没必要？</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/ngmodule.md"
+  },
   {
     "original": "This scenario is clearly contrived.\nThe app is too small to worry about a single service file and a tiny, one-time component.",
     "translation": "这个场景设计的是有点生硬。\n该应用太小了，所以其实并不需要拆分出单独的服务文件和小型的、一次性的组件。",
@@ -13624,6 +13799,11 @@
     "translation": "[**yarn**](https://yarnpkg.com/en/) 是另一个下载和安装 npm 包的工具。\n当创建新项目时，Angular CLI 默认使用 `yarn` 来安装 npm 包。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/npm-packages.md"
   },
+  {
+    "original": "<div class=\"l-sub-section\">",
+    "translation": "Node.js and npm are essential to Angular development. \nNode.js和npm是做Angular开发的基础。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/npm-packages.md"
+  },
   {
     "original": "[Get them now](https://docs.npmjs.com/getting-started/installing-node \"Installing Node.js and updating npm\")\nif they're not already installed on your machine.",
     "translation": "如果你的电脑上还没有装过，请 [立即获取它们](https://docs.npmjs.com/getting-started/installing-node \"Installing Node.js and updating npm\")！",
@@ -14099,6 +14279,11 @@
     "translation": "Angular通过*变更检测*过程来查找绑定值的更改，并在每一次JavaScript事件之后运行：每次按键、鼠标移动、定时器以及服务器的响应。\n这可能会让变更检测显得很昂贵，但是Angular会尽可能降低变更检测的成本。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">No pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">无管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "In the next example, the component uses the default, aggressive change detection strategy to monitor and update\nits display of every hero in the `heroes` array. Here's the template:",
     "translation": "我们下一个例子中的组件使用默认的、激进(昂贵)的变更检测策略来检测和更新`heroes`数组中的每个英雄。下面是它的模板：",
@@ -14114,6 +14299,11 @@
     "translation": "我们可以添加新的英雄，加完之后，Angular就会更新显示。\n`reset`按钮会把`heroes`替换成一个由原来的英雄组成的新数组，重置完之后，Angular就会更新显示。\n如果我们提供了删除或修改英雄的能力，Angular也会检测到那些更改，并更新显示。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\"><i>FlyingHeroesPipe</i></h3>",
+    "translation": "<h3 class=\"no-toc\"><i>“会飞的英雄”管道（FlyingHeroesPipe）</i></h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "Add a `FlyingHeroesPipe` to the `*ngFor` repeater that filters the list of heroes to just those heroes who can fly.",
     "translation": "我们来往`*ngFor`重复器中添加一个`FlyingHeroesPipe`管道，这个管道能过滤出所有会飞的英雄。",
@@ -14184,6 +14374,11 @@
     "translation": "在继续往下走之前，我们先理解一下*纯*和*非纯*之间的区别，从*纯*管道开始。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes</h3>",
+    "translation": "<h3 class=\"no-toc\">纯管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "Angular executes a *pure pipe* only when it detects a *pure change* to the input value.\nA pure change is either a change to a primitive input value (`String`, `Number`, `Boolean`, `Symbol`)\nor a changed object reference (`Date`, `Array`, `Function`, `Object`).",
     "translation": "Angular只有在它检测到输入值发生了*纯变更*时才会执行*纯管道*。\n    ***纯变更***是指对原始类型值(`String`、`Number`、`Boolean`、`Symbol`)的更改，\n    或者对对象引用(`Date`、`Array`、`Function`、`Object`)的更改。",
@@ -14209,6 +14404,11 @@
     "translation": "或者我们也可以完全不用管道。\n有时候，使用组件的属性能比用管道更好的达到目的，这一点我们等后面会再提起。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Impure pipes</h3>",
+    "translation": "### 非纯管道",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "Angular executes an *impure pipe*  during every component change detection cycle.\nAn impure pipe is called often, as often as every keystroke or mouse-move.",
     "translation": "Angular会在每个组件的变更检测周期中执行*非纯管道*。\n非纯管道可能会被调用很多次，和每个按键或每次鼠标移动一样频繁。",
@@ -14219,6 +14419,11 @@
     "translation": "要在脑子里绷着这根弦，我们必须小心翼翼的实现非纯管道。\n一个昂贵、迟钝的管道将摧毁用户体验。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure <i>FlyingHeroesPipe</i></h3>",
+    "translation": "### 非纯版本的*FlyingHeroesPipe*",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "A flip of the switch turns the `FlyingHeroesPipe` into a `FlyingHeroesImpurePipe`.\nThe complete implementation is as follows:",
     "translation": "我们把`FlyingHeroesPipe`换成了`FlyingHeroesImpurePipe`。\n下面是完整的实现：",
@@ -14244,6 +14449,11 @@
     "translation": "唯一的重大改动就是管道。\n  我们可以在<live-example></live-example>中确认，当我们输入新的英雄甚至修改#[code heroes]数组时，这个#[i 会飞的英雄]的显示也跟着更新了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">The impure <i>AsyncPipe</i></h3>",
+    "translation": "<h3 id='async-pipe'>\n  非纯  <i>AsyncPipe</i>\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "The Angular `AsyncPipe` is an interesting example of an impure pipe.\nThe `AsyncPipe` accepts a `Promise` or `Observable` as input\nand subscribes to the input automatically, eventually returning the emitted values.",
     "translation": "Angular的`AsyncPipe`是一个有趣的非纯管道的例子。\n  `AsyncPipe`接受一个`Promise`或`Observable`作为输入，并且自动订阅这个输入，最终返回它们给出的值。",
@@ -14264,6 +14474,11 @@
     "translation": "这个Async管道节省了组件的样板代码。\n组件不用订阅这个异步数据源，而且不用在被销毁时取消订阅(如果订阅了而忘了反订阅容易导致隐晦的内存泄露)。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure caching pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">一个非纯而且带缓存的管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "Write one more impure pipe, a pipe that makes an HTTP request.",
     "translation": "我们来写更多的非纯管道：一个向服务器发起HTTP请求的管道。",
@@ -14324,6 +14539,11 @@
     "translation": "[JsonPipe](api/common/JsonPipe)为你诊断数据绑定的某些神秘错误或为做进一步绑定而探查数据时，提供了一个简单途径。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes and pure functions</h3>",
+    "translation": "### 纯管道与纯函数",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/pipes.md"
+  },
   {
     "original": "A pure pipe uses pure functions.\nPure functions process inputs and return values without detectable side effects.\nGiven the same input, they should always return the same output.",
     "translation": "纯管道使用纯函数。\n纯函数是指在处理输入并返回结果时，不会产生任何副作用的函数。\n给定相同的输入，它们总是返回相同的输出。",
@@ -14429,6 +14649,11 @@
     "translation": "你还可以 <a href=\"generated/zips/cli-quickstart/cli-quickstart.zip\" target=\"_blank\">下载这个例子。</a>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='devenv'>\n  Step 1. Set up the Development Environment\n</h2>",
+    "translation": "<h2 id='devenv'>\n  步骤1. 设置开发环境\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
+  },
   {
     "original": "You need to set up your development environment before you can do anything.",
     "translation": "在开始工作之前，我们必须设置好开发环境。",
@@ -14449,6 +14674,11 @@
     "translation": "然后全局安装 **[Angular CLI](https://github.com/angular/angular-cli)** 。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='create-proj'>\n  Step 2. Create a new project\n</h2>",
+    "translation": "<h2 id='create-proj'>\n  步骤2. 创建新项目\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
+  },
   {
     "original": "Open a terminal window.",
     "translation": "打开终端窗口。",
@@ -14464,6 +14694,11 @@
     "translation": "请耐心等待。\n创建新项目需要花费很多时间，大多数时候都是在安装那些npm包。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='serve'>\n  Step 3: Serve the application\n</h2>",
+    "translation": "<h2 id='serve'>\n  步骤3. 启动开发服务器\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
+  },
   {
     "original": "Go to the project directory and launch the server.",
     "translation": "进入项目目录，并启动服务器。",
@@ -14484,6 +14719,11 @@
     "translation": "本应用会用一条消息来跟你打招呼：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
+  {
+    "original": "<h2 id='first-component'>\n  Step 4: Edit your first Angular component\n</h2>",
+    "translation": "<h2 id='first-component'>\n  步骤4. 编辑我们的第一个Angular组件\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
+  },
   {
     "original": "The CLI created the first Angular component for you.\nThis is the _root component_ and it is named `app-root`.\nYou can find it in `./src/app/app.component.ts`.",
     "translation": "这个CLI为我们创建了第一个Angular组件。\n它就是名叫`app-root`的*根组件*。\n你可以在`./src/app/app.component.ts`目录下找到它。",
@@ -14560,12 +14800,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
-    "original": "File",
+    "original": "<table width=\"100%\">\n  <col width=\"20%\">\n  </col>\n  <col width=\"80%\">\n  </col>\n  <tr>\n    <th>\n      File",
     "translation": "文件",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
-    "original": "Purpose",
+    "original": "</th>\n    <th>\n      Purpose",
     "translation": "用途",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
@@ -14581,7 +14821,7 @@
   },
   {
     "original": "A folder where you can put images and anything else to be copied wholesale\n      when you build your application.",
-    "translation": "这个文件夹下你可以放图片等任何东西，在构建应用时，它们全都会拷贝到发布包中。",
+    "translation": "这个文件夹下你可以放图片等任何东西，在构建应用时，它们全都会拷贝到发布包中。\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
@@ -14591,7 +14831,7 @@
   },
   {
     "original": "Every site wants to look good on the bookmark bar.\n      Get started with your very own Angular icon.",
-    "translation": "每个网站都希望自己在书签栏中能好看一点。\n      请把它换成你自己的图标。",
+    "translation": "每个网站都希望自己在书签栏中能好看一点。\n      请把它换成你自己的图标。\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
@@ -14635,12 +14875,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
-    "original": "File",
+    "original": "<table width=\"100%\">\n  <col width=\"20%\">\n  </col>\n  <col width=\"80%\">\n  </col>\n  <tr>\n    <th>\n      File",
     "translation": "文件",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
   {
-    "original": "Purpose",
+    "original": "</th>\n    <th>\n      Purpose",
     "translation": "用途",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/quickstart.md"
   },
@@ -15351,17 +15591,17 @@
   },
   {
     "original": "the value of a `FormControl`.",
-    "translation": "`FormControl`的值。",
+    "translation": "`FormControl`的值。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/reactive-forms.md"
   },
   {
     "original": "the validity of a `FormControl`. Possible values: `VALID`,\n       `INVALID`, `PENDING`, or `DISABLED`.",
-    "translation": "`FormControl`的有效性。可能的值有`VALID`、`INVALID`、`PENDING`或`DISABLED`。",
+    "translation": "`FormControl`的有效性。可能的值有`VALID`、`INVALID`、`PENDING`或`DISABLED`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/reactive-forms.md"
   },
   {
     "original": "`true` if the user has _not_ changed the value in the UI.\n       Its opposite is `myControl.dirty`.",
-    "translation": "如果用户*尚未*改变过这个控件的值，则为`true`。它总是与`myControl.dirty`相反。",
+    "translation": "如果用户*尚未*改变过这个控件的值，则为`true`。它总是与`myControl.dirty`相反。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/reactive-forms.md"
   },
   {
@@ -16220,23 +16460,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Property",
-    "translation": "属性",
+    "original": "<table>\n  <tr>\n    <th>\n      Property",
+    "translation": "属性\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Description",
-    "translation": "描述",
+    "original": "<th>\n      Description",
+    "translation": "描述\n    </th>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
     "original": "An `Observable` of the route path(s), represented as an array of strings for each part of the route path.",
-    "translation": "路由路径的`Observable`对象，是一个由路由路径中的各个部分组成的字符串数组。",
+    "translation": "路由路径的`Observable`对象，是一个由路由路径中的各个部分组成的字符串数组。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
     "original": "An `Observable` that contains the `data` object provided for the route. Also contains any resolved values from the [resolve guard](#resolve-guard).",
-    "translation": "一个`Observable`，其中包含提供给路由的`data`对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。",
+    "translation": "一个`Observable`，其中包含提供给路由的`data`对象。也包含由[解析守卫（resolve guard）](#resolve-guard)解析而来的值。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -16251,7 +16491,7 @@
   },
   {
     "original": "The name of the `RouterOutlet` used to render the route. For an unnamed outlet, the outlet name is _primary_.",
-    "translation": "要把该路由渲染到的`RouterOutlet`的名字。对于无名路由，它的路由名是`primary`，而不是空串。",
+    "translation": "要把该路由渲染到的`RouterOutlet`的名字。对于无名路由，它的路由名是`primary`，而不是空串。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -16261,7 +16501,7 @@
   },
   {
     "original": "The route's parent `ActivatedRoute` when this route is a [child route](#child-routing-component).",
-    "translation": "当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级`ActivatedRoute`。",
+    "translation": "当该路由是一个[子路由](#child-routing-component)时，表示该路由的父级`ActivatedRoute`。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -16300,12 +16540,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Router Event",
+    "original": "<table>\n  <tr>\n    <th>\n      Router Event",
     "translation": "路由器事件",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Description",
+    "original": "<th>\n      Description",
     "translation": "描述",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
@@ -16375,13 +16615,18 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Displays the application component for the active URL.\n        Manages navigation from one component to the next.",
-    "translation": "为激活的URL显示应用组件。管理从一个组件到另一个组件的导航",
+    "original": "<code>Router</code>",
+    "translation": "<code>Router</code>（路由器）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "A separate NgModule that provides the necessary service providers\n        and directives for navigating through application views.",
-    "translation": "一个独立的Angular模块，用于提供所需的服务提供商，以及用来在应用视图之间进行导航的指令。",
+    "original": "<code>RouterModule</code>",
+    "translation": "<code>RouterModule</code>（路由器模块）",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
+  },
+  {
+    "original": "<code>Routes</code>",
+    "translation": "<code>Routes</code>（路由数组）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -16390,8 +16635,13 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Defines how the router should navigate to a component based on a URL pattern.\n        Most routes consist of a path and a component type.",
-    "translation": "定义路由器该如何根据URL模式（pattern）来导航到组件。大多数路由都由路径和组件类构成。",
+    "original": "<code>Route</code>",
+    "translation": "<code>Route</code>（路由）",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
+  },
+  {
+    "original": "<code>RouterOutlet</code>",
+    "translation": "<code>RouterOutlet</code>（路由出口）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -16400,28 +16650,38 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "The directive for binding a clickable HTML element to\n        a route. Clicking an element with a <code>routerLink</code> directive\n        that is bound to a <i>link parameters array</i> triggers a navigation.",
-    "translation": "该指令用来把一个可点击的HTML元素绑定到路由。\n        点击带有绑定到<i>字符串</i>或<i>链接参数数组</i>的<code>routerLink</code>指令的元素就会触发一次导航。",
+    "original": "<code>RouterLink</code>",
+    "translation": "<code>RouterLink</code>（路由链接）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "The directive for adding/removing classes from an HTML element when an associated\n        <code>routerLink</code> contained on or inside the element becomes active/inactive.",
-    "translation": "当HTML元素上或元素内的<code>routerLink</code>变为激活或非激活状态时，该指令为这个HTML元素添加或移除CSS类。",
+    "original": "<code>RouterLinkActive</code>",
+    "translation": "<code>RouterLinkActive</code>（活动路由链接）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "A service that is provided to each route component that contains route specific\n        information such as route parameters, static data, resolve data, global query params, and the global fragment.",
-    "translation": "为每个路由组件提供提供的一个服务，它包含特定于路由的信息，比如路由参数、静态数据、解析数据、全局查询参数和全局碎片（fragment）。",
+    "original": "<code>ActivatedRoute</code>",
+    "translation": "<code>ActivatedRoute</code>（激活的路由）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "The current state of the router including a tree of the currently activated\n        routes together with convenience methods for traversing the route tree.",
-    "translation": "路由器的当前状态包含了一棵由程序中激活的路由构成的树。它包含一些用于遍历路由树的快捷方法。",
+    "original": "<code>RouterState</code>",
+    "translation": "<code>RouterState</code>（路由器状态）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "An array that the router interprets as a routing instruction.\n        You can bind that array toa <code>RouterLink</code>  or pass the array as an argument to\n        the <code>Router.navigate</code> method.",
-    "translation": "这个数组会被路由器解释成一个路由操作指南。我们可以把一个<code>RouterLink</code>绑定到该数组，或者把它作为参数传给<code>Router.navigate</code>方法。",
+    "original": "<b><i>Link parameters array</i></b>",
+    "translation": "<i>链接参数数组</i>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
+  },
+  {
+    "original": "<b><i>Routing component</i></b>",
+    "translation": "<b><i>路由组件</i></b>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
+  },
+  {
+    "original": "An Angular component with a <code>RouterOutlet</code> that displays views based on router navigations.",
+    "translation": "一个带有<code>RouterOutlet</code>的Angular组件，它根据路由器的导航来显示相应的视图。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -17510,23 +17770,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Member",
-    "translation": "成员",
+    "original": "<table>\n  <tr>\n    <th>\n      Member",
+    "translation": "成员\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "Description",
-    "translation": "描述",
+    "original": "<th>\n      Description",
+    "translation": "描述\n    </th>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
     "original": "Returns `true` if the parameter name is in the map of parameters.",
-    "translation": "如果参数名位于参数列表中，就返回 `true` 。",
+    "translation": "如果参数名位于参数列表中，就返回 `true` 。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
     "original": "Returns the parameter name value (a `string`) if present, or `null` if the parameter name is not in the map. Returns the _first_ element if the parameter value is actually an array of values.",
-    "translation": "如果这个map中有参数名对应的参数值（字符串），就返回它，否则返回`null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。",
+    "translation": "如果这个map中有参数名对应的参数值（字符串），就返回它，否则返回`null`。如果参数值实际上是一个数组，就返回它的*第一个*元素。\n    </td>\n  </tr>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -18921,7 +19181,7 @@
   },
   {
     "original": "Now you have given the user a safeguard against unsaved changes.",
-    "translation": "现在，我们已经给了用户一个能保护未保存更改的安全守卫。\n{@a Resolve}",
+    "translation": "现在，我们已经给了用户一个能保护未保存更改的安全守卫。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
@@ -19565,7 +19825,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
   {
-    "original": "where you can download the final source code.",
+    "original": "You've covered a lot of ground in this guide and the application is too big to reprint here.\nPlease visit the <live-example title=\"Router Sample in Plunker\"></live-example>\nwhere you can download the final source code.",
     "translation": "本章中涉及到了很多背景知识，而且本应用程序也太大了，所以没法在这里显示。请访问<live-example title=\"Router Sample in Plunker\"></live-example>，在那里你可以下载最终的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/router.md"
   },
@@ -19854,6 +20114,11 @@
     "translation": "运行<live-example></live-example>来试用本页的代码。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h2 id='report-issues'>\nReporting vulnerabilities\n</h2>",
+    "translation": "<h2 id='report-issues'>\n举报漏洞\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "To report vulnerabilities in Angular itself, email us at [security@angular.io](mailto:security@angular.io).",
     "translation": "给我们（[security@angular.io](mailto:security@angular.io)）发邮件，报告Angular本身的漏洞。",
@@ -19864,6 +20129,11 @@
     "translation": "要了解关于“谷歌如何处理安全问题”的更多信息，参见[谷歌的安全哲学](https://www.google.com/about/appsecurity/)。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h2 id='best-practices'>\nBest practices\n</h2>",
+    "translation": "<h2 id='best-practices'>\n最佳实践\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "* **Keep current with the latest Angular library releases.**\nWe regularly update the Angular libraries, and these updates may fix security defects discovered in\nprevious versions. Check the Angular [change\nlog](https://github.com/angular/angular/blob/master/CHANGELOG.md) for security-related updates.",
     "translation": "**及时把Angular包更新到最新版本。**\n我们会频繁的更新Angular库，这些更新可能会修复之前版本中发现的安全漏洞。查看Angular的[更新记录](https://github.com/angular/angular/blob/master/CHANGELOG.md)，了解与安全有关的更新。",
@@ -20014,6 +20284,11 @@
     "translation": "服务器端构造的HTML很容易受到注入攻击。当需要在服务器端生成HTML时（比如Angular应用的初始页面），\n  务必使用一个能够自动进行无害化处理以防范XSS漏洞的后端模板语言。不要在服务器端使用模板语言生成Angular模板，\n  这样会带来很高的“模板注入”风险。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h2 id='bypass-security-apis'>\n  Trusting safe values\n</h2>",
+    "translation": "<h2 id='bypass-security-apis'>\n  信任安全值\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "Sometimes applications genuinely need to include executable code, display an `<iframe>` from some\nURL, or construct potentially dangerous URLs. To prevent automatic sanitization in any of these\nsituations, you can tell Angular that you inspected a value, checked how it was generated, and made\nsure it will always be secure. But *be careful*. If you trust a value that might be malicious, you\nare introducing a security vulnerability into your application. If in doubt, find a professional\nsecurity reviewer.",
     "translation": "有时候，应用程序确实需要包含可执行的代码，比如使用URL显示`<iframe>`，或者构造出有潜在危险的URL。\n    为了防止在这种情况下被自动无害化，你可以告诉Angular：我已经审查了这个值，检查了它是怎么生成的，并确信它总是安全的。\n    但是**千万要小心**！如果你信任了一个可能是恶意的值，就会在应用中引入一个安全漏洞。如果你有疑问，请找一个安全专家复查下。",
@@ -20039,11 +20314,21 @@
     "translation": "如果需要把用户输入转换为一个可信任的值，我们可以很方便的在控制器方法中处理。下面的模板允许用户输入一个YouTube视频的ID，\n  然后把相应的视频加载到`<iframe>`中。`<iframe src>`是一个“资源URL”的安全环境，因为不可信的源码可能作为文件下载到本地，被毫无防备的用户执行。\n  所以我们要调用一个控制器方法来构造一个新的、可信任的视频URL，然后把它绑定到`<iframe src>`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h2 id='http'>\n  HTTP-level vulnerabilities\n</h2>",
+    "translation": "<h2 id='http'>\n  HTTP级别的漏洞\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "Angular has built-in support to help prevent two common HTTP vulnerabilities, cross-site request\nforgery (CSRF or XSRF) and cross-site script inclusion (XSSI). Both of these must be mitigated primarily\non the server side, but Angular provides helpers to make integration on the client side easier.",
     "translation": "Angular内置了一些支持来防范两个常见的HTTP漏洞：跨站请求伪造（XSRF）和跨站脚本包含（XSSI）。\n  这两个漏洞主要在服务器端防范，但是Angular也自带了一些辅助特性，可以让客户端的集成变得更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h3 id='xsrf'>\n  Cross-site request forgery\n</h3>",
+    "translation": "<h3 id='xsrf'>\n  跨站请求伪造（XSRF）\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "In a cross-site request forgery (CSRF or XSRF), an attacker tricks the user into visiting\na different web page (such as `evil.com`) with malignant code that secretly sends a malicious request\nto the application's web server (such as `example-bank.com`).",
     "translation": "在跨站请求伪造（XSRF或CSFR）中，攻击者欺骗用户，让他们访问一个假冒页面(例如`evil.com`)，\n该页面带有恶意代码，秘密的向你的应用程序服务器发送恶意请求(例如`example-bank.com`)。",
@@ -20089,6 +20374,11 @@
     "translation": "参见Dave Smith在<a href=\"https://www.youtube.com/watch?v=9inczw6qtpY\" target=\"_blank\" title=\"Cross Site Request Funkery Securing Your Angular Apps From Evil Doers\">AngularConnect 2016关于XSRF的演讲</a>。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h3 id='xssi'>\n  Cross-site script inclusion (XSSI)\n</h3>",
+    "translation": "<h3 id='xssi'>\n  跨站脚本包含(XSSI)\n</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "Cross-site script inclusion, also known as JSON vulnerability, can allow an attacker's website to\nread data from a JSON API. The attack works on older browsers by overriding native JavaScript\nobject constructors, and then including an API URL using a `<script>` tag.",
     "translation": "跨站脚本包含，也被称为Json漏洞，它可以允许一个攻击者的网站从JSON API读取数据。这种攻击发生在老的浏览器上，\n它重写原生JavaScript对象的构造函数，然后使用`<script>`标签包含一个API的URL。",
@@ -20109,6 +20399,11 @@
     "translation": "要学习更多这方面的知识，请参见[谷歌Web安全博客文章](https://security.googleblog.com/2011/05/website-security-for-webmasters.html)的XSSI小节。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
   },
+  {
+    "original": "<h2 id='code-review'>\n  Auditing Angular applications\n</h2>",
+    "translation": "<h2 id='code-review'>\n  审计Angular应用程序\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/security.md"
+  },
   {
     "original": "Angular applications must follow the same security principles as regular web applications, and\nmust be audited as such. Angular-specific APIs that should be audited in a security review,\nsuch as the [_bypassSecurityTrust_](guide/security#bypass-security-apis) methods, are marked in the documentation\nas security sensitive.",
     "translation": "Angular应用应该遵循和常规Web应用一样的安全原则并按照这些原则进行审计。Angular中某些应该在安全评审中被审计的API（\n比如[_bypassSecurityTrust_](guide/security#bypass-security-apis) API）都在文档中被明确标记为安全性敏感的。",
@@ -20126,7 +20421,7 @@
   },
   {
     "original": "See the <live-example name=\"set-document-title\"></live-example>.",
-    "translation": "参见",
+    "translation": "参见<live-example name=\"set-document-title\"></live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/set-document-title.md"
   },
   {
@@ -20236,12 +20531,12 @@
   },
   {
     "original": "File",
-    "translation": "文件",
+    "translation": "文件\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Purpose",
-    "translation": "用途",
+    "translation": "用途\n    </th>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20255,8 +20550,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
-    "original": "as _live examples_.",
-    "translation": "在live example中试试",
+    "original": "Try the <live-example name=\"setup\">sample application</live-example> \n      and the <live-example name=\"setup\" plnkr=\"quickstart-specs\">unit test</live-example>\n      as _live examples_.",
+    "translation": "在live example中试试<live-example name=\"setup\">范例程序</live-example>和<live-example name=\"setup\" plnkr=\"quickstart-specs\">单元测试</live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20321,7 +20616,7 @@
   },
   {
     "original": "A list of files that you can delete if you want to purge your setup of the\n      original QuickStart Seed testing and git maintenance artifacts.\n      See instructions in the optional\n      [_Deleting non-essential files_](guide/setup#non-essential \"Setup: Deleting non-essential files\") section.\n      *Do this only in the beginning to avoid accidentally deleting your own tests and git setup!*",
-    "translation": "这个列表中的文件在清理时可以删除，它是原始的“快速上手”种子工程中的测试和git维护文件。\n      步骤参见可选的[删除非必要文件](guide/setup#non-essential \"Setup: Deleting non-essential files\")部分。\n      *只在最初做这件事，以免不小心删除了你自己的测试文件和git配置！*",
+    "translation": "这个列表中的文件在清理时可以删除，它是原始的“快速上手”种子工程中的测试和git维护文件。\n      步骤参见可选的[删除非必要文件](guide/setup#non-essential \"Setup: Deleting non-essential files\")部分。\n      *只在最初做这件事，以免不小心删除了你自己的测试文件和git配置！*\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20336,17 +20631,17 @@
   },
   {
     "original": "Contains command scripts for running the application,\n      running tests, and more. Enter `npm run` for a listing.\n      <a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\"\n         title=\"npm scripts for Angular documentation samples\">Read more</a> about them.",
-    "translation": "包含了一些命令脚本，用来运行应用、运行测试与其他。输入`npm run`来查看命令列表。\n      到<a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\" \n         target=\"_blank\" title=\"Angular 文档例子的 npm 脚本\">这里</a>阅读更多关于它们的说明。",
+    "translation": "包含了一些命令脚本，用来运行应用、运行测试与其他。输入`npm run`来查看命令列表。\n      到<a href=\"https://github.com/angular/quickstart/blob/master/README.md#npm-scripts\" \n         target=\"_blank\" title=\"Angular 文档例子的 npm 脚本\">这里</a>阅读更多关于它们的说明。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Configuration for the\n      <a href=\"http://www.protractortest.org/\" title=\"Protractor: end-to-end testing for Angular\">protractor</a>\n      _end-to-end_ (e2e) test runner.",
-    "translation": "<a href=\"http://www.protractortest.org/\" target=\"_blank\" title=\"Protractor: Angular 的端对端测试\">protractor</a> *端对端* (e2e) 测试器运行器的配置。",
+    "translation": "<a href=\"http://www.protractortest.org/\" target=\"_blank\" title=\"Protractor: Angular 的端对端测试\">protractor</a> *端对端* (e2e) 测试器运行器的配置。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
     "original": "Instruction for using this git repository in your project.\n      Worth reading before deleting.",
-    "translation": "项目中使用这个 git 库的说明。\n      在删除前值得阅读。",
+    "translation": "项目中使用这个 git 库的说明。\n      在删除前值得阅读。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20361,7 +20656,7 @@
   },
   {
     "original": "Don't touch this file unless you are fully versed in SystemJS configuration.",
-    "translation": "除非你完全理解 SystemJS 的配置，不要修改它。",
+    "translation": "除非你完全理解 SystemJS 的配置，不要修改它。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20381,7 +20676,7 @@
   },
   {
     "original": "This file defines linting rules favored by the \n      [Angular style guide](guide/styleguide) and by the authors of the documentation.",
-    "translation": "该文件定义了 [Angular 风格指南](guide/styleguide)与本文档站作者喜爱的语法检查规则。",
+    "translation": "该文件定义了 [Angular 风格指南](guide/styleguide)与本文档站作者喜爱的语法检查规则。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -20424,6 +20719,11 @@
     "translation": "## 下载",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"Download the QuickStart seed repository\">Download the QuickStart seed</a>\nand unzip it into your project folder. Then perform the remaining steps with these terminal commands.",
+    "translation": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"下载《快速上手》种子库\">下载《快速上手》种子</a>\n并解压到你的项目目录中。然后执行下面的命令完成剩余步骤。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
+  },
   {
     "original": "`npm start` fails in _Bash for Windows_ in versions earlier than the Creator's Update (April 2017).",
     "translation": "在*Bash for Windows*中`npm start`可能会失败，因为到2017-01为止它还不支持访问网络上的服务器。",
@@ -20506,7 +20806,7 @@
   },
   {
     "original": "Defines `AppModule`, the [root module](guide/bootstrapping \"AppModule: the root module\") that tells Angular how to assemble the application.\n      Right now it declares only the `AppComponent`. \n      Soon there will be more components to declare.",
-    "translation": "定义`AppModule`，[根模块](guide/bootstrapping \"AppModule: 根模块\")为 Angular 描述如何组装应用。\n      目前，它只声明了`AppComponent`。\n      不久，它将声明更多组件。",
+    "translation": "定义`AppModule`，[根模块](guide/bootstrapping \"AppModule: 根模块\")为 Angular 描述如何组装应用。\n      目前，它只声明了`AppComponent`。\n      不久，它将声明更多组件。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
   },
   {
@@ -20534,6 +20834,11 @@
     "translation": "Node.js 和 npm 对使用 Angular 和其他平台进行现代网络开发是至关重要的。\nNode 驱动客户端开发和构建工具。\n*npm* 包管理器本身是 *node* 应用，用于安装 JavaScript 库。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"Installing Node.js and updating npm\">\n</a> if they're not already installed on your machine.",
+    "translation": "如果你的电脑没有安装它们，<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"安装 Node.js 和更新 npm\">\n立刻安装它们</a>。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
+  },
   {
     "original": "**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**\nby running the commands `node -v` and `npm -v` in a terminal/console window.\nOlder versions produce errors.",
     "translation": "在终端/控制器窗口运行命令`node -v`和`npm -v`，来**确认你运行的 node 是`v4.x.x`或更高，npm 为`3.x.x`或更高。**\n老版本会产生错误。",
@@ -20549,6 +20854,11 @@
     "translation": "## 附录：为何在本地开发",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
   },
+  {
+    "original": "<live-example title=\"QuickStart Seed in Plunker\">Live coding</live-example> in the browser is a great way to explore Angular.",
+    "translation": "在浏览器中<live-example title=\"QuickStart Seed in Plunker\">在线编程</live-example>是很好的探索 Angular 的方法。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/setup.md"
+  },
   {
     "original": "Links on almost every documentation page open completed samples in the browser.\nYou can play with the sample code, share your changes with friends, and download and run the code on your own machine.",
     "translation": "几乎每章文档里面的链接都在浏览器中打开完整的例子。\n你可以用这些代码做实验，或者与朋友共享你的修改，或者下载并在你自己的电脑上运行这些代码。",
@@ -21414,6 +21724,11 @@
     "translation": "随着应用程序的成长，本法则会变得越来越重要。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Small functions",
     "translation": "### 小函数",
@@ -21459,6 +21774,11 @@
     "translation": "**为何？**简单函数可避免易在大函数中产生的隐蔽性错误，例如与外界共享变量、创建意外的闭包或与依赖之间产生意外耦合等。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Naming",
     "translation": "## 命名",
@@ -21504,6 +21824,11 @@
     "translation": "**为何？**目录名和文件名应该清楚的传递它们的意图。\n例如，`app/heroes/hero-list.component.ts`包含了一个用来管理英雄列表的组件。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Separate file names with dots and dashes",
     "translation": "### 使用点和横杠来分隔文件名",
@@ -21554,6 +21879,11 @@
     "translation": "**为何？**为自动化任务提供模式匹配。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Symbols and file names",
     "translation": "### 符号名与文件名",
@@ -21604,6 +21934,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Service names",
     "translation": "### 服务名",
@@ -21654,6 +21989,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Bootstrapping",
     "translation": "### 引导",
@@ -21689,6 +22029,11 @@
     "translation": "**为何？**这是从其它技术平台借鉴的常用约定。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Directive selectors",
     "translation": "### 指令选择器",
@@ -21714,6 +22059,11 @@
     "translation": "**为何？**Angular HTML 解析器是大小写敏感的，它识别小写驼峰写法。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Custom prefix for components",
     "translation": "### 为组件添加自定义前缀",
@@ -21784,6 +22134,11 @@
     "translation": "**为何？**指令更加容易被识别。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Pipe names",
     "translation": "### 管道名",
@@ -21814,6 +22169,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Unit test file names",
     "translation": "### 单元测试文件名",
@@ -21845,28 +22205,33 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
-    "original": "Test Type",
+    "original": "<th>\n      Test Type",
     "translation": "测试类型",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
-    "original": "File Names",
+    "original": "<th>\n      File Names",
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
     "original": "Components",
-    "translation": "组件",
+    "translation": "组件\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
     "original": "Services",
-    "translation": "服务",
+    "translation": "服务\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
     "original": "Pipes",
-    "translation": "管道",
+    "translation": "管道\n    </td>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
@@ -21895,18 +22260,23 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
-    "original": "Test Type",
+    "original": "<th>\n      Test Type",
     "translation": "测试类型",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
-    "original": "File Names",
+    "original": "<th>\n      File Names",
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
     "original": "End-to-End Tests",
-    "translation": "端到端测试",
+    "translation": "端到端测试\n    </td>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
@@ -21964,6 +22334,11 @@
     "translation": "**为何？**`RoutingModule`是一种专门用来配置 Angular 路由器的模块。\n“类名和文件名保持一致”的约定使这些模块易于发现和验证。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Coding conventions",
     "translation": "## 编程约定",
@@ -21999,6 +22374,11 @@
     "translation": "**为何？**类可以被实例化和构造实例。根据约定，用大写驼峰命名法来标识可构造的东西。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Constants",
     "translation": "### 常量",
@@ -22049,6 +22429,11 @@
     "translation": "**为何？**传统的大写蛇形命名法仍然很流行、很普遍，特别是在第三方模块中。\n修改它们没多大价值，还会有破坏现有代码和文档的风险。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Interfaces",
     "translation": "### 接口",
@@ -22094,6 +22479,11 @@
     "translation": "**为何？**在 Angular 依赖注入系统中，接口类可以作为服务提供商的查找令牌。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Properties and methods",
     "translation": "### 属性和方法",
@@ -22129,6 +22519,11 @@
     "translation": "**为何？** TypeScript 工具让识别私有或公有属性和方法变得很简单。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Import line spacing",
     "translation": "### 导入语句中的空行",
@@ -22164,6 +22559,11 @@
     "translation": "**为何？**按字母顺序排列可以让阅读和定位本地导入更加容易。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Application structure and NgModules",
     "translation": "## 应用程序结构与 Angular 模块",
@@ -22184,6 +22584,11 @@
     "translation": "所有内容都遵循每个文件一个特性的原则。每个组件、服务和管道都在自己的文件里。\n所有第三方程序包保存到其它目录里，而不是`src`目录。\n你不会修改它们，所以不希望它们弄乱我们的应用程序。\n使用本指南介绍的文件命名约定。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "#### Style 04-01",
     "translation": "#### 风格 04-01",
@@ -22204,6 +22609,11 @@
     "translation": "**为何？**LIFT提供了一致的结构，它具有扩展性强、模块化的特性。因为容易快速锁定代码，提高了开发者的效率。\n另外，检查应用结构是否合理的方法是问问自己：我们能快速打开与此特性有关的所有文件并开始工作吗？",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Locate",
     "translation": "### 定位",
@@ -22224,6 +22634,11 @@
     "translation": "**为何？**\n要想高效的工作，就必须能迅速找到文件，特别是当不知道（或不记得）文件*名*时。\n把相关的文件一起放在一个直观的位置可以节省时间。\n富有描述性的目录结构会让你和后面的维护者眼前一亮。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Identify",
     "translation": "### 识别",
@@ -22259,6 +22674,11 @@
     "translation": "当你有一组小型、紧密相关的特性时，违反*一物一文件*的规则可能会更好，\n这种情况下单一文件可能会比多个文件更容易发现和理解。注意这个例外。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Flat",
     "translation": "### 扁平",
@@ -22290,7 +22710,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
   {
-    "original": "On the other hand,\n<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\">psychologists believe</a>\nthat humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
+    "original": "that humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
     "translation": "另一方面，<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\" target=\"_blank\">心理学家们相信</a>，\n当关注的事物超过 9 个时，人类就会开始感到吃力。\n所以，当一个文件夹中的文件有 10 个或更多个文件时，可能就是创建子目录的时候了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
@@ -22299,6 +22719,11 @@
     "translation": "还是根据你自己的舒适度而定吧。\n除非创建新文件夹能有显著的价值，否则尽量使用扁平结构。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### _T-DRY_ (Try to be _DRY_)",
     "translation": "### *T-DRY*（尽量不重复自己）",
@@ -22324,6 +22749,11 @@
     "translation": "**为何？**虽然 DRY 很重要，但如果要以牺牲 LIFT 的其它原则为代价，那就不值得了。\n这也就是为什么它被称为 *T-DRY*。\n例如，把组件命名为`hero-view.component.html`是多余的，因为带有`.html`扩展名的文件显然就是一个视图 (view)。\n但如果它不那么显著，或不符合常规，就把它写出来。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Overall structural guidelines",
     "translation": "### 总体结构的指导原则",
@@ -22374,6 +22804,11 @@
     "translation": "把组件放在专用目录中的方式广受欢迎，对于小型应用，还可以保持组件扁平化（而不是放在专用目录中）。\n这样会把四个文件放在现有目录中，也会减少目录的嵌套。无论你如何选择，请保持一致。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### _Folders-by-feature_ structure",
     "translation": "### 按特性组织的目录结构",
@@ -22424,6 +22859,16 @@
     "translation": "**为何？**Angular 模块隔离、测试和复用特性更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<div class='file-tree-reference'>\n  <a href=\"#file-tree\">Refer to this _folder and file structure_ example.</a>  <a href=\"#file-tree\">点这里查看目录和文件结构的范例</a>\n</div>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### App _root module_",
     "translation": "### 应用的*根模块*",
@@ -22454,6 +22899,11 @@
     "translation": "**为何？**能让定位和识别根模块变得更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Feature modules",
     "translation": "### 特性模块",
@@ -22514,6 +22964,11 @@
     "translation": "**为何？**特性模块易于隔离，以便测试。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Shared feature module",
     "translation": "### 共享特性模块",
@@ -22584,6 +23039,11 @@
     "translation": "**为何？**对于单例服务，你不希望每个模块都有自己的实例。\n而如果`SharedModule`提供了一个服务，那就有可能发生这种情况。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Core feature module",
     "translation": "### 核心特性模块",
@@ -22674,6 +23134,11 @@
     "translation": "`AppModule`变得更小了，因为很多应用根部的类都被移到了其它模块中。\n`AppModule`变得稳定了，因为你将会往其它模块中添加特性组件和服务提供商，而不是这个`AppModule`。\n`AppModule`把工作委托给了导入的模块，而不是亲力亲为。\n`AppModule`聚焦在它自己的主要任务上：作为整个应用的总指挥。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Prevent re-import of the core module",
     "translation": "### 防止多次导入`CoreModule`",
@@ -22704,6 +23169,11 @@
     "translation": "**为何？**守卫会禁止创建单例服务的多个实例。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Lazy Loaded folders",
     "translation": "### 惰性加载的目录",
@@ -22729,6 +23199,11 @@
     "translation": "**为何？**这种目录让标识和隔离这些特性内容变得更轻松。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Never directly import lazy loaded folders",
     "translation": "### 永远不要直接导入惰性加载的目录",
@@ -22749,6 +23224,11 @@
     "translation": "**为何？**直接导入并使用此模块会立即加载它，而原本的设计意图是按需加载它。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Components",
     "translation": "## 组件",
@@ -22774,6 +23254,11 @@
     "translation": "**为何？**保持元素命名与[自定义元素](https://www.w3.org/TR/custom-elements/)命名规范一致。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Components as elements",
     "translation": "### 把组件当做元素",
@@ -22799,6 +23284,11 @@
     "translation": "**为何？**查看组件模板的 HTML 时，更容易识别一个符号是组件还是指令。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Extract templates and styles to their own files",
     "translation": "### 把模板和样式提取到它们自己的文件",
@@ -22849,6 +23339,11 @@
     "translation": "**为何？**`./`前缀是相对URL的标准语法，不必依赖Angular的特殊处理，如果没有前缀则不行。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Decorate _input_ and _output_ properties",
     "translation": "### 内联输入和输出属性装饰器",
@@ -22889,6 +23384,11 @@
     "translation": "**为何？**把装饰器放到同一行可以精简代码，同时更易于识别输入或输出属性。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Avoid aliasing _inputs_ and _outputs_",
     "translation": "### 避免为输入和输出属性指定别名",
@@ -22914,6 +23414,11 @@
     "translation": "**为何？**如果指令名也同时用作*输入*属性，而且指令名无法准确描述这个属性的用途时，应该使用别名。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Member sequence",
     "translation": "### 成员顺序",
@@ -22939,6 +23444,11 @@
     "translation": "**为何？**把类的成员按照统一的顺序排列，易于阅读，能立即识别出组件的哪个成员服务于何种目的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Delegate complex component logic to services",
     "translation": "### 把逻辑放到服务里",
@@ -22979,6 +23489,11 @@
     "translation": "**为何？**保持组件苗条、精简和聚焦。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Don't prefix _output_ properties",
     "translation": "### 不要给输出属性加前缀",
@@ -23009,6 +23524,11 @@
     "translation": "**为何？**Angular 允许[另一种备选语法](guide/template-syntax#binding-syntax) `on-*`。如果事件的名字本身带有前缀`on`，那么绑定的表达式可能是`on-onEvent`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Put presentation logic in the component class",
     "translation": "### 把表现层逻辑放到组件类里",
@@ -23034,6 +23554,11 @@
     "translation": "**为何？**将组件的表现层逻辑放到组件类而非模板里，可以增强测试性、维护性和重复使用性。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Directives",
     "translation": "## 指令",
@@ -23064,6 +23589,11 @@
     "translation": "**为何？**一个元素可以使用多个属性型指令。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### _HostListener_/_HostBinding_ decorators versus _host_ metadata",
     "translation": "### *HostListener* 和 *HostBinding* 装饰器 vs. 组件元数据 *host*",
@@ -23099,6 +23629,11 @@
     "translation": "**为何？**`host`元数据只是一个便于记忆的名字而已，并不需要额外的 ES 导入。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Services",
     "translation": "## 服务",
@@ -23129,6 +23664,11 @@
     "translation": "**为何？**服务是共享状态性内存数据的理想载体。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Single responsibility",
     "translation": "### 单一职责",
@@ -23159,6 +23699,11 @@
     "translation": "**为何？**当某个服务有多个职责时，每个注入它的组件或服务都会承担这些职责的全部开销。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Providing a service",
     "translation": "### 提供一个服务",
@@ -23179,6 +23724,11 @@
     "translation": "**为何？** Angular 注入器是层次化的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<div class=\"s-why\">",
+    "translation": "**Why?** When providing the service to a top level component, \nthat instance is shared and available to all child components of that top level component.**为何？**在顶层组件提供服务时，该服务实例在所有子组件中可见并共享。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "**Why?** This is ideal when a service is sharing methods or state.",
     "translation": "**为何？**服务是共享方法或状态的理想载体。",
@@ -23189,6 +23739,11 @@
     "translation": "**为何？**当不同的两个组件需要一个服务的不同的实例时，上面的方法这就不理想了。在这种情况下，对于需要崭新和单独服务实例的组件，最好在组件级提供服务。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Use the @Injectable() class decorator",
     "translation": "### 使用 @Injectable() 类装饰器",
@@ -23214,6 +23769,11 @@
     "translation": "**为何？**当服务只接受类型令牌相关的依赖时，比起在每个构造函数参数上使用`@Inject()`，`@Injectable()`的语法简洁多了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Data Services",
     "translation": "## 数据服务",
@@ -23259,6 +23819,11 @@
     "translation": "数据服务应该封装这些细节。这样，在服务内部修改细节，就不会影响到它的消费者。并且更容易通过实现一个模拟服务来对消费者进行测试。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Lifecycle hooks",
     "translation": "## 生命周期钩子",
@@ -23269,6 +23834,11 @@
     "translation": "使用生命周期钩子来介入到 Angular 暴露的重要事件里。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### Implement lifecycle hook interfaces",
     "translation": "### 实现生命周期钩子接口",
@@ -23289,6 +23859,11 @@
     "translation": "**为何？**如果使用强类型的方法签名，编译器和编辑器可以帮你揪出拼写错误。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "## Appendix",
     "translation": "## 附录",
@@ -23299,6 +23874,11 @@
     "translation": "有用的 Angular 工具和小提示",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "#### Style A-01",
     "translation": "#### 风格 A-01",
@@ -23314,6 +23894,11 @@
     "translation": "**考虑**调整 codelyzer 的规则来满足你的需求。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "### File templates and snippets",
     "translation": "### 文档模板和代码片段",
@@ -23349,6 +23934,11 @@
     "translation": "**考虑**使用 [Vim](http://www.vim.org/) 的[代码片断](https://github.com/mhartington/vim-angular2-snippets)来实施本风格指南。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\"class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#toc\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/styleguide.md"
+  },
   {
     "original": "# Template Syntax",
     "translation": "# 模板语法",
@@ -23474,6 +24064,16 @@
     "translation": "赋值 (`=`, `+=`, `-=`, ...)",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
+  {
+    "original": "* chaining expressions with <code>;</code> or <code>,</code>",
+    "translation": "使用`;`或`,`的链式表达式",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators (`++` and `--`)",
     "translation": "自增或自减操作符 (`++`和`--`)",
@@ -23649,6 +24249,11 @@
     "translation": "然而，某些 JavaScript 语法仍然是不允许的：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators, `++` and `--`",
     "translation": "自增和自减运算符：`++`和`--`",
@@ -23779,6 +24384,26 @@
     "translation": "样式",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "One-way",
+    "translation": "单向",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
+  {
+    "original": "from view target",
+    "translation": "从视图目标",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
+  {
+    "original": "to data source",
+    "translation": "到数据源",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
+  {
+    "original": "<div class=\"alert is-important\">",
+    "translation": "译注：由于 HTML attribute 和 DOM property 在中文中都被翻译成了“属性”，无法区分，\n而接下来的部分重点是对它们进行比较。",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "Binding types other than interpolation have a **target name** to the left of the equal sign,\neither surrounded by punctuation (`[]`, `()`) or preceded by a prefix (`bind-`, `on-`, `bindon-`).",
     "translation": "除了插值表达式之外的绑定类型，在等号左边是**目标名**，\n  无论是包在括号中 (`[]`、`()`) 还是用前缀形式 (`bind-`、`on-`、`bindon-`) 。",
@@ -24259,6 +24884,11 @@
     "translation": "插值表达式处理 script 标签与属性绑定有所不同，但是二者都只渲染没有危害的内容。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "<figure>\n  <img src='generated/images/guide/template-syntax/evil-title.png' alt=\"evil title made safe\">\n</figure>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "## Attribute, class, and style bindings",
     "translation": "## attribute、class 和 style 绑定",
@@ -24309,11 +24939,6 @@
     "translation": "会得到这个错误：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
-  {
-    "original": "",
-    "translation": "Template parse errors:\n  Can't bind to 'colspan' since it isn't a known native property\n  （模板解析错误：不能绑定到 'colspan'，因为它不是已知的原生属性）",
-    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
-  },
   {
     "original": "As the message says, the `<td>` element does not have a `colspan` property.\nIt has the \"colspan\" *attribute*, but\ninterpolation and property binding can set only *properties*, not attributes.",
     "translation": "正如提示中所说，`<td>`元素没有`colspan`属性。\n  但是插值表达式和属性绑定只能设置*属性*，不能设置 attribute。",
@@ -24509,6 +25134,11 @@
     "translation": "如果事件属于指令（回想一下，组件是指令的一种），那么`$event`具体是什么由指令决定。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "### Custom events with <span class=\"syntax\">EventEmitter</span>",
+    "translation": "### 使用 <span class=\"syntax\">EventEmitter</span> 实现自定义事件",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "Directives typically raise custom events with an Angular [EventEmitter](api/core/EventEmitter).\nThe directive creates an `EventEmitter` and exposes it as a property.\nThe directive calls `EventEmitter.emit(payload)` to fire an event, passing in a message payload, which can be anything.\nParent directives listen for the event by binding to this property and accessing the payload through the `$event` object.",
     "translation": "通常，指令使用 Angular [EventEmitter](api/core/EventEmitter) 来触发自定义事件。\n指令创建一个`EventEmitter`实例，并且把它作为属性暴露出来。\n指令调用`EventEmitter.emit(payload)`来触发事件，可以传入任何东西作为消息载荷。\n父指令通过绑定到这个属性来监听事件，并通过`$event`对象来访问载荷。",
@@ -24764,6 +25394,11 @@
     "translation": "你既可以在初始化时调用`setCurrentStyles()`，也可以在所依赖的属性变化时调用。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "### NgModel - Two-way binding to form elements with <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "### NgModel - 使用<span class=\"syntax\">[(ngModel)]</span>双向绑定到表单元素",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "When developing data entry forms, you often both display a data property and\nupdate that property when the user makes changes.",
     "translation": "当开发数据输入表单时，我们通常都要既显示数据属性又根据用户的更改去修改那个属性。",
@@ -24789,6 +25424,11 @@
     "translation": "导入`FormsModule`并让`[(ngModel)]`可用的代码如下：",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "#### Inside <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "#### <span class=\"syntax\">[(ngModel)]</span>内幕",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "Looking back at the `name` binding, note that\nyou could have achieved the same result with separate bindings to\nthe `<input>` element's  `value` property and `input` event.",
     "translation": "回头看看`name`绑定，注意，你可以通过分别绑定到`<input>`元素的`value`属性和`input`事件来达到同样的效果。",
@@ -25119,6 +25759,11 @@
     "translation": "有了`trackBy`，则只有修改了`id`的按钮才会触发元素替换。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "<figure >\n  <img src=\"generated/images/guide/template-syntax/ng-for-track-by-anim.gif\" alt=\"trackBy\">\n</figure>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "### The _NgSwitch_ directives",
     "translation": "### `NgSwitch`指令",
@@ -25189,6 +25834,11 @@
     "translation": "我们可以在模板中的任何地方引用模板引用变量。\n比如声明在`<input>`上的`phone`变量就是在模板另一侧的`<button>`上使用的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">How a reference variable gets its value</h3>",
+    "translation": "### 模板引用变量怎么得到它的值？",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "In most cases, Angular sets the reference variable's value to the element on which it was declared.\nIn the previous example, `phone` refers to the _phone number_ `<input>` box.\nThe phone button click handler passes the _input_ value to the component's `callPhone` method.\nBut a directive can change that behavior and set the value to something else, such as itself.\nThe `NgForm` directive does that.",
     "translation": "大多数情况下，Angular会把模板引用变量的值设置为声明它的那个元素。\n在上一个例子中，`phone`引用的是表示*电话号码*的`<input>`框。\n\"拨号\"按钮的点击事件处理器把这个*input*值传给了组件的`callPhone`方法。\n不过，指令也可以修改这种行为，让这个值引用到别处，比如它自身。\n`NgForm`指令就是这么做的。",
@@ -25214,6 +25864,11 @@
     "translation": "原生的`<form>`元素没有`form`属性，但`NgForm`指令有。这就解释了为何当`heroForm.form.valid`是无效时我们可以禁用提交按钮，\n并能把整个表单控件树传给父组件的`onSubmit`方法。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Template reference variable warning notes</h3>",
+    "translation": "<h3 class=\"no-toc\">关于模板引用变量的提醒</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "A template _reference_ variable (`#phone`) is _not_ the same as a template _input_ variable (`let phone`)\nsuch as you might see in an [`*ngFor`](guide/template-syntax#template-input-variable).\nLearn the difference in the [_Structural Directives_](guide/structural-directives#template-input-variable) guide.",
     "translation": "模板*引用*变量 (`#phone`) 和[`*ngFor`](guide/template-syntax#template-input-variable)部分看到过的模板*输入*变量 (`let phone`) 是不同的。\n要了解详情，参见[结构型指令](guide/structural-directives#template-input-variable)一章。",
@@ -25504,6 +26159,11 @@
     "translation": "如果我们打开了严格控制检测，那就要用到这个模板操作符，而其它情况下则是可选的。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
   },
+  {
+    "original": "<a href=\"#top-of-page\">back to top</a>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/template-syntax.md"
+  },
   {
     "original": "## Summary",
     "translation": "## 小结",
@@ -25636,7 +26296,7 @@
   },
   {
     "original": "The [karma test runner](https://karma-runner.github.io/1.0/index.html)\n      is ideal for writing and running unit tests while developing the application.\n      It can be an integral part of the project's development and continuous integration processes.\n      This guide describes how to set up and run tests with karma.",
-    "translation": "[karma测试运行器](https://karma-runner.github.io/1.0/index.html)是在开发应用的过程中\n      编写和运行单元测试的理想工具。\n      它能成为项目开发和连续一体化进程的不可分割的一部分。本章讲述了如何用Karma设置和运行测试程序。",
+    "translation": "[karma测试运行器](https://karma-runner.github.io/1.0/index.html)是在开发应用的过程中\n      编写和运行单元测试的理想工具。\n      它能成为项目开发和连续一体化进程的不可分割的一部分。本章讲述了如何用Karma设置和运行测试程序。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -25975,7 +26635,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
-    "original": "The **`By`** class is an Angular testing utility that produces useful predicates.\nIts `By.css` static method produces a\n<a href=\"https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors\">standard CSS selector</a>\npredicate that filters the same way as a jQuery selector.",
+    "original": "predicate that filters the same way as a jQuery selector.",
     "translation": "**`By`**类是Angular测试工具之一，它生成有用的predicate。\n它的`By.css`静态方法产生<a href=\"https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors\" target=\"_blank\">标准CSS选择器</a>\npredicate，与JQuery选择器相同的方式过滤。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
@@ -26074,6 +26734,11 @@
     "translation": "与其怀疑测试工具会不会执行变更检测，本章中的例子**总是显式**调用`detectChanges()`。\n即使是在不需要的时候，频繁调用`detectChanges()`没有任何什么坏处。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
+  },
   {
     "original": "## Test a component with an external template",
     "translation": "## 测试带有外部模板的组件",
@@ -26209,6 +26874,11 @@
     "translation": "这样做也没坏处，如果你将来可能会把模板重构到独立的文件中去，那就可以调用`compileComponents`。\n不过本章中的这些测试只会在必要时才调用`compileComponents`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
+  {
+    "original": "</div>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
+  },
   {
     "original": "## Test a component with a dependency",
     "translation": "## 测试有依赖的组件",
@@ -26725,7 +27395,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
-    "original": "The first parameter is the _element-to-click_. If you wish, you can pass a\ncustom event object as the second parameter. The default is a (partial)\n<a href=\"https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button\">left-button mouse event object</a>\naccepted by many handlers including the `RouterLink` directive.",
+    "original": "accepted by many handlers including the `RouterLink` directive.",
     "translation": "第一个参数是**用来点击的元素**。如果你愿意，可以将自定义的事件对象传递给第二个参数。\n默认的是（局部的）<a href=\"https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button\" target=\"_blank\">鼠标左键事件对象</a>，\n它被许多事件处理器接受，包括`RouterLink`指令。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
@@ -26909,6 +27579,11 @@
     "translation": "不要在调用`inject`以后再试图配置`TestBed`。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
+  {
+    "original": "<a href=\"#top\" class='to-top'>Back to top</a>",
+    "translation": "<a href=\"#top\" class='to-top'>回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
+  },
   {
     "original": "### Test a routed component with parameters",
     "translation": "### 测试带有路由和路由参数的组件\nClicking a _Dashboard_ hero triggers navigation to `heroes/:id`, where `:id`\nis a route parameter whose value is the `id` of the hero to edit. \nThat URL matches a route to the `HeroDetailComponent`.",
@@ -27831,12 +28506,12 @@
   },
   {
     "original": "Runs the body of a test (`it`) or setup (`beforeEach`) function within a special _async test zone_.\n      See [discussion above](guide/testing#async).",
-    "translation": "在特殊的**async测试区域**运行测试程序（`it`)或者设置（`beforeEach`）的主体。\n      参见[上面的讨论](guide/testing#async).",
+    "translation": "在特殊的**async测试区域**运行测试程序（`it`)或者设置（`beforeEach`）的主体。\n      参见[上面的讨论](guide/testing#async).\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Runs the body of a test (`it`) within a special _fakeAsync test zone_, enabling\n      a linear control flow coding style. See [discussion above](guide/testing#fake-async).",
-    "translation": "在特殊的**fakeAsync测试区域**运行测试程序（`it`）的主体，造就控制流更加线性的代码风格。\n      参见[上面的讨论](guide/testing#fake-async).",
+    "translation": "在特殊的**fakeAsync测试区域**运行测试程序（`it`）的主体，造就控制流更加线性的代码风格。\n      参见[上面的讨论](guide/testing#fake-async).\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -27956,27 +28631,27 @@
   },
   {
     "original": "Create an instance of a component of type `T` based on the current `TestBed` configuration.\n      After calling `compileComponent`, the `TestBed` configuration is frozen for the duration of the current spec.",
-    "translation": "基于当前`TestBed`的配置创建一个类型为T的组件实例。\n      一旦调用，`TestBed`的配置就会在当前测试期间被冻结。",
+    "translation": "基于当前`TestBed`的配置创建一个类型为T的组件实例。\n      一旦调用，`TestBed`的配置就会在当前测试期间被冻结。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given `NgModule`. Recall that modules can import other modules.\n      The `overrideModule` method can reach deeply into the current testing module to\n      modify one of these inner modules.",
-    "translation": "替换指定的`NgModule`的元数据。回想一下，模块可以导入其他模块。\n      `overrideModule`方法可以深入到当前测试模块深处，修改其中一个内部模块。",
+    "translation": "替换指定的`NgModule`的元数据。回想一下，模块可以导入其他模块。\n      `overrideModule`方法可以深入到当前测试模块深处，修改其中一个内部模块。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given component class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定组件类的元数据，该组件类可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定组件类的元数据，该组件类可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given directive class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定指令类的元数据，该指令可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定指令类的元数据，该指令可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Replace metadata for the given pipe class, which could be nested deeply\n      within an inner module.",
-    "translation": "替换指定管道类的元数据，该管道可能嵌套在一个很深的内部模块中。",
+    "translation": "替换指定管道类的元数据，该管道可能嵌套在一个很深的内部模块中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28016,7 +28691,7 @@
   },
   {
     "original": "Specify the Angular compiler factory, a `PlatformRef`, and a default Angular testing module.\n      Alternatives for non-browser platforms are available in the general form\n      `@angular/platform-<platform_name>/testing/<platform_name>`.",
-    "translation": "指定Angular编译器工厂，`PlatformRef`，和默认Angular测试模块。\n      以`@angular/platform-<platform_name>/testing/<platform_name>`的形式提供非浏览器平台的替代品。",
+    "translation": "指定Angular编译器工厂，`PlatformRef`，和默认Angular测试模块。\n      以`@angular/platform-<platform_name>/testing/<platform_name>`的形式提供非浏览器平台的替代品。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28066,7 +28741,7 @@
   },
   {
     "original": "The instance of the component class created by `TestBed.createComponent`.",
-    "translation": "被`TestBed.createComponent`创建的组件类实例。",
+    "translation": "被`TestBed.createComponent`创建的组件类实例。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28076,12 +28751,12 @@
   },
   {
     "original": "The `debugElement` provides insight into the component and its DOM element during test and debugging.\n      It's a critical property for testers. The most interesting members are covered [below](guide/testing#debug-element-details).",
-    "translation": "`debugElement`在测试和调试期间，提供对组件及其DOM元素的访问。\n      它是测试者至关重要的属性。它最有用的成员在[下面](guide/testing#debug-element-details)有所介绍。",
+    "translation": "`debugElement`在测试和调试期间，提供对组件及其DOM元素的访问。\n      它是测试者至关重要的属性。它最有用的成员在[下面](guide/testing#debug-element-details)有所介绍。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "The native DOM element at the root of the component.",
-    "translation": "组件的原生根DOM元素。",
+    "translation": "组件的原生根DOM元素。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28131,7 +28806,7 @@
   },
   {
     "original": "Runs `checkNoChanges`afterwards to confirm that there are no circular updates unless\n      called as `detectChanges(false)`;",
-    "translation": "之后，运行`checkNoChanges`，来确认没有循环更新，除非它被这样调用：`detectChanges(false)`。",
+    "translation": "之后，运行`checkNoChanges`，来确认没有循环更新，除非它被这样调用：`detectChanges(false)`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28151,12 +28826,12 @@
   },
   {
     "original": "Do a change detection run to make sure there are no pending changes.\n      Throws an exceptions if there are.",
-    "translation": "运行一次变更检测来确认没有待处理的变化。如果有未处理的变化，它将抛出一个错误。",
+    "translation": "运行一次变更检测来确认没有待处理的变化。如果有未处理的变化，它将抛出一个错误。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "If the fixture is currently _stable_, returns `true`.\n      If there are async tasks that have not completed, returns `false`.",
-    "translation": "如果fixture当前是**稳定的**，则返回`true`。\n      如果有异步任务没有完成，则返回`false`。",
+    "translation": "如果fixture当前是**稳定的**，则返回`true`。\n      如果有异步任务没有完成，则返回`false`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28166,7 +28841,7 @@
   },
   {
     "original": "To resume testing after completion of asynchronous activity or\n      asynchronous change detection, hook that promise.\n      See [above](guide/testing#when-stable).",
-    "translation": "钩住这个承诺，以在异步行为或者异步变更检测之后继续测试。参见[上面](guide/testing#when-stable)。",
+    "translation": "钩住这个承诺，以在异步行为或者异步变更检测之后继续测试。参见[上面](guide/testing#when-stable)。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28206,27 +28881,27 @@
   },
   {
     "original": "The corresponding DOM element in the browser (null for WebWorkers).",
-    "translation": "与浏览器中DOM元素对应（WebWorkers时，值为null）。",
+    "translation": "与浏览器中DOM元素对应（WebWorkers时，值为null）。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Calling `query(predicate: Predicate<DebugElement>)` returns the first `DebugElement`\n      that matches the [predicate](guide/testing#query-predicate) at any depth in the subtree.",
-    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中第一个匹配[predicate](guide/testing#query-predicate)的`DebugElement`。",
+    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中第一个匹配[predicate](guide/testing#query-predicate)的`DebugElement`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "Calling `queryAll(predicate: Predicate<DebugElement>)` returns all `DebugElements`\n      that matches the [predicate](guide/testing#query-predicate) at any depth in subtree.",
-    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中所有匹配[predicate](guide/testing#query-predicate)`DebugElement`。",
+    "translation": "调用`query(predicate: Predicate<DebugElement>)`返回子树所有层中所有匹配[predicate](guide/testing#query-predicate)`DebugElement`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "The host dependency injector.\n      For example, the root element's component instance injector.",
-    "translation": "宿主依赖注入器。\n      比如，根元素的组件实例注入器。",
+    "translation": "宿主依赖注入器。\n      比如，根元素的组件实例注入器。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
     "original": "The element's own component instance, if it has one.",
-    "translation": "元素自己的组件实例（如果有）。",
+    "translation": "元素自己的组件实例（如果有）。  \n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28236,7 +28911,7 @@
   },
   {
     "original": "When an element is repeated within `*ngFor`, the context is an `NgForRow` whose `$implicit`\n      property is the value of the row instance value.\n      For example, the `hero` in `*ngFor=\"let hero of heroes\"`.",
-    "translation": "当一个元素被`*ngFor`重复，它的上下文为`NgForRow`，它的`$implicit`属性值是该行的实例值。\n      比如，`*ngFor=\"let hero of heroes\"`里的`hero`。",
+    "translation": "当一个元素被`*ngFor`重复，它的上下文为`NgForRow`，它的`$implicit`属性值是该行的实例值。\n      比如，`*ngFor=\"let hero of heroes\"`里的`hero`。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28271,7 +28946,7 @@
   },
   {
     "original": "This component's injector lookup tokens.\n      Includes the component itself plus the tokens that the component lists in its `providers` metadata.",
-    "translation": "组件注入器的查询令牌。\n      包括组件自己的令牌和组件的`providers`元数据中列出来的令牌。",
+    "translation": "组件注入器的查询令牌。\n      包括组件自己的令牌和组件的`providers`元数据中列出来的令牌。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28361,7 +29036,7 @@
   },
   {
     "original": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)\n      loads the application and test files.\n      This script tells SystemJS where to find those files and how to load them.\n      It's the same version of `systemjs.config.js` you installed during [setup](guide/testing#setup).",
-    "translation": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)加载应用文件和测试文件。\n      这个脚本告诉SystemJS到哪里去找那些文件，以及如何加载它们。\n      它和你在[环境设置](guide/testing#setup)期间安装的那个`systemjs.config.js`是同一个版本。",
+    "translation": "[SystemJS](https://github.com/systemjs/systemjs/blob/master/README.md)加载应用文件和测试文件。\n      这个脚本告诉SystemJS到哪里去找那些文件，以及如何加载它们。\n      它和你在[环境设置](guide/testing#setup)期间安装的那个`systemjs.config.js`是同一个版本。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -28376,7 +29051,7 @@
   },
   {
     "original": "The sample version for this guide adds the **model barrel**\n      to the SystemJs `packages` configuration.",
-    "translation": "本章的例子中把**模型桶（barrel）*添加到了SystemJS的`packages`配置中。",
+    "translation": "本章的例子中把**模型桶（barrel）*添加到了SystemJS的`packages`配置中。\n    </td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/testing.md"
   },
   {
@@ -29745,7 +30420,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
   {
-    "original": "`@types/angular` is declared as a UMD module, and due to the way\n<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\">UMD typings</a>\nwork, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
+    "original": "work, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
     "translation": "`@types/angular`声明为UMD模块，根据<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\" target=\"_blank\">UMD类型</a>\n的工作方式，一旦你在文件中有一条ES6的`import`语句，所有的UMD类型化的模型必须都通过`import`语句导入，\n而是不是全局可用。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
@@ -30256,22 +30931,22 @@
   },
   {
     "original": "The repeater matcher relies on AngularJS `ng-repeat`",
-    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`",
+    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
   {
     "original": "The repeater matcher relies on AngularJS `ng-repeat`",
-    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`",
+    "translation": "repeater匹配器依赖于AngularJS中的`ng-repeat`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
   {
     "original": "The model matcher relies on AngularJS `ng-model`",
-    "translation": "model匹配器依赖于AngularJS中的`ng-model`",
+    "translation": "model匹配器依赖于AngularJS中的`ng-model`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
   {
     "original": "The model matcher relies on AngularJS `ng-model`",
-    "translation": "model匹配器依赖于AngularJS中的`ng-model`",
+    "translation": "model匹配器依赖于AngularJS中的`ng-model`\n    </td>\n  </tr>\n  <tr>\n    <td>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/upgrade.md"
   },
   {
@@ -30381,7 +31056,7 @@
   },
   {
     "original": "Run the <live-example></live-example>.",
-    "translation": "运行",
+    "translation": "运行<live-example></live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/user-input.md"
   },
   {
@@ -30551,7 +31226,7 @@
   },
   {
     "original": "A nice aspect of this approach is that the component gets clean data values from the view.\nIt no longer requires knowledge of the `$event` and its structure.",
-    "translation": "这个方法最漂亮的一点是：组件代码从视图中获得了干净的数据值。再也不用了解`$event`变量及其结构了。\n{@a key-event}",
+    "translation": "这个方法最漂亮的一点是：组件代码从视图中获得了干净的数据值。再也不用了解`$event`变量及其结构了。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/user-input.md"
   },
   {
@@ -30689,6 +31364,11 @@
     "translation": "如果你希望使用**ASP.NET Core**并体验全新项目，\n    参见_预览版_<a href=\"http://blog.stevensanderson.com/2016/10/04/angular2-template-for-visual-studio/\" target=\"_blank\">ASP.NET Core + Angular template for Visual Studio 2015</a>。 \n    注意，最终代码与本文不对应，请适当调节。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq1'>\nPrerequisite: Node.js\n</h2>",
+    "translation": "<h2 id='prereq1'>\n前提条件: Node.js\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "Install **[Node.js® and npm](https://nodejs.org/en/download/)**\nif they are not already on your machine.",
     "translation": "如果你的电脑里没有Node.js®和npm，请安装**[它们](https://nodejs.org/en/download/)**。",
@@ -30699,6 +31379,11 @@
     "translation": "在终端或者控制台中运行`node -v`和`npm -v`，**请确认你的Node版本为`4.6.x`或更高，npm的版本为`3.x.x`或更高**。老版本会引起错误。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq2'>\nPrerequisite: Visual Studio 2015 Update 3\n</h2>",
+    "translation": "<h2 id='prereq2'>\n前提条件: Visual Studio 2015 Update 3\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "The minimum requirement for developing Angular applications with Visual Studio is Update 3.\nEarlier versions do not follow the best practices for developing applications with TypeScript.\nTo view your version of Visual Studio 2015, go to `Help | About Visual Studio`.",
     "translation": "使用Visual Studio开发Angular应用程序的最低要求是Update 3。\n早期版本没有遵循使用TypeScript开发应用程序的最佳实践。\n要查看你的Visual Studio 2015版本号，到`Help | About Visual Studio`。",
@@ -30709,6 +31394,11 @@
     "translation": "如果还没有，安装**[Visual Studio 2015 Update 3](https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs)**。或者使用`Tools | Extensions and Updates`来直接在Visual Studio 2015中更新到Update 3。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq3'>\nPrerequisite: Configure External Web tools\n</h2>",
+    "translation": "<h2 id='prereq3'>\n前提条件: 配置External Web tools\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "Configure Visual Studio to use the global external web tools instead of the tools that ship with Visual Studio:",
     "translation": "配置Visual Studio来使用全局External Web Tools，而非Visual Studio默认的工具：",
@@ -30744,6 +31434,11 @@
     "translation": "Visual Studio将优先在当前的工作区查找外部工具，如果没有找到，便查找全局路径，如果还没有找到，Visual Studio就使用自带的工具版本。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='prereq4'>\nPrerequisite: Install TypeScript 2.2 for Visual Studio 2015\n</h2>",
+    "translation": "<h2 id='prereq4'>\n前提条件: 安装TypeScript 2.2 for Visual Studio 2015\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "While Visual Studio Update 3 ships with TypeScript support out of the box, it currently doesn’t ship with TypeScript 2.2, \nwhich you need to develop Angular applications.",
     "translation": "Visual Studio Update 3自带TypeScript支持，但是它的TypeScript版本开发Angular应用需要的不是2.2。",
@@ -30774,11 +31469,21 @@
     "translation": "至此，Visual Studio准备好了。重新启动Visual Stuido，这样我们可以有一个崭新的开始。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='download'>\nStep 1: Download the QuickStart files\n</h2>",
+    "translation": "<h2 id='download'>\n第一步: 现在“快速上手”文件\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "[Download the QuickStart source](https://github.com/angular/quickstart)\nfrom GitHub. If you downloaded as a zip file, extract the files.",
     "translation": "从GitHub[下载“快速上手”的源代码](https://github.com/angular/quickstart)。如果下载的是一个压缩的zip文件，解压它。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='create-project'>\nStep 2: Create the Visual Studio ASP.NET project\n</h2>",
+    "translation": "<h2 id='create-project'>\n第二步：创建Visual Studio ASP.net项目\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "Create the ASP.NET 4.x project in the usual way as follows:",
     "translation": "按照下列步骤创建ASP.NET 4.x项目：",
@@ -30809,6 +31514,11 @@
     "translation": "本烹饪宝典选择了`Empty`模板，它没有添加过任何目录，没有身份验证，没有服务器托管。为你的项目选择合适的模板和选项。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='copy'>\n  Step 3: Copy the QuickStart files into the ASP.NET project folder\n</h2>",
+    "translation": "<h2 id='copy'>\n  第三步: 把“快速上手”的文件复制到ASP.NET项目所在的目录\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "Copy the QuickStart files you downloaded from GitHub into the folder containing the `.csproj` file.\nInclude the files in the Visual Studio project as follows:",
     "translation": "拷贝从GitHub下载的“快速上手”文件到包含`.csproj`文件的目录中。按照下面的步骤把它们加到Visual Studio中：",
@@ -30829,6 +31539,11 @@
     "translation": "src/app目录（如果询问是否要搜索TypeScript类型，回答*No*）",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='restore'> Step 4: Restore the required packages </h2>",
+    "translation": "<h2 id='restore'> 第四步: 恢复需要的包 </h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "Restore the packages required for an Angular application as follows:",
     "translation": "按下面的步骤恢复Angular应用程序需要的包：",
@@ -30864,6 +31579,11 @@
     "translation": "**不要**将`node_modules`目录添加到项目中，让它隐藏。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
   },
+  {
+    "original": "<h2 id='build-and-run'>\n  Step 5: Build and run the app\n</h2>",
+    "translation": "<h2 id='build-and-run'>\n  第五步：构建和运行应用\n</h2>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/visual-studio-2015.md"
+  },
   {
     "original": "First, ensure that `src/index.html` is set as the start page.\nRight-click `index.html` in Solution Explorer and select option `Set As Start Page`.",
     "translation": "首先，确认`src/index.html`已被设置为开始页面。\n  在Solution Explorer中，右键点击`index.html`，选择选项`Set As Start Page`。",
@@ -31629,6 +32349,11 @@
     "translation": "这里又是TypeScript的入口点文件，它定义了`polyfills`和`vendor`这两个包。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/webpack.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Highlights</h3>",
+    "translation": "### 重点：",
+    "sourceFile": "/Users/twer/private/GDE/content-2/guide/webpack.md"
+  },
   {
     "original": "* There are no `<script>` or `<link>` tags in the `index.html`. \nThe `HtmlWebpackPlugin` inserts them dynamically at runtime.",
     "translation": "在`index.html`中没有&lt;script&gt;或&lt;link&gt;标签。\n  `HtmlWebpackPlugin`会在运行时动态插入它们。",
@@ -31646,7 +32371,7 @@
   },
   {
     "original": "* The `vendor.ts` consists of vendor dependency `import` statements that drive the `vendor.js` bundle.\n  The application imports these modules too; they'd be duplicated in the `app.js` bundle\n  if the `CommonsChunkPlugin` hadn't detected the overlap and removed them from `app.js`.",
-    "translation": "`vendor.ts`由`import`提供商依赖的语句组成，它最终决定了`vender.js`的内容。\n  本应用也导入这些模块，如果没有`CommonsChunkPlugin`插件检测出这种重叠，并且把它们从`app.js`中移除，它们就会同时出现在`app.js`包中。\n{@a conclusion}",
+    "translation": "`vendor.ts`由`import`提供商依赖的语句组成，它最终决定了`vender.js`的内容。\n  本应用也导入这些模块，如果没有`CommonsChunkPlugin`插件检测出这种重叠，并且把它们从`app.js`中移除，它们就会同时出现在`app.js`包中。",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/webpack.md"
   },
   {
@@ -31669,11 +32394,41 @@
     "translation": "[回到顶部](guide/webpack#top)",
     "sourceFile": "/Users/twer/private/GDE/content-2/guide/webpack.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">What is Angular?</h1>",
+    "translation": "<h1 class=\"no-toc\">什么是 Angular？</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
   {
     "original": "Angular is a platform that makes it easy to build applications with the web. Angular combines declarative templates, dependency injection, end to end tooling, and integrated best practices to solve development challenges. Angular empowers developers to build applications that live on the web, mobile, or the desktop",
     "translation": "Angular 是一个开发平台。它能帮你更轻松的构建 Web 应用。Angular 集声明式模板、依赖注入、端到端工具和一些最佳实践于一身，为你解决开发方面的各种挑战。Angular 为开发者提升构建 Web、手机或桌面应用的能力。",
     "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
   },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "体验 Angular",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
+  {
+    "original": "</a>",
+    "translation": "<a href=\"guide/quickstart\" class=\"docs-card\" title=\"Angular 快速上手\">\n      <section>开始使用 Angular</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "快速上手",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
+  {
+    "original": "</a>",
+    "translation": "<a href=\"guide/architecture\" class=\"docs-card\" title=\"Angular 架构\">\n      <section>基本原理</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "架构",
+    "sourceFile": "/Users/twer/private/GDE/content-2/marketing/docs.md"
+  },
   {
     "original": "## Assumptions",
     "translation": "## 基本假设",
@@ -31779,6 +32534,11 @@
     "translation": "VTHINKXIE, Wilson Zeng, chensimeng, zjgzx1988, SunMing, fbchen, Trotyl Yu, 雪狼, afc163, xufei, lightningtgc",
     "sourceFile": "/Users/twer/private/GDE/content-2/translations/cn/news.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">Tutorial: Tour of Heroes</h1>",
+    "translation": "<h1 class=\"no-toc\">教程：英雄指南</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-2/tutorial/index.md"
+  },
   {
     "original": "The _Tour of Heroes_ tutorial covers the fundamentals of Angular.  \nIn this tutorial you will build an app that helps a staffing agency manage its stable of heroes.",
     "translation": "**英雄指南**教程涵盖了 Angular 的核心原理。在本教程中，我们将构建一个应用，来帮助招聘机构来管理一群英雄。",
diff --git a/aio/tools/translator/dict-3.json b/aio/tools/translator/dict-3.json
index 82c0caf5a5..67bd6f4082 100644
--- a/aio/tools/translator/dict-3.json
+++ b/aio/tools/translator/dict-3.json
@@ -1284,6 +1284,11 @@
     "translation": "本章描述了如何使用 AOT 编译器，以及如何书写能被 AOT 编译的 Angular 元数据。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/aot-compiler.md"
   },
+  {
+    "original": "<a href=\"https://www.youtube.com/watch?v=kW9cJsvcsGo\">Watch compiler author Tobias Bosch explain the Angular Compiler</a> at AngularConnect 2016.",
+    "translation": "<a href=\"https://www.youtube.com/watch?v=kW9cJsvcsGo\">观看 Angular 编译器的作者Tobias Bosch 在 AngularConnect 2016 上对编译器的解释。</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/aot-compiler.md"
+  },
   {
     "original": "## Angular compilation",
     "translation": "## 概览",
@@ -1609,6 +1614,11 @@
     "translation": "JavaScript 中，每个_文件_是一个模块，文件中定义的所有对象都从属于那个模块。\n通过`export`关键字，模块可以把它的某些对象声明为公共的。\n其它 JavaScript 模块可以使用*import 语句*来访问这些公共对象。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/architecture.md"
   },
+  {
+    "original": "<a href=\"http://exploringjs.com/es6/ch_modules.html\">Learn more about the JavaScript module system on the web.</a>",
+    "translation": "<a href=\"http://exploringjs.com/es6/ch_modules.html\">学习更多关于 JavaScript 模块的知识。</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/architecture.md"
+  },
   {
     "original": "These are two different and _complementary_ module systems. Use them both to write your apps.",
     "translation": "这两个模块化系统是互补的，我们在写程序时都会用到。",
@@ -2949,6 +2959,11 @@
     "translation": "[动画](guide/animations)",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/browser-support.md"
   },
+  {
+    "original": "<br>Only if `Animation Builder` is used within the application--standard\n      animation support in Angular doesn't require any polyfills (as of NG6).",
+    "translation": "<br>只有在应用中用到了 `Animation Builder` 时才需要；Angular 标准的动画支持是不需要任何腻子脚本的（截至 NG6）。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/browser-support.md"
+  },
   {
     "original": "[Web Animations](guide/browser-support#web-animations)",
     "translation": "[Web 动画](guide/browser-support#web-animations)",
@@ -3574,6 +3589,11 @@
     "translation": "下面是点击按钮的结果。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
+  },
   {
     "original": "Test that ***both*** input properties are set initially and that button clicks trigger\nthe expected `ngOnChanges` calls and values:",
     "translation": "测试确保***这两个***输入属性值都被初始化了，当点击按钮后，`ngOnChanges`应该被调用，属性的值也符合预期。",
@@ -3614,6 +3634,11 @@
     "translation": "框架(Angular)把事件参数(用`$event`表示)传给事件处理方法，这个方法会处理：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
+  },
   {
     "original": "Test that clicking the *Agree* and *Disagree* buttons update the appropriate counters:",
     "translation": "测试确保点击*Agree*和*Disagree*按钮时，计数器被正确更新。",
@@ -3635,7 +3660,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
   {
-    "original": "{@a countdown-timer-example}\nThe following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket.\nIt has `start` and `stop` methods that control the clock and it displays a\ncountdown status message in its own template.",
+    "original": "The following is a child `CountdownTimerComponent` that repeatedly counts down to zero and launches a rocket.\nIt has `start` and `stop` methods that control the clock and it displays a\ncountdown status message in its own template.",
     "translation": "子组件`CountdownTimerComponent`进行倒计时，归零时发射一个导弹。`start`和`stop`方法负责控制时钟并在模板里显示倒计时的状态信息。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
@@ -3664,6 +3689,11 @@
     "translation": "下面是父组件和子组件一起工作时的效果。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
+  },
   {
     "original": "Test that the seconds displayed in the parent template\nmatch the seconds displayed in the child's status message.\nTest also that clicking the *Stop* button pauses the countdown timer:",
     "translation": "测试确保在父组件模板中显示的秒数和子组件状态信息里的秒数同步。它还会点击*Stop*按钮来停止倒计时：",
@@ -3749,6 +3779,11 @@
     "translation": "使用`setTimeout()`来等下一轮，然后改写`seconds()`方法，这样它接下来就会从注入的这个计时器组件里获取秒数的值。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
+  },
   {
     "original": "Use [the same countdown timer tests](guide/component-interaction#countdown-tests) as before.",
     "translation": "使用和之前[一样的倒计时测试](guide/component-interaction#countdown-tests)。",
@@ -3804,6 +3839,11 @@
     "translation": "*History*日志证明了：在父组件`MissionControlComponent`和子组件`AstronautComponent`之间，信息通过该服务实现了双向传递。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Test it</h3>",
+    "translation": "<h3 class=\"no-toc\">测试一下</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/component-interaction.md"
+  },
   {
     "original": "Tests click buttons of both the parent `MissionControlComponent` and the `AstronautComponent` children\nand verify that the history meets expectations:",
     "translation": "测试确保点击父组件`MissionControlComponent`和子组件`AstronautComponent`两个的组件的按钮时，*History*日志和预期的一样。",
@@ -4395,7 +4435,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "{@a hero-bios-component}\nImagine a `HeroBiosComponent` that presents three instances of the `HeroBioComponent`.",
+    "original": "Imagine a `HeroBiosComponent` that presents three instances of the `HeroBioComponent`.",
     "translation": "想象一下，一个`HeroBiosComponent`组件显示三个`HeroBioComponent`的实例。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
@@ -4520,8 +4560,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
-    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。",
+    "original": "On the other hand, if you restore the `@Host()` decorator and comment out `@Optional`,\nthe application fails for lack of the required logger at the host component level.\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
+    "translation": "另一方面，如果恢复`@Host()`装饰器，注释掉`@Optional`，应用程序就会运行失败，因为它在宿主组件级别找不到需要的日志服务。\n<br>\n`EXCEPTION: No provider for LoggerService! (HeroContactComponent -> LoggerService)`",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
@@ -4805,7 +4845,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "for the full source code.",
+    "original": "The function retrieves candidate heroes from the `HeroService`,\ntakes `2` of them to be the runners-up, and returns their concatenated names.\nLook at the <live-example name=\"dependency-injection-in-action\"></live-example>\nfor the full source code.",
     "translation": "该函数从`HeroService`获取英雄参赛者，从中取`2`个作为亚军，并把他们的名字拼接起来。请到<live-example name=\"dependency-injection-in-action\"></live-example>查看全部原代码。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
@@ -5020,7 +5060,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is set.",
+    "original": "Notice that even though the [@Optional](guide/dependency-injection-in-action#optional) qualifier\nis there for safety,\nthe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is set.",
     "translation": "安全起见，我们添加了[@Optional](guide/dependency-injection-in-action#optional)装饰器，但是<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数确实被设置了。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
@@ -5065,7 +5105,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
   {
-    "original": "confirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
+    "original": "Unfortunately, this does not work.\nThe <live-example name=\"dependency-injection-in-action\"></live-example>\nconfirms that the `alex` parameter is null.\n*You cannot inject a parent by its base class.*",
     "translation": "可惜这样不行。<live-example name=\"dependency-injection-in-action\"></live-example>显示`alex`参数是null。\n*不能通过基类注入父组件*。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dependency-injection-in-action.md"
   },
@@ -5769,14 +5809,19 @@
     "translation": "把输出目录（默认为`dist/`）下的*每个文件*都复制到到服务器上的某个目录下。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/deployment.md"
   },
+  {
+    "original": "3. If you copy the files into a server _sub-folder_, append the build flag, `--base-href` and set the `<base href>` appropriately.<br><br>",
+    "translation": "如果要把文件部署到服务器上的*某个子路径*下，构建时还要添加`--base-href`（基地址）标识，并设置合适的`<base href>`。<br><br>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/deployment.md"
+  },
   {
     "original": "For example, if the `index.html` is on the server at `/my/app/index.html`, set the _base href_  to\n  `<base href=\"/my/app/\">` like this.",
     "translation": "比如，如果 `index.html` 位于服务器上的 `/my/app/index.html` 路径下，就要把 *base href* 设置为 `<base href=\"/my/app/\">`，就像这样：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/deployment.md"
   },
   {
-    "original": "Learn more about the role of `<base href>` [below](guide/deployment#base-tag).",
-    "translation": "我们会看到在生成的 `dist/index.html` 中 `",
+    "original": "You'll see that the `<base href>` is set properly in the generated `dist/index.html`.<br><br>\n  If you copy to the server's root directory, omit this step and leave the `<base href>` alone.<br><br>\n  Learn more about the role of `<base href>` [below](guide/deployment#base-tag).",
+    "translation": "我们会看到在生成的 `dist/index.html` 中 `<base href>` 已经被设置好了。<br><br>\n  如果复制到服务器的根目录下，就省略这个步骤，并且让 `<base href>` 保持原样。<br><br> \n  要了解 `<base href>` 的作用，参见 [下面](guide/deployment#base-tag) 的内容。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/deployment.md"
   },
   {
@@ -6350,7 +6395,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dynamic-component-loader.md"
   },
   {
-    "original": "of the code in this cookbook.",
+    "original": "See the <live-example name=\"dynamic-component-loader\"></live-example>\nof the code in this cookbook.",
     "translation": "到<live-example name=\"dynamic-component-loader\"></live-example>查看本烹饪书的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/dynamic-component-loader.md"
   },
@@ -10000,12 +10045,12 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/language-service.md"
   },
   {
-    "original": "```sh\nnpm install --save-dev @angular/language-service\n```\nAdditionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
+    "original": "Additionally, add the following to the `\"compilerOptions\"` section of \nyour project's `tsconfig.json`.",
     "translation": "另外，还要在工程的`tsconfig.json`中添加下列`\"compilerOptions\"`区域：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/language-service.md"
   },
   {
-    "original": "```json\n  \"plugins\": [\n      {\"name\": \"@angular/language-service\"}\n  ]\n```\nNote that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
+    "original": "Note that this only provides diagnostics and completions in `.ts` \nfiles. You need a custom sublime plugin (or modifications to the current plugin) \nfor completions in HTML files.",
     "translation": "注意，这只是提供了`.ts`文件中的诊断与自动完成。我们需要一个自定义的sublime插件（或修改现有插件）来在 HTML 文件中提供自动完成功能。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/language-service.md"
   },
@@ -10220,7 +10265,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/lifecycle-hooks.md"
   },
   {
-    "original": "demonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
+    "original": "The <live-example></live-example>\ndemonstrates the lifecycle hooks in action through a series of exercises\npresented as components under the control of the root `AppComponent`.",
     "translation": "<live-example></live-example>通过在受控于根组件`AppComponent`的一些组件上进行的一系列练习，演示了生命周期钩子的运作方式。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/lifecycle-hooks.md"
   },
@@ -10349,6 +10394,11 @@
     "translation": "不开玩笑了，注意下面两个关键点：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/lifecycle-hooks.md"
   },
+  {
+    "original": "1. Angular calls hook methods for *directives* as well as components.<br><br>",
+    "translation": "就像对组件一样，Angular也会对*指令*调用这些钩子方法。<br><br>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/lifecycle-hooks.md"
+  },
   {
     "original": "2. A spy directive can provide insight into a DOM object that you cannot change directly.\n  Obviously you can't touch the implementation of a native `<div>`.\n  You can't modify a third party component either.\n  But you can watch both with a directive.",
     "translation": "一个侦探(spy)指令可以让我们在无法直接修改DOM对象实现代码的情况下，透视其内部细节。\n显然，你不能修改一个原生`<div>`元素的实现代码。\n你同样不能修改第三方组件。\n但我们用一个指令就能监视它们了。",
@@ -11050,7 +11100,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/ngmodule-faq.md"
   },
   {
-    "original": "Angular doesn't recognize these names but Angular developers do.\nFollow this convention when you write similar modules with configurable service providers.\n<!--KW--I don't understand how Angular doesn't understand these methods...-->",
+    "original": "<!--KW--I don't understand how Angular doesn't understand these methods...-->",
     "translation": "Angular并不识别这些名字，但是Angular的开发人员可以。\n当你写类似的需要可配置的服务提供商时，请遵循这个约定。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/ngmodule-faq.md"
   },
@@ -11234,6 +11284,11 @@
     "translation": "更一般地说，[优先把提供商注册进模块中](guide/ngmodule-faq#q-component-or-module)，而不是组件中。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/ngmodule-faq.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Discussion</h3>",
+    "translation": "<h3 class=\"no-toc\">讨论</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/ngmodule-faq.md"
+  },
   {
     "original": "Angular registers all startup module providers with the application root injector.\nThe services that root injector providers create have application scope, which\nmeans they are available to the entire application.",
     "translation": "Angular把所有启动期模块的提供商都注册进了应用的根注入器中。\n这些服务是由根注入器中的提供商创建的，并且在整个应用中都可用。\n它们具有*应用级作用域*。",
@@ -12154,6 +12209,11 @@
     "translation": "Angular通过*变更检测*过程来查找绑定值的更改，并在每一次JavaScript事件之后运行：每次按键、鼠标移动、定时器以及服务器的响应。\n这可能会让变更检测显得很昂贵，但是Angular会尽可能降低变更检测的成本。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">No pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">无管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "In the next example, the component uses the default, aggressive change detection strategy to monitor and update\nits display of every hero in the `heroes` array. Here's the template:",
     "translation": "我们下一个例子中的组件使用默认的、激进(昂贵)的变更检测策略来检测和更新`heroes`数组中的每个英雄。下面是它的模板：",
@@ -12169,6 +12229,11 @@
     "translation": "我们可以添加新的英雄，加完之后，Angular就会更新显示。\n`reset`按钮会把`heroes`替换成一个由原来的英雄组成的新数组，重置完之后，Angular就会更新显示。\n如果我们提供了删除或修改英雄的能力，Angular也会检测到那些更改，并更新显示。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\"><i>FlyingHeroesPipe</i></h3>",
+    "translation": "<h3 class=\"no-toc\"><i>“会飞的英雄”管道（FlyingHeroesPipe）</i></h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "Add a `FlyingHeroesPipe` to the `*ngFor` repeater that filters the list of heroes to just those heroes who can fly.",
     "translation": "我们来往`*ngFor`重复器中添加一个`FlyingHeroesPipe`管道，这个管道能过滤出所有会飞的英雄。",
@@ -12239,6 +12304,11 @@
     "translation": "在继续往下走之前，我们先理解一下*纯*和*非纯*之间的区别，从*纯*管道开始。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes</h3>",
+    "translation": "<h3 class=\"no-toc\">纯管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "Angular executes a *pure pipe* only when it detects a *pure change* to the input value.\nA pure change is either a change to a primitive input value (`String`, `Number`, `Boolean`, `Symbol`)\nor a changed object reference (`Date`, `Array`, `Function`, `Object`).",
     "translation": "Angular只有在它检测到输入值发生了*纯变更*时才会执行*纯管道*。\n    ***纯变更***是指对原始类型值(`String`、`Number`、`Boolean`、`Symbol`)的更改，\n    或者对对象引用(`Date`、`Array`、`Function`、`Object`)的更改。",
@@ -12264,6 +12334,11 @@
     "translation": "或者我们也可以完全不用管道。\n有时候，使用组件的属性能比用管道更好的达到目的，这一点我们等后面会再提起。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Impure pipes</h3>",
+    "translation": "### 非纯管道",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "Angular executes an *impure pipe*  during every component change detection cycle.\nAn impure pipe is called often, as often as every keystroke or mouse-move.",
     "translation": "Angular会在每个组件的变更检测周期中执行*非纯管道*。\n非纯管道可能会被调用很多次，和每个按键或每次鼠标移动一样频繁。",
@@ -12274,6 +12349,11 @@
     "translation": "要在脑子里绷着这根弦，我们必须小心翼翼的实现非纯管道。\n一个昂贵、迟钝的管道将摧毁用户体验。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure <i>FlyingHeroesPipe</i></h3>",
+    "translation": "<h3 class=\"no-toc\">非纯管道 <i>FlyingHeroesPipe</i></h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "A flip of the switch turns the `FlyingHeroesPipe` into a `FlyingHeroesImpurePipe`.\nThe complete implementation is as follows:",
     "translation": "我们把`FlyingHeroesPipe`换成了`FlyingHeroesImpurePipe`。\n下面是完整的实现：",
@@ -12299,6 +12379,11 @@
     "translation": "唯一的重大改动就是管道。\n  我们可以在<live-example></live-example>中确认，当我们输入新的英雄甚至修改#[code heroes]数组时，这个#[i 会飞的英雄]的显示也跟着更新了。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">The impure <i>AsyncPipe</i></h3>",
+    "translation": "<h3 class=\"no-toc\">非纯管道 <i>AsyncPipe</i></h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "The Angular `AsyncPipe` is an interesting example of an impure pipe.\nThe `AsyncPipe` accepts a `Promise` or `Observable` as input\nand subscribes to the input automatically, eventually returning the emitted values.",
     "translation": "Angular的`AsyncPipe`是一个有趣的非纯管道的例子。\n  `AsyncPipe`接受一个`Promise`或`Observable`作为输入，并且自动订阅这个输入，最终返回它们给出的值。",
@@ -12319,6 +12404,11 @@
     "translation": "这个Async管道节省了组件的样板代码。\n组件不用订阅这个异步数据源，而且不用在被销毁时取消订阅(如果订阅了而忘了反订阅容易导致隐晦的内存泄露)。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">An impure caching pipe</h3>",
+    "translation": "<h3 class=\"no-toc\">一个非纯而且带缓存的管道</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "Write one more impure pipe, a pipe that makes an HTTP request.",
     "translation": "我们来写更多的非纯管道：一个向服务器发起HTTP请求的管道。",
@@ -12379,6 +12469,11 @@
     "translation": "[JsonPipe](api/common/JsonPipe)为你诊断数据绑定的某些神秘错误或为做进一步绑定而探查数据时，提供了一个简单途径。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Pure pipes and pure functions</h3>",
+    "translation": "<h3 class=\"no-toc\">纯管道与纯函数</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/pipes.md"
+  },
   {
     "original": "A pure pipe uses pure functions.\nPure functions process inputs and return values without detectable side effects.\nGiven the same input, they should always return the same output.",
     "translation": "纯管道使用纯函数。\n纯函数是指在处理输入并返回结果时，不会产生任何副作用的函数。\n给定相同的输入，它们总是返回相同的输出。",
@@ -14459,6 +14554,11 @@
     "translation": "含义",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
+  {
+    "original": "<code>Router</code>",
+    "translation": "<code>路由器</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
+  },
   {
     "original": "Displays the application component for the active URL.\n      Manages navigation from one component to the next.",
     "translation": "为激活的URL显示应用组件。管理从一个组件到另一个组件的导航",
@@ -14469,11 +14569,21 @@
     "translation": "一个独立的Angular模块，用于提供所需的服务提供商，以及用来在应用视图之间进行导航的指令。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
+  {
+    "original": "<code>Routes</code>",
+    "translation": "<code>路由定义（数组）</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
+  },
   {
     "original": "Defines an array of Routes, each mapping a URL path to a component.",
     "translation": "定义了一个路由数组，每一个都会把一个URL路径映射到一个组件。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
+  {
+    "original": "<code>Route</code>",
+    "translation": "<code>路由器</code>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
+  },
   {
     "original": "Defines how the router should navigate to a component based on a URL pattern.\n      Most routes consist of a path and a component type.",
     "translation": "定义路由器该如何根据URL模式（pattern）来导航到组件。大多数路由都由路径和组件类构成。",
@@ -14499,11 +14609,21 @@
     "translation": "路由器的当前状态包含了一棵由程序中激活的路由构成的树。它包含一些用于遍历路由树的快捷方法。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
+  {
+    "original": "<b><i>Link parameters array</i></b>",
+    "translation": "<b><i>链接参数数组</i></b>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
+  },
   {
     "original": "An array that the router interprets as a routing instruction.\n      You can bind that array to a <code>RouterLink</code> or pass the array as an argument to\n      the <code>Router.navigate</code> method.",
     "translation": "这个数组会被路由器解释成一个路由操作指南。我们可以把一个<code>RouterLink</code>绑定到该数组，或者把它作为参数传给<code>Router.navigate</code>方法。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
+  {
+    "original": "<b><i>Routing component</i></b>",
+    "translation": "<b><i>路由组件</i></b>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
+  },
   {
     "original": "An Angular component with a <code>RouterOutlet</code> that displays views based on router navigations.",
     "translation": "一个带有<code>RouterOutlet</code>的Angular组件，它根据路由器的导航来显示相应的视图。",
@@ -17675,7 +17795,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
   {
-    "original": "where you can download the final source code.",
+    "original": "You've covered a lot of ground in this guide and the application is too big to reprint here.\nPlease visit the <live-example title=\"Router Sample in Stackblitz\"></live-example>\nwhere you can download the final source code.",
     "translation": "本章中涉及到了很多背景知识，而且本应用程序也太大了，所以没法在这里显示。请访问<live-example title=\"Router Sample in Plunker\"></live-example>，在那里你可以下载最终的源码。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/router.md"
   },
@@ -18405,8 +18525,8 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup-systemjs-anatomy.md"
   },
   {
-    "original": "as _live examples_.",
-    "translation": "在live example中试试",
+    "original": "Try the <live-example name=\"setup\">sample application</live-example> \n      and the <live-example name=\"setup\" stackblitz=\"quickstart-specs\">unit test</live-example>\n      as _live examples_.",
+    "translation": "在live example中试试<live-example name=\"setup\">范例程序</live-example>和<live-example name=\"setup\" plnkr=\"quickstart-specs\">单元测试</live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup-systemjs-anatomy.md"
   },
   {
@@ -18564,6 +18684,11 @@
     "translation": "## 下载",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"Download the QuickStart seed repository\">Download the QuickStart seed</a>\nand unzip it into your project folder. Then perform the remaining steps with these terminal commands.",
+    "translation": "<a href=\"https://github.com/angular/quickstart/archive/master.zip\" title=\"下载《快速上手》种子库\">下载《快速上手》种子</a>\n并解压到你的项目目录中。然后执行下面的命令完成剩余步骤。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
+  },
   {
     "original": "`npm start` fails in _Bash for Windows_ in versions earlier than the Creator's Update (April 2017).",
     "translation": "在*Bash for Windows*中`npm start`可能会失败，因为到2017-01为止它还不支持访问网络上的服务器。",
@@ -18669,6 +18794,11 @@
     "translation": "Node.js 和 npm 对使用 Angular 和其他平台进行现代网络开发是至关重要的。\nNode 驱动客户端开发和构建工具。\n*npm* 包管理器本身是 *node* 应用，用于安装 JavaScript 库。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
   },
+  {
+    "original": "<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"Installing Node.js and updating npm\">\nGet them now</a> if they're not already installed on your machine.",
+    "translation": "如果你的电脑没有安装它们，<a href=\"https://docs.npmjs.com/getting-started/installing-node\" target=\"_blank\" title=\"安装 Node.js 和更新 npm\">\n立刻安装它们</a>。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
+  },
   {
     "original": "**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**\nby running the commands `node -v` and `npm -v` in a terminal/console window.\nOlder versions produce errors.",
     "translation": "在终端/控制器窗口运行命令`node -v`和`npm -v`，来**确认你运行的 node 是`v4.x.x`或更高，npm 为`3.x.x`或更高。**\n老版本会产生错误。",
@@ -18684,6 +18814,11 @@
     "translation": "## 附录：为何在本地开发",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
   },
+  {
+    "original": "<live-example title=\"QuickStart Seed in Stackblitz\">Live coding</live-example> in the browser is a great way to explore Angular.",
+    "translation": "在浏览器中<live-example title=\"QuickStart Seed in Plunker\">在线编程</live-example>是很好的探索 Angular 的方法。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/setup.md"
+  },
   {
     "original": "Links on almost every documentation page open completed samples in the browser.\nYou can play with the sample code, share your changes with friends, and download and run the code on your own machine.",
     "translation": "几乎每章文档里面的链接都在浏览器中打开完整的例子。\n你可以用这些代码做实验，或者与朋友共享你的修改，或者下载并在你自己的电脑上运行这些代码。",
@@ -19559,6 +19694,11 @@
     "translation": "随着应用程序的成长，本法则会变得越来越重要。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Small functions",
     "translation": "### 小函数",
@@ -19604,6 +19744,11 @@
     "translation": "**为何？**简单函数可避免易在大函数中产生的隐蔽性错误，例如与外界共享变量、创建意外的闭包或与依赖之间产生意外耦合等。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Naming",
     "translation": "## 命名",
@@ -19649,6 +19794,11 @@
     "translation": "**为何？**目录名和文件名应该清楚的传递它们的意图。\n例如，`app/heroes/hero-list.component.ts`包含了一个用来管理英雄列表的组件。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Separate file names with dots and dashes",
     "translation": "### 使用点和横杠来分隔文件名",
@@ -19699,6 +19849,11 @@
     "translation": "**为何？**为自动化任务提供模式匹配。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Symbols and file names",
     "translation": "### 符号名与文件名",
@@ -19749,6 +19904,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Service names",
     "translation": "### 服务名",
@@ -19799,6 +19959,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Bootstrapping",
     "translation": "### 引导",
@@ -19834,6 +19999,11 @@
     "translation": "**为何？**这是从其它技术平台借鉴的常用约定。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Directive selectors",
     "translation": "### 指令选择器",
@@ -19859,6 +20029,11 @@
     "translation": "**为何？**Angular HTML 解析器是大小写敏感的，它识别小写驼峰写法。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Custom prefix for components",
     "translation": "### 为组件添加自定义前缀",
@@ -19929,6 +20104,11 @@
     "translation": "**为何？**指令更加容易被识别。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Pipe names",
     "translation": "### 管道名",
@@ -19959,6 +20139,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Unit test file names",
     "translation": "### 单元测试文件名",
@@ -20014,6 +20199,11 @@
     "translation": "管道",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### _End-to-End_ (E2E) test file names",
     "translation": "### *端到端*（E2E）测试的文件名",
@@ -20054,6 +20244,11 @@
     "translation": "端到端测试",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Angular _NgModule_ names",
     "translation": "### Angular *NgModule* 命名",
@@ -20119,6 +20314,11 @@
     "translation": "文件名",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Coding conventions",
     "translation": "## 编程约定",
@@ -20154,6 +20354,11 @@
     "translation": "**为何？**类可以被实例化和构造实例。根据约定，用大写驼峰命名法来标识可构造的东西。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Constants",
     "translation": "### 常量",
@@ -20204,6 +20409,11 @@
     "translation": "**为何？**传统的大写蛇形命名法仍然很流行、很普遍，特别是在第三方模块中。\n修改它们没多大价值，还会有破坏现有代码和文档的风险。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Interfaces",
     "translation": "### 接口",
@@ -20249,6 +20459,11 @@
     "translation": "**为何？**在 Angular 依赖注入系统中，接口类可以作为服务提供商的查找令牌。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Properties and methods",
     "translation": "### 属性和方法",
@@ -20284,6 +20499,11 @@
     "translation": "**为何？** TypeScript 工具让识别私有或公有属性和方法变得很简单。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Import line spacing",
     "translation": "### 导入语句中的空行",
@@ -20319,6 +20539,11 @@
     "translation": "**为何？**按字母顺序排列可以让阅读和定位本地导入更加容易。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Application structure and NgModules",
     "translation": "## 应用程序结构与 Angular 模块",
@@ -20339,6 +20564,11 @@
     "translation": "所有内容都遵循每个文件一个特性的原则。每个组件、服务和管道都在自己的文件里。\n所有第三方程序包保存到其它目录里，而不是`src`目录。\n你不会修改它们，所以不希望它们弄乱我们的应用程序。\n使用本指南介绍的文件命名约定。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "#### Style 04-01",
     "translation": "#### 风格 04-01",
@@ -20359,6 +20589,11 @@
     "translation": "**为何？**LIFT提供了一致的结构，它具有扩展性强、模块化的特性。因为容易快速锁定代码，提高了开发者的效率。\n另外，检查应用结构是否合理的方法是问问自己：我们能快速打开与此特性有关的所有文件并开始工作吗？",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Locate",
     "translation": "### 定位",
@@ -20379,6 +20614,11 @@
     "translation": "**为何？**\n要想高效的工作，就必须能迅速找到文件，特别是当不知道（或不记得）文件*名*时。\n把相关的文件一起放在一个直观的位置可以节省时间。\n富有描述性的目录结构会让你和后面的维护者眼前一亮。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Identify",
     "translation": "### 识别",
@@ -20414,6 +20654,11 @@
     "translation": "当你有一组小型、紧密相关的特性时，违反*一物一文件*的规则可能会更好，\n这种情况下单一文件可能会比多个文件更容易发现和理解。注意这个例外。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Flat",
     "translation": "### 扁平",
@@ -20445,7 +20690,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
   {
-    "original": "On the other hand,\n<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\">psychologists believe</a>\nthat humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
+    "original": "that humans start to struggle when the number of adjacent interesting things exceeds nine.\nSo when a folder has ten or more files, it may be time to create subfolders.",
     "translation": "另一方面，<a href=\"https://en.wikipedia.org/wiki/The_Magical_Number_Seven,_Plus_or_Minus_Two\" target=\"_blank\">心理学家们相信</a>，\n当关注的事物超过 9 个时，人类就会开始感到吃力。\n所以，当一个文件夹中的文件有 10 个或更多个文件时，可能就是创建子目录的时候了。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
@@ -20454,6 +20699,11 @@
     "translation": "还是根据你自己的舒适度而定吧。\n除非创建新文件夹能有显著的价值，否则尽量使用扁平结构。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### _T-DRY_ (Try to be _DRY_)",
     "translation": "### *T-DRY*（尽量不重复自己）",
@@ -20479,6 +20729,11 @@
     "translation": "**为何？**虽然 DRY 很重要，但如果要以牺牲 LIFT 的其它原则为代价，那就不值得了。\n这也就是为什么它被称为 *T-DRY*。\n例如，把组件命名为`hero-view.component.html`是多余的，因为带有`.html`扩展名的文件显然就是一个视图 (view)。\n但如果它不那么显著，或不符合常规，就把它写出来。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Overall structural guidelines",
     "translation": "### 总体结构的指导原则",
@@ -20529,6 +20784,11 @@
     "translation": "把组件放在专用目录中的方式广受欢迎，对于小型应用，还可以保持组件扁平化（而不是放在专用目录中）。\n这样会把四个文件放在现有目录中，也会减少目录的嵌套。无论你如何选择，请保持一致。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### _Folders-by-feature_ structure",
     "translation": "### 按特性组织的目录结构",
@@ -20579,6 +20839,16 @@
     "translation": "**为何？**Angular 模块隔离、测试和复用特性更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#file-tree\">Refer to this _folder and file structure_ example.</a>",
+    "translation": "<a href=\"#file-tree\">点这里查看目录和文件结构的范例</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### App _root module_",
     "translation": "### 应用的*根模块*",
@@ -20609,6 +20879,11 @@
     "translation": "**为何？**能让定位和识别根模块变得更容易。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Feature modules",
     "translation": "### 特性模块",
@@ -20669,6 +20944,11 @@
     "translation": "**为何？**特性模块易于隔离，以便测试。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Shared feature module",
     "translation": "### 共享特性模块",
@@ -20739,6 +21019,11 @@
     "translation": "**为何？**对于单例服务，你不希望每个模块都有自己的实例。\n而如果`SharedModule`提供了一个服务，那就有可能发生这种情况。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Core feature module",
     "translation": "### 核心特性模块",
@@ -20829,6 +21114,11 @@
     "translation": "`AppModule`变得更小了，因为很多应用根部的类都被移到了其它模块中。\n`AppModule`变得稳定了，因为你将会往其它模块中添加特性组件和服务提供商，而不是这个`AppModule`。\n`AppModule`把工作委托给了导入的模块，而不是亲力亲为。\n`AppModule`聚焦在它自己的主要任务上：作为整个应用的总指挥。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Prevent re-import of the core module",
     "translation": "### 防止多次导入`CoreModule`",
@@ -20859,6 +21149,11 @@
     "translation": "**为何？**守卫会禁止创建单例服务的多个实例。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Lazy Loaded folders",
     "translation": "### 惰性加载的目录",
@@ -20884,6 +21179,11 @@
     "translation": "**为何？**这种目录让标识和隔离这些特性内容变得更轻松。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Never directly import lazy loaded folders",
     "translation": "### 永远不要直接导入惰性加载的目录",
@@ -20904,6 +21204,11 @@
     "translation": "**为何？**直接导入并使用此模块会立即加载它，而原本的设计意图是按需加载它。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Components",
     "translation": "## 组件",
@@ -20929,6 +21234,11 @@
     "translation": "**为何？**保持元素命名与[自定义元素](https://www.w3.org/TR/custom-elements/)命名规范一致。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Components as elements",
     "translation": "### 把组件当做元素",
@@ -20954,6 +21264,11 @@
     "translation": "**为何？**查看组件模板的 HTML 时，更容易识别一个符号是组件还是指令。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Extract templates and styles to their own files",
     "translation": "### 把模板和样式提取到它们自己的文件",
@@ -21004,6 +21319,11 @@
     "translation": "**为何？**`./`前缀是相对URL的标准语法，不必依赖Angular的特殊处理，如果没有前缀则不行。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Decorate _input_ and _output_ properties",
     "translation": "### 内联输入和输出属性装饰器",
@@ -21044,6 +21364,11 @@
     "translation": "**为何？**把装饰器放到同一行可以精简代码，同时更易于识别输入或输出属性。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Avoid aliasing _inputs_ and _outputs_",
     "translation": "### 避免为输入和输出属性指定别名",
@@ -21069,6 +21394,11 @@
     "translation": "**为何？**如果指令名也同时用作*输入*属性，而且指令名无法准确描述这个属性的用途时，应该使用别名。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Member sequence",
     "translation": "### 成员顺序",
@@ -21094,6 +21424,11 @@
     "translation": "**为何？**把类的成员按照统一的顺序排列，易于阅读，能立即识别出组件的哪个成员服务于何种目的。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Delegate complex component logic to services",
     "translation": "### 把逻辑放到服务里",
@@ -21134,6 +21469,11 @@
     "translation": "**为何？**保持组件苗条、精简和聚焦。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Don't prefix _output_ properties",
     "translation": "### 不要给输出属性加前缀",
@@ -21164,6 +21504,11 @@
     "translation": "**为何？**Angular 允许[另一种备选语法](guide/template-syntax#binding-syntax) `on-*`。如果事件的名字本身带有前缀`on`，那么绑定的表达式可能是`on-onEvent`。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Put presentation logic in the component class",
     "translation": "### 把表现层逻辑放到组件类里",
@@ -21189,6 +21534,11 @@
     "translation": "**为何？**将组件的表现层逻辑放到组件类而非模板里，可以增强测试性、维护性和重复使用性。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Directives",
     "translation": "## 指令",
@@ -21219,6 +21569,11 @@
     "translation": "**为何？**一个元素可以使用多个属性型指令。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### _HostListener_/_HostBinding_ decorators versus _host_ metadata",
     "translation": "### *HostListener* 和 *HostBinding* 装饰器 vs. 组件元数据 *host*",
@@ -21254,6 +21609,11 @@
     "translation": "**为何？**`host`元数据只是一个便于记忆的名字而已，并不需要额外的 ES 导入。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Services",
     "translation": "## 服务",
@@ -21284,6 +21644,11 @@
     "translation": "**为何？**服务是共享状态性内存数据的理想载体。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Single responsibility",
     "translation": "### 单一职责",
@@ -21314,6 +21679,11 @@
     "translation": "**为何？**当某个服务有多个职责时，每个注入它的组件或服务都会承担这些职责的全部开销。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Providing a service",
     "translation": "### 提供一个服务",
@@ -21349,6 +21719,11 @@
     "translation": "**为何？**当不同的两个组件需要一个服务的不同的实例时，上面的方法这就不理想了。在这种情况下，对于需要崭新和单独服务实例的组件，最好在组件级提供服务。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Use the @Injectable() class decorator",
     "translation": "### 使用 @Injectable() 类装饰器",
@@ -21374,6 +21749,11 @@
     "translation": "**为何？**当服务只接受类型令牌相关的依赖时，比起在每个构造函数参数上使用`@Inject()`，`@Injectable()`的语法简洁多了。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Data Services",
     "translation": "## 数据服务",
@@ -21419,6 +21799,11 @@
     "translation": "数据服务应该封装这些细节。这样，在服务内部修改细节，就不会影响到它的消费者。并且更容易通过实现一个模拟服务来对消费者进行测试。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Lifecycle hooks",
     "translation": "## 生命周期钩子",
@@ -21429,6 +21814,11 @@
     "translation": "使用生命周期钩子来介入到 Angular 暴露的重要事件里。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### Implement lifecycle hook interfaces",
     "translation": "### 实现生命周期钩子接口",
@@ -21449,6 +21839,11 @@
     "translation": "**为何？**如果使用强类型的方法签名，编译器和编辑器可以帮你揪出拼写错误。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "## Appendix",
     "translation": "## 附录",
@@ -21459,6 +21854,11 @@
     "translation": "有用的 Angular 工具和小提示",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "#### Style A-01",
     "translation": "#### 风格 A-01",
@@ -21474,6 +21874,11 @@
     "translation": "**考虑**调整 codelyzer 的规则来满足你的需求。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "### File templates and snippets",
     "translation": "### 文档模板和代码片段",
@@ -21509,6 +21914,11 @@
     "translation": "**考虑**使用 [Vim](http://www.vim.org/) 的[代码片断](https://github.com/mhartington/vim-angular2-snippets)来实施本风格指南。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
   },
+  {
+    "original": "<a href=\"#toc\">Back to top</a>",
+    "translation": "<a href=\"#toc\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/styleguide.md"
+  },
   {
     "original": "# Template Syntax",
     "translation": "# 模板语法",
@@ -21634,6 +22044,16 @@
     "translation": "赋值 (`=`, `+=`, `-=`, ...)",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
+  {
+    "original": "* chaining expressions with <code>;</code> or <code>,</code>",
+    "translation": "使用`;`或`,`的链式表达式",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators (`++` and `--`)",
     "translation": "自增或自减操作符 (`++`和`--`)",
@@ -21814,6 +22234,11 @@
     "translation": "然而，某些 JavaScript 语法仍然是不允许的：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "* <code>new</code>",
+    "translation": "`new`运算符",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "* increment and decrement operators, `++` and `--`",
     "translation": "自增和自减运算符：`++`和`--`",
@@ -22689,6 +23114,11 @@
     "translation": "如果事件属于指令（回想一下，组件是指令的一种），那么`$event`具体是什么由指令决定。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "### Custom events with <span class=\"syntax\">EventEmitter</span>",
+    "translation": "### 使用 <span class=\"syntax\">EventEmitter</span> 实现自定义事件",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "Directives typically raise custom events with an Angular [EventEmitter](api/core/EventEmitter).\nThe directive creates an `EventEmitter` and exposes it as a property.\nThe directive calls `EventEmitter.emit(payload)` to fire an event, passing in a message payload, which can be anything.\nParent directives listen for the event by binding to this property and accessing the payload through the `$event` object.",
     "translation": "通常，指令使用 Angular [EventEmitter](api/core/EventEmitter) 来触发自定义事件。\n指令创建一个`EventEmitter`实例，并且把它作为属性暴露出来。\n指令调用`EventEmitter.emit(payload)`来触发事件，可以传入任何东西作为消息载荷。\n父指令通过绑定到这个属性来监听事件，并通过`$event`对象来访问载荷。",
@@ -22944,6 +23374,11 @@
     "translation": "你既可以在初始化时调用`setCurrentStyles()`，也可以在所依赖的属性变化时调用。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "### NgModel - Two-way binding to form elements with <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "### NgModel - 使用<span class=\"syntax\">[(ngModel)]</span>双向绑定到表单元素",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "When developing data entry forms, you often both display a data property and\nupdate that property when the user makes changes.",
     "translation": "当开发数据输入表单时，我们通常都要既显示数据属性又根据用户的更改去修改那个属性。",
@@ -22969,6 +23404,11 @@
     "translation": "导入`FormsModule`并让`[(ngModel)]`可用的代码如下：",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "#### Inside <span class=\"syntax\">[(ngModel)]</span>",
+    "translation": "#### <span class=\"syntax\">[(ngModel)]</span>内幕",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "Looking back at the `name` binding, note that\nyou could have achieved the same result with separate bindings to\nthe `<input>` element's  `value` property and `input` event.",
     "translation": "回头看看`name`绑定，注意，你可以通过分别绑定到`<input>`元素的`value`属性和`input`事件来达到同样的效果。",
@@ -23369,6 +23809,11 @@
     "translation": "我们可以在模板中的任何地方引用模板引用变量。\n比如声明在`<input>`上的`phone`变量就是在模板另一侧的`<button>`上使用的。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">How a reference variable gets its value</h3>",
+    "translation": "<h3 class=\"no-toc\">模板引用变量怎么得到它的值？</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "In most cases, Angular sets the reference variable's value to the element on which it was declared.\nIn the previous example, `phone` refers to the _phone number_ `<input>` box.\nThe phone button click handler passes the _input_ value to the component's `callPhone` method.\nBut a directive can change that behavior and set the value to something else, such as itself.\nThe `NgForm` directive does that.",
     "translation": "大多数情况下，Angular会把模板引用变量的值设置为声明它的那个元素。\n在上一个例子中，`phone`引用的是表示*电话号码*的`<input>`框。\n\"拨号\"按钮的点击事件处理器把这个*input*值传给了组件的`callPhone`方法。\n不过，指令也可以修改这种行为，让这个值引用到别处，比如它自身。\n`NgForm`指令就是这么做的。",
@@ -23394,6 +23839,11 @@
     "translation": "原生的`<form>`元素没有`form`属性，但`NgForm`指令有。这就解释了为何当`heroForm.form.valid`是无效时我们可以禁用提交按钮，\n并能把整个表单控件树传给父组件的`onSubmit`方法。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Template reference variable warning notes</h3>",
+    "translation": "<h3 class=\"no-toc\">关于模板引用变量的注意事项</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "A template _reference_ variable (`#phone`) is _not_ the same as a template _input_ variable (`let phone`)\nsuch as you might see in an [`*ngFor`](guide/template-syntax#template-input-variable).\nLearn the difference in the [_Structural Directives_](guide/structural-directives#template-input-variable) guide.",
     "translation": "模板*引用*变量 (`#phone`) 和[`*ngFor`](guide/template-syntax#template-input-variable)部分看到过的模板*输入*变量 (`let phone`) 是不同的。\n要了解详情，参见[结构型指令](guide/structural-directives#template-input-variable)一章。",
@@ -23684,6 +24134,11 @@
     "translation": "如果我们打开了严格控制检测，那就要用到这个模板操作符，而其它情况下则是可选的。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
   },
+  {
+    "original": "<a href=\"#top-of-page\">back to top</a>",
+    "translation": "<a href=\"#top-of-page\">回到顶部</a>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/template-syntax.md"
+  },
   {
     "original": "## Summary",
     "translation": "## 小结",
@@ -25030,7 +25485,7 @@
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/upgrade.md"
   },
   {
-    "original": "`@types/angular` is declared as a UMD module, and due to the way\n<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\">UMD typings</a>\nwork, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
+    "original": "work, once you have an ES6 `import` statement in a file all UMD typed modules must also be\nimported via `import` statements instead of being globally available.",
     "translation": "`@types/angular`声明为UMD模块，根据<a href=\"https://github.com/Microsoft/TypeScript/wiki/What's-new-in-TypeScript#support-for-umd-module-definitions\" target=\"_blank\">UMD类型</a>\n的工作方式，一旦你在文件中有一条ES6的`import`语句，所有的UMD类型化的模型必须都通过`import`语句导入，\n而是不是全局可用。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/upgrade.md"
   },
@@ -25671,7 +26126,7 @@
   },
   {
     "original": "Run the <live-example></live-example>.",
-    "translation": "运行",
+    "translation": "运行<live-example></live-example>",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/user-input.md"
   },
   {
@@ -26969,6 +27424,11 @@
     "translation": "这里又是TypeScript的入口点文件，它定义了`polyfills`和`vendor`这两个包。",
     "sourceFile": "/Users/twer/private/GDE/content-3/guide/webpack.md"
   },
+  {
+    "original": "<h3 class=\"no-toc\">Highlights</h3>",
+    "translation": "<h3 class=\"no-toc\">重点</h3>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/guide/webpack.md"
+  },
   {
     "original": "* There are no `<script>` or `<link>` tags in the `index.html`.\nThe `HtmlWebpackPlugin` inserts them dynamically at runtime.",
     "translation": "在`index.html`中没有&lt;script&gt;或&lt;link&gt;标签。\n  `HtmlWebpackPlugin`会在运行时动态插入它们。",
@@ -27014,6 +27474,51 @@
     "translation": "Angular 是一个开发平台。它能帮你更轻松的构建 Web 应用。Angular 集声明式模板、依赖注入、端到端工具和一些最佳实践于一身，为你解决开发方面的各种挑战。Angular 为开发者提升构建 Web、手机或桌面应用的能力。",
     "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
   },
+  {
+    "original": "<section>Get a Glimpse of Angular</section>",
+    "translation": "<section>Angular 走马观花</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "A quick look at an Angular \"hello world\" application.",
+    "translation": "快速体验 Angular 的 \"hello world\" 应用。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "体验 Angular",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "<section>Get Going with Angular</section>",
+    "translation": "<section>开始使用 Angular</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "Get going on your own environment with the Quickstart.",
+    "translation": "跟随\"快速上手\"构建你的开发环境",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "快速上手",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "<section>Fundamentals</section>",
+    "translation": "<section>基本原理</section>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "Learn Angular application fundamentals, starting with an architecture overview.",
+    "translation": "学习 Angular 应用的基本原理。<br/>从架构概览开始。",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
+  {
+    "original": "<p class=\"card-footer\">",
+    "translation": "架构",
+    "sourceFile": "/Users/twer/private/GDE/content-3/marketing/docs.md"
+  },
   {
     "original": "## Assumptions",
     "translation": "## 基本假设",
@@ -27119,6 +27624,11 @@
     "translation": "VTHINKXIE, Wilson Zeng, chensimeng, zjgzx1988, SunMing, fbchen, Trotyl Yu, 雪狼, afc163, xufei, lightningtgc",
     "sourceFile": "/Users/twer/private/GDE/content-3/translations/cn/news.md"
   },
+  {
+    "original": "<h1 class=\"no-toc\">Tutorial: Tour of Heroes</h1>",
+    "translation": "<h1 class=\"no-toc\">教程：英雄指南</h1>",
+    "sourceFile": "/Users/twer/private/GDE/content-3/tutorial/index.md"
+  },
   {
     "original": "The _Tour of Heroes_ tutorial covers the fundamentals of Angular.  \nIn this tutorial you will build an app that helps a staffing agency manage its stable of heroes.",
     "translation": "**英雄指南**教程涵盖了 Angular 的核心原理。在本教程中，我们将构建一个应用，来帮助招聘机构来管理一群英雄。",
diff --git a/aio/tools/translator/extractor.spec.ts b/aio/tools/translator/extractor.spec.ts
index 8ecc0d4750..51003be23c 100644
--- a/aio/tools/translator/extractor.spec.ts
+++ b/aio/tools/translator/extractor.spec.ts
@@ -45,6 +45,17 @@ describe('从对照翻译文件中采集生成字典', () => {
 
   });
 
+  it('处理 a 标签包裹的单行翻译文本', () => {
+    const result = gatherTranslations(`
+    <a>a</a>
+
+    <a>一</a>
+    
+    `);
+    expect(result).eql([{original: '<a>a</a>', translation: '<a>一</a>'}]);
+
+  });
+
   it('从真实的文件中采集（测试）', function () {
     const fs = require('fs');
     const content = fs.readFileSync(dirs.content + 'guide/forms.md', 'utf-8');
diff --git a/aio/tools/translator/extractor.ts b/aio/tools/translator/extractor.ts
index 5bdb9dda5c..726881cfcb 100644
--- a/aio/tools/translator/extractor.ts
+++ b/aio/tools/translator/extractor.ts
@@ -2,11 +2,10 @@ import * as globby from 'globby';
 import { DictEntry } from './dict-entry';
 import {
   isNotCnPages,
-  isOnlyTag,
+  isOnlyBeginTag,
   normalizeLines,
   originalIsNotChinese,
-  originalIsNotTag,
-  originalIsOnlyTag,
+  originalIsNotOnlyBeginTag,
   translationHasNotCodeExample,
 } from './utils';
 
@@ -30,11 +29,11 @@ export function gatherTranslations(text: string): DictEntry[] {
     if (isTranslation(translation)) {
       const original = purifyText(lines[i - 1]);
       // 对于包裹在 html tag 中的翻译文本进行特殊处理
-      if (isOnlyTag(original)) {
-        const prevTag = lines[i - 4].trim();
+      if (isOnlyBeginTag(original)) {
+        const prevBeginTag = lines[i - 4].trim();
         const prevEndTag = lines[i - 2].trim();
         const thisEndTag = lines[i + 1].trim();
-        if (original === prevTag && prevEndTag === thisEndTag) {
+        if (original === prevBeginTag && prevEndTag === thisEndTag) {
           result.push({
             original: lines[i - 3],
             translation: lines[i],
@@ -49,8 +48,7 @@ export function gatherTranslations(text: string): DictEntry[] {
     .filter(isNotCnPages)
     .filter(translationHasNotCodeExample)
     .filter(originalIsNotChinese)
-    .filter(originalIsNotTag)
-    .filter(originalIsOnlyTag)
+    .filter(originalIsNotOnlyBeginTag)
     .map(purifyEntry);
 }
 
diff --git a/aio/tools/translator/translate.spec.ts b/aio/tools/translator/translate.spec.ts
index c365650713..7019030652 100644
--- a/aio/tools/translator/translate.spec.ts
+++ b/aio/tools/translator/translate.spec.ts
@@ -4,7 +4,7 @@ import { kernelText, lookup } from './translate';
 
 describe('根据字典进行翻译', () => {
   it('抽取核心字符', function () {
-    expect(kernelText(' # Forms   ABC. ')).eql('FormsABC');
+    expect(kernelText(' # Forms   ABC. ')).eql('#FormsABC');
   });
 
   it('查字典', () => {
diff --git a/aio/tools/translator/translate.ts b/aio/tools/translator/translate.ts
index 381a28c737..e5a427ceb7 100644
--- a/aio/tools/translator/translate.ts
+++ b/aio/tools/translator/translate.ts
@@ -17,7 +17,6 @@ export function lookup(english: string, filename: RegExp = /.*/): DictEntry[] {
 export function kernelText(text: string): string {
   return text
     .replace(/[\s\n]+/g, '')
-    .replace(/^#+/g, '')
     .replace(/\.$/g, '')
     .trim();
 }
diff --git a/aio/tools/translator/utils.spec.ts b/aio/tools/translator/utils.spec.ts
index 7475b28a37..0e8a4ce8c8 100644
--- a/aio/tools/translator/utils.spec.ts
+++ b/aio/tools/translator/utils.spec.ts
@@ -61,11 +61,7 @@ def`);
     expect(lines).eql(`
     a
 
-    <h3 id="abc">
-
-    line
-
-    </h3>
+    <h3 id="abc">line</h3>
 
     b
 `);
diff --git a/aio/tools/translator/utils.ts b/aio/tools/translator/utils.ts
index b77b165342..ab9ac26ce8 100644
--- a/aio/tools/translator/utils.ts
+++ b/aio/tools/translator/utils.ts
@@ -17,12 +17,12 @@ export function originalIsNotTag(entry: DictEntry): boolean {
   return !isTagLine(entry.original);
 }
 
-export function isOnlyTag(text: string) {
+export function isOnlyBeginTag(text: string) {
   return /^\s*<\w+>\s*$/.test(text);
 }
 
-export function originalIsOnlyTag(entry: DictEntry): boolean {
-  return !isOnlyTag(entry.original);
+export function originalIsNotOnlyBeginTag(entry: DictEntry): boolean {
+  return !isOnlyBeginTag(entry.original);
 }
 
 export function isNotImg(entry: DictEntry): boolean {
@@ -53,10 +53,10 @@ export function normalizeLines(text: string): string {
   text = text.replace(hxPattern, '\n$1\n\n');
   const leadHxPattern = /^( *#.*)\n/g;
   text = text.replace(leadHxPattern, '$1\n\n');
-  const oneLinePairedTagPattern = /\n( *)<(p|code-example|div)( ?[^> \n]*)>([^<\n]*)<\/\2>( *)\n/g;
+  const oneLinePairedTagPattern = /\n( *)<(p|code-example|div|h\d+|a)( ?[^> \n]*)>([^<\n]*)<\/\2>( *)\n/g;
   text = text.replace(oneLinePairedTagPattern, '\n\n$1<$2$3>$4</$2>$5\n\n');
-  const oneLineHnTagPattern = /\n( *)<(h\d+|th|td)( ?[^> \n]*)>([^<\n]*)<\/\2>( *)\n/g;
-  text = text.replace(oneLineHnTagPattern, '\n\n$1<$2$3>\n\n$1$4\n\n$1</$2>$5\n\n');
+  const oneLineThTdTagPattern = /\n( *)<(th|td)( ?[^> \n]*)>([^<\n]*)<\/\2>( *)\n/g;
+  text = text.replace(oneLineThTdTagPattern, '\n\n$1<$2$3>\n\n$1$4\n\n$1</$2>$5\n\n');
   const oneLineCommentPattern = /\n( *)(<!--.*-->)( *)\n/g;
   text = text.replace(oneLineCommentPattern, '\n\n$1$2$3\n\n');
   const atTagCommentPattern = /\n( *)({@a.*})( *)\n/g;
@@ -66,8 +66,8 @@ export function normalizeLines(text: string): string {
   const multiLinePairedTagPattern = /\n( *)<(header|p)( *[^> \n]*)>\n*(.*?)\n*( *)<\/\2>( *)\n/g;
   text = text.replace(multiLinePairedTagPattern, '\n\n$1<$2$3>\n\n$4\n\n$5</$2>$6\n\n');
 
-  const multiLineCodePattern = /\n( *)```( *)\n/g;
-  text = text.replace(multiLineCodePattern, '\n\n$1```$2\n\n');
+  const multiLineCodePattern = /\n( *)```(\w*)( *)\n/g;
+  text = text.replace(multiLineCodePattern, '\n\n$1```$2$3\n\n');
 
   const multipleBlankLinePattern = /\n\s*\n+/g;
   text = text.replace(multipleBlankLinePattern, '\n\n');