WOOHOO More zh_CN strings thanks a ton @acecode Pull #65 Issue #65

src/levels/index.js

@@ -39,24 +39,28 @@ exports.sequenceInfo = {
     displayName: {
       'en_US': 'Master the Rebase Luke!',
       'fr_FR': 'Maîtrise Rebase, Luke!',
+      'zh_CN': '掌握衍合，兄弟！',
       'ko': '리베이스 완전정복!'
     },
     about: {
       'en_US': 'What is this whole rebase hotness everyone is talking about? Find out!',
       'fr_FR': 'Que\'est-ce que c\'est que ce rebase dont tout le monde parle ? Découvrez-le !',
-      'ko': '그 좋다고들 말하는 rebase에 대해 알아봅시다!'
+      'ko': '그 좋다고들 말하는 rebase에 대해 알아봅시다!',
+      'zh_CN': '大家说的火热的衍合都是些神马？看看吧！'
     }
   },
   mixed: {
     displayName: {
       'en_US': 'A Mixed Bag',
       'fr_FR': 'Un assortiment',
-      'ko': '종합선물세트'
+      'ko': '종합선물세트',
+      'zh_CN': '大杂烩？'
     },
     about: {
       'en_US': 'A mixed bag of Git techniques, tricks, and tips',
       'fr_FR': 'Un assortiment de techniques et astuces pour utiliser Git',
-      'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다'
+      'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다',
+      'zh_CN': 'Git技术，技巧与贴士'
     }
   }
 };

src/levels/intro/1.js

