| 
							
							
								 Zhicheng WANG | d17cf5f506 | fix: 修订合并冲突 | 2019-06-07 14:00:45 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 0fddc95118 | Merge branch 'en-master' into aio | 2019-06-07 12:29:04 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 0dee068b00 | fix: 纠错 | 2019-06-05 13:58:31 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 4ac2511634 | fix: 修订了一部分翻译 | 2019-06-04 19:00:20 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | d5057aec3b | Merge remote-tracking branch 'en/master' into aio | 2019-06-03 10:09:20 +08:00 |  | 
			
				
					| 
							
							
								 Rado Kirov | a2d26c6f2a | docs: improve glossary for entry-point. (#29433) PR Close #29433 | 2019-05-30 13:40:55 -04:00 |  | 
			
				
					| 
							
							
								 jenniferfell | 1c3ee41902 | docs: move old quick start content into new local setup guide (#29651) PR Close #29651 | 2019-05-20 10:16:23 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | f015dbe1ba | docs: add architect terms (#26963) PR Close #26963 | 2019-04-29 13:22:20 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | 0c47dc0466 | docs: add universal terms to glossary (#28492) PR Close #28492 | 2019-04-04 14:26:36 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 7c81861676 | fix: 文字微调:工作空间 ==> 工作区 | 2019-02-22 03:52:36 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 5be0566951 | fix: 修复合并错误和遗漏的翻译 | 2019-02-17 09:47:12 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | b035e68480 | Merge remote-tracking branch 'en/master' into aio # Conflicts:
#	.travis.yml
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/build.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/deployment.md
#	aio/content/guide/elements.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/marketing/docs.md
#	aio/content/marketing/features.html
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/layout/footer/footer.component.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/yarn.lock
#	integration/cli-hello-world-ivy-minimal/src/polyfills.ts
#	modules/benchmarks/e2e_test/largetable_perf.ts
#	modules/benchmarks/e2e_test/largetable_spec.ts
#	packages/animations/src/animation_metadata.ts
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_style.ts
#	packages/common/src/directives/ng_switch.ts
#	packages/core/src/change_detection/change_detection_util.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/interface/lifecycle_hooks.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/router/src/config.ts
#	packages/router/src/directives/router_link.ts | 2019-02-17 00:00:16 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 9ec21f77fd | fix: 精修翻译 | 2019-02-15 07:12:41 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 56a017a977 | fix: 精修翻译 | 2019-02-15 07:12:40 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | c63a778e26 | fix: 修复一些翻译错误 | 2019-02-15 07:12:39 +08:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | a6f7fe394a | docs: add schematics terms to glossary (#27862) PR Close #27862 | 2019-01-11 11:15:08 -08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 3e02cb65fc | fix: 翻译遗漏的内容 | 2019-01-04 15:43:45 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 0a5eb3a660 | fix: 翻译遗漏的部分 | 2019-01-03 20:41:20 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 49fd2eb76d | fix: 移除纯粹由空格组成的行,它会导致错误的 markdown 编译 | 2019-01-01 22:17:43 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng WANG | 8744f17f5d | Merge remote-tracking branch 'en/master' into aio # Conflicts:
#	aio/content/cli/index.md
#	aio/content/file-not-found.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/build.md
#	aio/content/guide/deployment.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/file-structure.md
#	aio/content/guide/forms-overview.md
#	aio/content/guide/glossary.md
#	aio/content/guide/i18n.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/testing.md
#	aio/content/guide/upgrade-performance.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/documents/document.service.ts
#	aio/src/app/layout/top-menu/top-menu.component.ts
#	aio/src/index.html
#	aio/src/styles/2-modules/_api-pages.scss
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/cli/cli-container.template.html
#	aio/tools/transforms/templates/lib/githubLinks.html
#	aio/yarn.lock
#	packages/animations/src/animation_metadata.ts
#	packages/common/http/src/backend.ts
#	packages/common/http/src/client.ts
#	packages/common/http/src/headers.ts
#	packages/common/http/src/interceptor.ts
#	packages/common/http/src/module.ts
#	packages/common/http/src/params.ts
#	packages/common/http/src/request.ts
#	packages/common/http/src/response.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_class.ts
#	packages/common/src/directives/ng_style.ts
#	packages/common/src/directives/ng_switch.ts
#	packages/common/src/i18n/format_date.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/core/src/change_detection/change_detection_util.ts
#	packages/core/src/change_detection/pipe_transform.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/element_ref.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/directives.ts
#	packages/core/src/metadata/lifecycle_hooks.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_builder.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/platform-browser/src/browser.ts
#	packages/platform-browser/src/security/dom_sanitization_service.ts
#	packages/router/src/config.ts
#	packages/router/src/events.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/shared.ts | 2018-12-29 16:04:37 +08:00 |  | 
			
				
					| 
							
							
								 Brandon Roberts | 30f12f2887 | docs: add forms terms to glossary (#27075) PR Close #27075 | 2018-11-26 09:26:06 -08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 9342e862f5 | docs: 补充遗漏的翻译 | 2018-10-27 09:17:08 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 9a0d3e9633 | docs: 手动解决冲突 | 2018-10-22 18:16:47 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | a9ac90d3df | Merge remote-tracking branch 'en/master' into aio # Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-next-steps.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/comparing-observables.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/elements.md
#	aio/content/guide/feature-modules.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/lazy-loading-ngmodules.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule-vs-jsmodule.md
#	aio/content/guide/ngmodules.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables-in-angular.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/practical-observable-usage.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-communications.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/service-worker-intro.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/singleton-services.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/updating.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/ngsw-manifest.json
#	aio/package.json
#	aio/src/app/custom-elements/api/api-list.component.html
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/index.html
#	aio/tools/transforms/templates/api/base.template.html
#	aio/tools/transforms/templates/api/class.template.html
#	aio/tools/transforms/templates/api/directive.template.html
#	aio/tools/transforms/templates/api/enum.template.html
#	aio/tools/transforms/templates/api/includes/class-overview.html
#	aio/tools/transforms/templates/api/includes/deprecation.html
#	aio/tools/transforms/templates/api/includes/export-as.html
#	aio/tools/transforms/templates/api/includes/info-bar.html
#	aio/tools/transforms/templates/api/includes/interface-overview.html
#	aio/tools/transforms/templates/api/includes/selectors.html
#	aio/tools/transforms/templates/api/lib/directiveHelpers.html
#	aio/tools/transforms/templates/api/lib/githubLinks.html
#	aio/tools/transforms/templates/api/lib/memberHelpers.html
#	aio/tools/transforms/templates/api/package.template.html
#	aio/yarn.lock
#	packages/common/http/src/module.ts
#	packages/common/src/common_module.ts
#	packages/common/src/directives/ng_for_of.ts
#	packages/common/src/directives/ng_if.ts
#	packages/common/src/directives/ng_template_outlet.ts
#	packages/common/src/location/location.ts
#	packages/common/src/pipes/async_pipe.ts
#	packages/common/src/pipes/json_pipe.ts
#	packages/common/src/pipes/number_pipe.ts
#	packages/common/src/pipes/slice_pipe.ts
#	packages/core/src/change_detection/change_detector_ref.ts
#	packages/core/src/di/injectable.ts
#	packages/core/src/linker/template_ref.ts
#	packages/core/src/linker/view_container_ref.ts
#	packages/core/src/metadata/di.ts
#	packages/core/src/metadata/ng_module.ts
#	packages/core/src/render/api.ts
#	packages/forms/src/directives/form_interface.ts
#	packages/forms/src/directives/ng_form.ts
#	packages/forms/src/directives/ng_model.ts
#	packages/forms/src/directives/reactive_directives/form_control_name.ts
#	packages/forms/src/directives/select_control_value_accessor.ts
#	packages/forms/src/directives/validators.ts
#	packages/forms/src/form_providers.ts
#	packages/forms/src/model.ts
#	packages/forms/src/validators.ts
#	packages/router/src/config.ts
#	packages/router/src/router.ts
#	packages/router/src/router_module.ts
#	packages/router/src/router_state.ts | 2018-10-21 17:43:29 +08:00 |  | 
			
				
					| 
							
							
								 jenniferfell | beebf7fe14 | docs: change links to cli wiki to link to new aio docs (#26489) PR Close #26489 | 2018-10-17 11:06:34 -07:00 |  | 
			
				
					| 
							
							
								 William Marques | fc6dad40ac | fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips (#26396) Closes #26174
PR Close #26396 | 2018-10-17 11:05:29 -07:00 |  | 
			
				
					| 
							
							
								 Frederik Schlemmer | 6c6bc95ac0 | docs: Rename 'QuickStart' into 'Getting Started' (#25762) Delete symlink
docs: Undo unwanted changes
docs: Rename 'QuickStart' into 'Getting Started'
Revert symlink commit
PR Close #25762 | 2018-10-05 15:43:16 -07:00 |  | 
			
				
					| 
							
							
								 Kirankumar Sripati | 245b85f72a | docs: typo fixes (#26247) PR Close #26247 | 2018-10-05 14:00:20 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | d2be3d5775 | docs: copy edit glossary (#25468) PR Close #25468 | 2018-08-17 14:33:51 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 966a29e072 | fix: 修正合并时的错误 | 2018-07-27 20:22:07 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 2d485c6589 | Merge remote-tracking branch 'en/master' into aio # Conflicts:
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/api-page-class.md
#	aio/content/guide/architecture-components.md
#	aio/content/guide/architecture-modules.md
#	aio/content/guide/architecture-services.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection-pattern.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/elements.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/frequent-ngmodules.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/language-service.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-api.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/observables.md
#	aio/content/guide/pipes.md
#	aio/content/guide/providers.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/releases.md
#	aio/content/guide/router.md
#	aio/content/guide/rx-library.md
#	aio/content/guide/security.md
#	aio/content/guide/service-worker-config.md
#	aio/content/guide/service-worker-getting-started.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing-observables.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/universal.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/content/tutorial/toh-pt0.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/custom-elements/api/api-list.component.ts
#	aio/src/app/custom-elements/live-example/live-example.component.html
#	aio/src/app/custom-elements/live-example/live-example.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/styles/main.scss
#	aio/tools/transforms/remark-package/services/renderMarkdown.js | 2018-07-27 10:51:18 +08:00 |  | 
			
				
					| 
							
							
								 Daniel Sogl | d0c066a223 | docs: replaced old angular/http example (#25065) PR Close #25065 | 2018-07-24 20:47:20 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | 50fbed8e5f | docs: correct project definition (#24807) PR Close #24807 | 2018-07-10 18:47:19 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | 3e6a722ddb | docs: add workspace and related cli terms (#24633) PR Close #24633 | 2018-07-06 10:13:39 -07:00 |  | 
			
				
					| 
							
							
								 Suguru Inatomi | 547efb5f4d | docs(aio): fix path to observables guide (#23858) PR Close #23858 | 2018-05-16 17:16:48 -04:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 47cc6f7a72 | fix: sync to 6.0(WIP) | 2018-05-15 10:50:10 +08:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | c4221dad11 | docs(elements): add angular element term to glossary (#23807) PR Close #23807 | 2018-05-10 15:50:00 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | f567e1898f | docs: update glossary architectural terms (#23045) PR Close #23045 | 2018-04-25 13:21:52 -07:00 |  | 
			
				
					| 
							
							
								 Judy Bogart | ff34d5ea7a | docs: add custom elements documentation (#22966) PR Close #22966 | 2018-04-02 14:13:46 -07:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e167fa5229 | refactor: 重构自动翻译代码 | 2018-03-24 20:03:10 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | a4ac40b640 | fix: 翻译了所有遗漏的部分。 | 2018-03-24 11:16:33 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 2b2b537008 | fix: 把中文中的_替换成* | 2018-03-22 17:24:05 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | f75baea397 | fix: 把除了 upgrading 之外的 我们 都替换成了 你 fix: 翻译了一部分 AOT Compiler | 2018-03-22 17:19:12 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 83e7817ff2 | fix: 统一了 JIT 和 AOT 的写法 | 2018-03-21 16:23:00 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 37e19cd50b | feat: 自动在中英文之间添加空格,以改善排版 | 2018-03-20 17:15:36 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 545d4b6c69 | feat: 自动在中英文之间添加空格,以改善排版 | 2018-03-20 17:09:18 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | b7ceb9e211 | fix: 修正了死链接 | 2018-03-07 16:48:44 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 964266f4b0 | fix: 合并第一版的翻译 | 2018-03-07 15:42:49 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | fc58e0eee0 | fix: 合并第二版的翻译 | 2018-03-07 14:54:27 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 0e0ffa481e | fix: 修正自动翻译结果 | 2018-03-07 11:25:56 +08:00 |  |