翻译03 合并错项目了 不过还好(-｡-;)

Author: shenxl

03_about-state-and-meet-redux.js

@@ -60,6 +60,10 @@
 //     1) a place to put your application state
 //     2) a mechanism to subscribe to state updates
 //     3) a mechanism to dispatch actions to modifiers of your application state, AKA reducers
+//  总结一下，Redux能给你带来的有：
+//     1）一个你存放应用全局状态的容器
+//     2）一个监听者状态变更的机制
+//     3）一个调度action来改变应用状态的机制，又名reducers
 
 // The Redux instance is called a store and can be created like this:
 /*
@@ -68,9 +72,11 @@
 */
 
 // But if you run the code above, you'll notice that it throw an error:
+// 但是如果你执行上面的代码，你会发现抛出了错误异常
 //     Error: Invariant Violation: Expected the reducer to be a function.
 
 // That's because createStore expects a function that will allow it to reduce your state.
+// 这是因为createStore期望一个function来允许reduce应用state
 
 // Let's try again
 

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 redux-tutorial
 =========================
 
@@ -34,44 +33,4 @@ Being real js files, each example can be run to verify that it works as intended
 
 Enjoy!
 =======
-[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
-# React Tutorial
-
-This is the React comment box example from [the React tutorial](http://facebook.github.io/react/docs/tutorial.html).
-
-## To use
-
-There are several simple server implementations included. They all serve static files from `public/` and handle requests to `comments.json` to fetch or add data. Start a server with one of the following:
-
-### Node
-
-```sh
-npm install
-node server.js
-```
-
-### Python
-
-```sh
-pip install -r requirements.txt
-python server.py
-```
-
-### Ruby
-```sh
-ruby server.rb
-```
-
-### PHP
-```sh
-php server.php
-```
-
-### Go
-```sh
-go run server.go
-```
-
-And visit <http://localhost:3000/>. Try opening multiple tabs!
->>>>>>> bb30eecab69b8bdebb00bfa56e82222f36270178

package.json

@@ -1,5 +1,4 @@
 {
-<<<<<<< HEAD
   "name": "redux-tutorial",
   "version": "0.0.1",
   "description": "Learn how to use redux step by step",
@@ -34,37 +33,5 @@
     "babel-eslint": "^3.1.9",
     "eslint-plugin-react": "^2.3.0",
     "webpack-dev-server": "^1.8.2"
-=======
-  "name": "react-tutorial",
-  "version": "0.0.0",
-  "description": "Code from the React tutorial.",
-  "main": "server.js",
-  "dependencies": {
-    "body-parser": "^1.4.3",
-    "express": "^4.4.5"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/reactjs/react-tutorial.git"
-  },
-  "keywords": [
-    "react",
-    "tutorial",
-    "comment",
-    "example"
-  ],
-  "author": "petehunt",
-  "bugs": {
-    "url": "https://github.com/reactjs/react-tutorial/issues"
-  },
-  "homepage": "https://github.com/reactjs/react-tutorial",
-  "engines" : {
-    "node" : "0.12.x"
->>>>>>> bb30eecab69b8bdebb00bfa56e82222f36270178
   }
 }