Update getting-started and intro-react

cndocs/getting-started.md

@@ -316,11 +316,11 @@ React Native 需要通过环境变量来了解你的 Android SDK 装在什么路
 
 <block class="native mac linux android" />
 
-具体的做法是把下面的命令加入到`~/.bash_profile`文件中：
+具体的做法是把下面的命令加入到shell的配置文件中。如果你的shell是zsh，则配置文件为`~/.zshrc`，如果是bash则为`~/.bash_profile`（可以使用`echo $0`命令查看你所使用的shell。）：
 
 <block class="native mac android" />
 
-> 译注：~表示用户目录，即`/Users/你的用户名/`，而小数点开头的文件在 Finder 中是隐藏的，并且这个文件有可能并不存在。可在终端下使用`vi ~/.bash_profile`命令创建或编辑。如不熟悉 vi 操作，请点击[这里](http://www.eepw.com.cn/article/48018.htm)学习。
+> 译注：~表示用户目录，即`/Users/你的用户名/`，而小数点开头的文件在 Finder 中是隐藏的，并且这个文件有可能并不存在。可在终端下使用`vi ~/.zshrc`命令创建或编辑。如不熟悉 vi 操作，请点击[这里](http://www.eepw.com.cn/article/48018.htm)学习。
 
 ```
 # 如果你不是通过Android Studio安装的sdk，则其路径可能不同，请自行确定清楚。
@@ -344,9 +344,7 @@ export PATH=$PATH:$ANDROID_HOME/emulator
 
 <block class="native mac linux android" />
 
-> 如果你的命令行不是 bash，而是例如 zsh 等其他，请使用对应的配置文件。
-
-使用`source $HOME/.bash_profile`命令来使环境变量设置立即生效（否则重启后才生效）。可以使用`echo $ANDROID_HOME`检查此变量是否已正确设置。
+使用`source $HOME/.zshrc`命令来使环境变量设置立即生效（否则重启后才生效）。可以使用`echo $ANDROID_HOME`检查此变量是否已正确设置。
 
 > 请确保你正常指定了 Android SDK 路径。你可以在 Android Studio 的"Preferences"菜单中查看 SDK 的真实路径，具体是**Appearance & Behavior** → **System Settings** → **Android SDK**。
 

cndocs/intro-react.md

@@ -4,18 +4,18 @@ title: React基础
 description: To understand React Native fully, you need a solid foundation in React. This short introduction to React can help you get started or get refreshed.
 ---
 
-React Native runs on [React](https://reactjs.org/), a popular open source library for building user interfaces with JavaScript. To make the most of React Native, it helps to understand React itself. This section can get you started or can serve as a refresher course.
+React Native的基础是[React](https://reactjs.org/)， 是在web端非常流行的开源UI框架。要想掌握React Native，先了解React框架本身是非常有帮助的。本文旨在为初学者介绍一些react的入门知识。
 
-We’re going to cover the core concepts behind React:
+本文主要会探讨以下几个React的核心概念：
 
-- components
+- components 组件
 - JSX
-- props
-- state
+- props 属性
+- state 状态
 
-If you want to dig deeper, we encourage you to check out [React’s official documentation](https://reactjs.org/docs/getting-started.html).
+如果你想更深一步学习，我们建议你阅读[React的官方文档](https://zh-hans.reactjs.org/)，它也提供有中文版。
 
-## Your first component
+## 尝试编写一个组件
 
 The rest of this introduction to React uses cats in its examples: friendly, approachable creatures that need names and a cafe to work in. Here is your very first Cat component:
 
@@ -159,7 +159,7 @@ You can think of curly braces as creating a portal into JS functionality in your
 
 > Because JSX is included in the React library, it won’t work if you don’t have `import React from 'react'` at the top of your file!
 
-## Custom Components
+## 自定义组件
 
 You’ve already met [React Native’s Core Components](intro-react-native-components). React lets you nest these components inside each other to create new components. These nestable, reusable components are at the heart of the React paradigm.
 
@@ -227,9 +227,9 @@ Any component that renders other components is a **parent component.** Here, `Ca
 
 You can put as many cats in your cafe as you like. Each `<Cat>` renders a unique element—which you can customize with props.
 
-## Props
+## Props 属性
 
-**Props** is short for “properties.” Props let you customize React components. For example, here you pass each `<Cat>` a different `name` for `Cat` to render:
+**Props** 是“properties”（属性）的简写。 Props let you customize React components. For example, here you pass each `<Cat>` a different `name` for `Cat` to render:
 
 ```SnackPlayer name=Multiple%20Props
 import React from 'react';
@@ -252,7 +252,7 @@ export default function Cafe() {
 }
 ```
 
-Most of React Native’s Core Components can be customized with props, too. For example, when using [`Image`](image), you pass it a prop named [`source`](image#source) to define what image it shows:
+React Native的绝大多数核心组件都提供了可定制的props。For example, when using [`Image`](image), you pass it a prop named [`source`](image#source) to define what image it shows:
 
 ```SnackPlayer name=Props
 import React from 'react';
@@ -274,7 +274,7 @@ export default function CatApp() {
 
 > Notice the double curly braces `{{ }}` surrounding `style`‘s width and height. In JSX, JavaScript values are referenced with `{}`. This is handy if you are passing something other than a string as props, like an array or number: `<Cat food={["fish", "kibble"]} /> age={2}`. However, JS objects are **_also_** denoted with curly braces: `{width: 200, height: 200}`. Therefore, to pass a JS object in JSX, you must wrap the object in **another pair** of curly braces: `{{width: 200, height: 200}}` You can build many things with props and the Core Components [`Text`](text), [`Image`](image), and [`View`](view)! But to build something interactive, you’ll need state.
 
-## State
+## State 状态
 
 While you can think of props as arguments you use to configure how components render, **state** is like a component’s personal data storage. Sate is useful for handling data that changes over time or that comes from user interaction. State gives your components memory!
 
@@ -325,7 +325,7 @@ export default function Cafe() {
 }
 ```
 
-First, you will want to import `useState` from React like so:
+首先要从react中引入`useState`：
 
 ```jsx
 import React, {useState} from 'react';
@@ -428,7 +428,7 @@ As always with class components, you must import the `Component` class from Reac
 import React, {Component} from 'react';
 ```
 
-In class components, state is stored in a state object:
+在class组件中， state以对象的形式存放：
 
 ```jsx
 export class Cat extends Component {