@@ -2,7 +2,8 @@ exports.level = {
   "name": {
     "en_US": "Introduction to Git Commits",
     "fr_FR": "Introduction aux commits avec Git",
-    'ko': 'Git 커밋 소개'
+    'ko': 'Git 커밋 소개',
+    'zh_CN': '介绍Git提交'
   },
   "goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C3\",\"id\":\"master\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
   "solutionCommand": "git commit;git commit",

src/levels/intro/2.js

@@ -2,9 +2,10 @@ exports.level = {
   "goalTreeString": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\"},\"bugFix\":{\"target\":\"C1\",\"id\":\"bugFix\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"bugFix\",\"id\":\"HEAD\"}}",
   "solutionCommand": "git branch bugFix;git checkout bugFix",
   "name": {
+    "en_US": "Branching in Git",
     "ko": "Git에서 브랜치 쓰기",
     "fr_FR": "Gérer les branches avec Git",
-    "en_US": "Branching in Git"
+    "zh_CN": "Git开分支"
   },
   "hint": {
     "en_US": "Make a new branch with \"git branch [name]\" and check it out with \"git checkout [name]\"",

src/levels/intro/3.js

@@ -4,7 +4,8 @@ exports.level = {
   "name": {
     "en_US": "Merging in Git",
     "fr_FR": "Faire des 'merge' (fusions de branches) avec Git",
-    "ko": "Git에서 브랜치 합치기(Merge)"
+    "ko": "Git에서 브랜치 합치기(Merge)",
+    "zh_CN": "Git合并(Merge)"
   },
   "hint": {
     "en_US": "Remember to commit in the order specified (bugFix before master)",
@@ -178,7 +179,7 @@ exports.level = {
               "",
               "我们将要把分支 `bugFix` 合并到 `master` 上"
             ],
-            "command": "git merge bugFix master",
+            "command": "git merge bugFix",
             "afterMarkdowns": [
               "哇！看见木有？`master` 分支现在指向了一个拥有两个爸爸的提交。假如你从 `master` 开始沿着箭头走到起点，沿路你可以遍历到所有的提交。这就表明 `master` 包含了仓库里所有的内容了。",
               "",
@@ -195,13 +196,13 @@ exports.level = {
             "beforeMarkdowns": [
               "让我们把 `master` 分支合并到 `bugFix` 吧。"
             ],
-            "command": "git merge master bugFix",
+            "command": "git checkout bugFix; git merge master",
             "afterMarkdowns": [
               "因为 `bugFix` 分支在 `master` 分支的上游，所以 git 不用做什么额外的工作，只要把 `master` 分支的最新提交移到 `bugFix` 分支就可以了。",
               "",
               "现在所有的提交的颜色都是一样的啦，这表明现在所有的分支都包含了仓库里所有的东西！走起！"
             ],
-            "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix master"
+            "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
           }
         },
         {
@@ -254,7 +255,7 @@ exports.level = {
               "",
               "그런식으로 여기에 `bugFix`브랜치 쪽을 제외한 나머지 커밋만 `master` 브랜치의 색으로 칠해져 있습니다. 이걸 고쳐보죠..."
             ],
-            "command": "git merge bugFix master",
+            "command": "git merge bugFix",
             "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit"
           }
         },
@@ -269,8 +270,8 @@ exports.level = {
               "",
               "짜잔! 이제 모든 커밋의 색이 같아졌고, 이는 두 브랜치가 모두 저장소의 모든 작업 내역을 포함하고 있다는 뜻입니다."
             ],
-            "command": "git merge master bugFix",
-            "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix master"
+            "command": "git checkout bugFix; git merge master",
+            "beforeCommand": "git checkout -b bugFix; git commit; git checkout master; git commit; git merge bugFix"
           }
         },
         {

src/levels/intro/4.js

@@ -4,7 +4,8 @@ exports.level = {
   "name": {
     "en_US": "Rebase Introduction",
     "fr_FR": "Introduction à rebase",
-    "ko": "리베이스(rebase)의 기본"
+    "ko": "리베이스(rebase)의 기본",
+    "zh_CN": "介绍衍合(rebase)"
   },
   "hint": {
     "en_US": "Make sure you commit from bugFix first",

src/levels/intro/5.js

@@ -5,7 +5,8 @@ exports.level = {
   "name": {
     "en_US": "Reversing Changes in Git",
     "fr_FR": "Annuler des changements avec Git",
-    "ko": "Git에서 작업 되돌리기"
+    "ko": "Git에서 작업 되돌리기",
+    "zh_CN": "Git撤销改变"
   },
   "hint": {
     "en_US": "",

src/levels/mixed/1.js

@@ -8,7 +8,8 @@ exports.level = {
   "startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\"},\"debug\":{\"target\":\"C2\",\"id\":\"debug\"},\"printf\":{\"target\":\"C3\",\"id\":\"printf\"},\"bugFix\":{\"target\":\"C4\",\"id\":\"bugFix\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\"],\"id\":\"C4\"}},\"HEAD\":{\"target\":\"bugFix\",\"id\":\"HEAD\"}}",
   "name": {
     "ko": "딱 한개의 커밋만 가져오기",
-    "en_US": "Grabbing Just 1 Commit"
+    "en_US": "Grabbing Just 1 Commit",
+    "zh_CN": "私藏一个提交"
   },
   "hint": {
     "en_US": "Remember, interactive rebase or cherry-pick is your friend here",

src/levels/mixed/2.js

@@ -9,7 +9,8 @@ exports.level = {
   "startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\"},\"newImage\":{\"target\":\"C2\",\"id\":\"newImage\"},\"caption\":{\"target\":\"C3\",\"id\":\"caption\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C2\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"caption\",\"id\":\"HEAD\"}}",
   "name": {
     "ko": "커밋들 갖고 놀기",
-    "en_US": "Juggling Commits"
+    "en_US": "Juggling Commits",
+    "zh_CN": "Git提交戏法"
   },
   "hint": {
     "en_US": "The first command is git rebase -i HEAD~2",

src/levels/mixed/3.js

@@ -8,7 +8,8 @@ exports.level = {
   "compareOnlyMaster": true,
   "name": {
     "ko": "커밋 갖고 놀기 #2",
-    "en_US": "Juggling Commits #2"
+    "en_US": "Juggling Commits #2",
+    "zh_CN": "提交交换戏法 #2"
   },
   "hint": {
     "en_US": "Don't forget to forward master to the updated changes!",