mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-06 11:04:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'more-zh-translation' of git://github.com/dotnil/learnGitBranching into dotnil

Browse source 
Issue #74
This commit is contained in:
Peter Cottle 2013-03-07 20:19:12 -08:00
parent b3c6b6de66
commit 6fdcbbcee1
9 changed files with 149 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/levels/rebase/1.js
View file

@ -8,12 +8,13 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C2\",\"id\":\"master\"},\"bugFix\":{\"target\":\"C3\",\"id\":\"bugFix\"},\"side\":{\"target\":\"C6\",\"id\":\"side\"},\"another\":{\"target\":\"C7\",\"id\":\"another\"}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C0\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C4\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C5\"],\"id\":\"C7\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"name": {
"ko": "9천번이 넘는 리베이스",
"en_US": "Rebasing over 9000 times"
"en_US": "Rebasing over 9000 times",
"zh_CN": "衍合一百遍啊一百遍"
},
"hint": {
"en_US": "Remember, the most efficient way might be to only update master at the end...",
"ko": "아마도 master를 마지막에 업데이트하는 것이 가장 효율적인 방법일 것입니다...",
"zh_CN": "记住，可能最终最高效的方法就是更新 master 分支..."
"zh_CN": "记住，可能最终最高效的方法就是更新主分支（master）……"
},
"startDialog": {
"en_US": {
@ -44,7 +45,7 @@ exports.level = {
"",
"呐，现在我们有很多分支啦！让我们把这些分支的工作衍合到 master 分支上吧。",
"",
"但是上头（upper management）给出了一点障碍 —— 他们要希望提交历史是有顺序的，也就是我们最终的结果是 `C7'` 在最底部，`C6'` 在它上面，以此类推。",
"但是上头（upper management）找了点麻烦 —— 他们要希望提交历史是有序的，也就是我们最终的结果是 `C7'` 在最底部，`C6'` 在它上面，以此类推。",
"",
"假如你搞砸了，没所谓的（虽然我不会告诉你用 `reset` 可以重新开始）。记得最后要看看我们的答案，并和你的对比下，看谁敲的命令更少哦！"
]