mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 07:58:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes some chinese translation.

Browse source 
* '序列'(sequential)简介(introduction)' is a confusing literal translation.
* '私藏(private collection)' is misleading.
* Some fine tuning.
This commit is contained in:
Timothy Qiu 2013-05-26 00:30:00 +08:00
parent e75b8986bc
commit a69575da94
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/index.js
View file

@ -34,7 +34,7 @@ exports.sequenceInfo = {
'en_US': 'Introduction Sequence', 'en_US': 'Introduction Sequence',
'ja': 'まずはここから', 'ja': 'まずはここから',
'fr_FR': 'Sequence d\'introduction', 'fr_FR': 'Sequence d\'introduction',
'zh_CN': '序列简介', 'zh_CN': '基础篇',
'ko': '기본 명령어' 'ko': '기본 명령어'
}, },
about: { about: {

10
src/levels/mixed/grabbingOneCommit.js
View file

@ -17,7 +17,7 @@ exports.level = {
"ko": "딱 한개의 커밋만 가져오기", "ko": "딱 한개의 커밋만 가져오기",
"en_US": "Grabbing Just 1 Commit", "en_US": "Grabbing Just 1 Commit",
"ja": "Grabbing Just 1 Commit", "ja": "Grabbing Just 1 Commit",
"zh_CN": "私藏一个提交" "zh_CN": "只取一个提交"
}, },
"hint": { "hint": {
"en_US": "Remember, interactive rebase or cherry-pick is your friend here", "en_US": "Remember, interactive rebase or cherry-pick is your friend here",
@ -116,11 +116,11 @@ exports.level = {
"markdowns": [ "markdowns": [
"## 本地栈式提交 (Locally stacked commits)", "## 本地栈式提交 (Locally stacked commits)",
"", "",
"设想一下一个经常发生的场景：我在追踪一个有点棘手的 bug，为了更好地排查，我添加了一些 debug 语句和打印语句。", "设想一下一个经常发生的场景：我在追踪一个有点棘手的 bug，为了更好地排查，我添加了一些调试命令和打印语句。",
"", "",
"所有的这些调试和打印语句到只在它们的分支里。最终我终于找到这个 bug，揪出来 fix 掉，然后撒花庆祝！", "所有的这些调试和打印语句都只在它们自己的分支里。最终我终于找到这个 bug，揪出来 fix 掉，然后撒花庆祝！",
"", "",
"但有个问题就是现在我要把 `bugFix` 分支的工作合并回 `master` 分支上，我可以简单地快进（fast-forward） `master` 分支，但这样的话 `master` 分支就会包含我这些调试语句了。" "现在唯一的问题就是要把我在 `bugFix` 分支里的工作合并回 `master` 分支。我可以简单地把 `master` 分支快进（fast-forward），但这样的话 `master` 分支就会包含我这些调试语句了。"
] ]
} }
}, },
@ -128,7 +128,7 @@ exports.level = {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "markdowns": [
"现在就是 Git 大显神通的时候啦。我们有几种方法来解决这个问题，但最直接的方法是：", "现在就是 Git 大显神通的时候啦。解决这个问题的方法不止一个，但最直接的两个方法是：",
"", "",
"* `git rebase -i`", "* `git rebase -i`",
"* `git cherry-pick`", "* `git cherry-pick`",