Imported all zh_CN dialogs and added locale changing support Issue #42

This commit is contained in:
Peter Cottle 2013-02-23 14:31:40 -08:00
parent 2617357460
commit cc5466b038
22 changed files with 1693 additions and 222 deletions

View file

@ -7,9 +7,12 @@ exports.level = {
"solutionCommand": "git checkout master;git cherry-pick C4",
"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": "Grabbing Just 1 Commit",
"hint": "Remember, interactive rebase or cherry-pick is your friend here",
"hint": {
"en_US": "Remember, interactive rebase or cherry-pick is your friend here",
"zh_CN": "\u8bb0\u4f4f\uff0c\u4ea4\u4e92\u5f0f rebase \u6216\u8005 cherry-pick \u4f1a\u5f88\u6709\u5e2e\u52a9"
},
"startDialog": {
"en": {
"en_US": {
"childViews": [
{
"type": "ModalAlert",
@ -49,6 +52,47 @@ exports.level = {
}
}
]
},
"zh_CN": {
"childViews": [
{
"type": "ModalAlert",
"options": {
"markdowns": [
"## 本地栈式提交 (Locally stacked commits)",
"",
"设想一下一个经常发生的场景:我在追踪一个有点棘手的 bug为了更好地排查我添加了一些 debug 语句和打印语句。",
"",
"所有的这些调试和打印语句到只在它们的分支里。最终我终于找到这个 bug揪出来 fix 掉,然后撒花庆祝!",
"",
"但有个问题就是现在我要把 `bugFix` 分支的工作合并回 `master` 分支上我可以简单地快进fast-forward `master` 分支,但这样的话 `master` 分支就会包含我这些调试语句了。"
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"现在就是 Git 大显神通的时候啦。我们有几种方法来解决这个问题,但最直接的方法是:",
"",
"* `git rebase -i`",
"* `git cherry-pick`",
"",
"交互(`-i`)衍合允许你选择哪些提交是要被保留,哪些要被舍弃。它允许你将提交重新排序。假如你要舍弃一些工作,这个会帮上很大的忙。",
"",
"Cherry-picking 能让你选择单独一个提交并且把它放到 `HEAD` 的最前端。"
]
}
},
{
"type": "ModalAlert",
"options": {
"markdowns": [
"本关是可选关卡,玩不玩随便你。但是如果你坚持要刷,确保 `master` 分支能拿到 `bugFix` 分支的相关提交references。"
]
}
}
]
}
}
};