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

modify and add Chinese

Browse source
This commit is contained in:
Hermione 2014-07-18 17:50:18 +08:00
parent 2bfd12f750
commit ce2a97c332
21 changed files with 36 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/levels/index.js
View file

@ -109,7 +109,7 @@ var sequenceInfo = exports.sequenceInfo = {
'fr_FR': 'C\'est le temps de partager vos 1 et vos 0 les envants, le code vient de devenir social.',
'de_DE': 'Zeit Eure 1en und 0en zu teilen; Coding mit sozialer Komponente',
'es_AR': 'Hora de compartir sus 1\'s y 0\'s, chicos; programar se volvió social!',
'zh_CN': '是时候分享你的编码了',
'zh_CN': '是时候分享你的代码了',
'zh_TW': '是時候分享你的程式碼了'
}
},
@ -140,7 +140,7 @@ var sequenceInfo = exports.sequenceInfo = {
'es_AR': 'Moviendo el trabajo por ahí',
// INTL out of sync :(
'ja': 'Rebaseをモノにする',
'zh_CN': '精通Rebase！',
'zh_CN': '精通 rebase！',
'zh_TW': '精通 rebase！',
'ko': '리베이스 완전정복!'
},
@ -174,7 +174,7 @@ var sequenceInfo = exports.sequenceInfo = {
'fr_FR': 'Un assortiment de techniques et astuces pour utiliser Git',
'es_AR': 'Un rejunte de técnicas, trucos y tips sobre Git',
'ko': 'Git을 다루는 다양한 팁과 테크닉을 다양하게 알아봅니다',
'zh_CN': 'Git技术，技巧与贴士杂烩',
'zh_CN': 'Git技术、技巧与贴士杂烩',
'zh_TW': 'git 的技術，招數與技巧'
}
},

2
src/levels/intro/rebasing.js
View file

@ -8,7 +8,7 @@ exports.level = {
"es_AR": "Introducción a rebase",
"fr_FR": "Introduction à rebase",
"ko": "리베이스(rebase)의 기본",
"zh_CN": "Rebase简介",
"zh_CN": "介绍 rebase",
"zh_TW": "介紹 rebase"
},
"hint": {

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

@ -20,7 +20,7 @@ exports.level = {
"de_DE": "Einen Commit pflücken",
"es_AR": "Tomando un único commit",
"ja": "Grabbing Just 1 Commit",
"zh_CN": "只取一个提交",
"zh_CN": "只取一个 commit",
"zh_TW": "只取一個 commit"
},
"hint": {

4
src/levels/rampup/cherryPick.js
View file

@ -10,14 +10,14 @@ exports.level = {
"en_US": "Cherry-pick Intro",
"de_DE": "Einführung Cherry-picking",
"es_AR": "Introducción a cherry-pick",
"zh_CN": "Cherry-pick Intro",
"zh_CN": "介绍 Cherry-pick",
"zh_TW": "介紹 cherry-pick"
},
"hint": {
"en_US": "git cherry-pick followed by commit names!",
"de_DE": "git cherry-pick gefolgt von Commit-Namen.",
"es_AR": "git cherry-pick seguido de los nombres de los commits",
"zh_CN": "git cherry-pick 跟提交对句名",
"zh_CN": "git cherry-pick 后面跟着 commit 的名字",
"zh_TW": "git cherry-pick 後面要接著 commit 的名稱"
},
"startDialog": {

8
src/levels/rampup/detachedHead.js
View file

@ -262,10 +262,6 @@ exports.level = {
"在接触Git的更多高级主题之前，我们先学习用不同的方法在代表你的项目的提交记录树上前后移动。",
"",
"一旦能够熟练地在Git中前进后退，你使用其他git命令的威力也会被放大！",
"",
"",
"",
"",
""
]
}
@ -340,10 +336,6 @@ exports.level = {
"在接觸 git 的更多進階的主題之前，我們先學習用不同的方法在你的 project 中的 commit tree 上面移動。",
"",
"一旦能夠熟練地在 commit tree 中隨意地移動，你使用其它的 git 指令也會更厲害！",
"",
"",
"",
"",
""
]
}

1
src/levels/rampup/interactiveRebase.js
View file

@ -160,7 +160,6 @@ exports.level = {
"",
"如果你知道你所需要的提交对象(相应的hash), 那用Git cherry-pick 就非常方便了 -- 很难有简单的方式了",
"",
"But what about the situation where you don't know what commits you want? Thankfully git has you covered there as well! We can use interactive rebasing for this -- it's the best way to review a series of commits you're about to rebase.",
"但是如果你不清楚你想要的提交对象的hash呢? 幸好git 帮你想到了这一点, 我们可以利用交互rebase -- 如果你想衍合一系列的提交, 这就是最方便的方法了",
"",
"让我们看看细节.."

2
src/levels/rampup/reversingChanges.js
View file

@ -366,7 +366,7 @@ exports.level = {
],
"command": "git reset HEAD~1",
"afterMarkdowns": [
"Nice!Git把master分支的指向简单地移回到`C1`；现在我们的本地代码库处于没有提交过`C2`的状态了。"
"漂亮! Git把 master 分支的指向简单地移回到`C1`；现在我们的本地代码库处于没有提交过`C2`的状态了。"
],
"beforeCommand": "git commit"
}

4
src/levels/remote/clone.js
View file

@ -5,13 +5,13 @@ exports.level = {
"en_US": "Clone Intro",
"de_DE": "Clone Einführung",
"es_AR": "Introducción a clone",
"zh_CN": "Clone Intro",
"zh_CN": "介绍 Clone",
"zh_TW": "介紹 clone"
},
"hint": {
"en_US": "Just git clone!",
"de_DE": "Einfach git clone ausführen!",
"zh_CN": "Just git clone!",
"zh_CN": "只要 git clone!",
"es_AR": "Simplemente hacé git clone!",
"zh_TW": "只要 git clone 就好了"
},

4
src/levels/remote/fakeTeamwork.js
View file

@ -6,14 +6,14 @@ exports.level = {
"en_US": "Faking Teamwork",
"de_DE": "Teamarbeit simulieren",
"es_AR": "Simulando el trabajo en equipo",
"zh_CN": "Faking Teamwork",
"zh_CN": "模拟团队合作",
"zh_TW": "模擬團隊合作"
},
"hint": {
"en_US": "remember you can specify the number of commits to fake",
"de_DE": "Nicht vergessen, du kannst angeben wieviele Commits simuliert werden sollen.",
"es_AR": "Acordate que podés especificar cuántos commits simular",
"zh_CN": "记住为fake指定数量",
"zh_CN": "记住为fake中的commit指定数量",
"zh_TW": "你要記得指定要送多少個 commit 出去"
},
"startDialog": {

4
src/levels/remote/fetch.js
View file

@ -6,14 +6,14 @@ exports.level = {
"en_US": "Git Fetchin'",
"de_DE": "Git Fetch",
"es_AR": "git fetch",
"zh_CN": "Git Fetchin'",
"zh_CN": "Git Fetch",
"zh_TW": "git fetch"
},
"hint": {
"en_US": "just run git fetch!",
"de_DE": "Einfach git fetch ausführen!",
"es_AR": "Simplemente ¡hacé git fetch!",
"zh_CN": "just run git fetch!",
"zh_CN": "只要运行 git fetch 命令!",
"zh_TW": "只要下 git fetch 指令"
},
"startDialog": {

3
src/levels/remote/fetchArgs.js
View file

@ -4,7 +4,7 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"foo\":{\"target\":\"C1\",\"id\":\"foo\",\"remoteTrackingBranchID\":\"o/foo\"},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"o/foo\":{\"target\":\"C1\",\"id\":\"o/foo\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"C1\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"foo\":{\"target\":\"C6\",\"id\":\"foo\",\"remoteTrackingBranchID\":null}},\"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\"},\"C5\":{\"parents\":[\"C1\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"}},\"HEAD\":{\"target\":\"foo\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Fetch arguments",
"zh_CN": "Fetch arguments",
"zh_CN": "Fetch 的参数",
"zh_TW": "fetch 的參數",
"es_AR": "Parámetros de fetch",
"de_DE": "Optionen für Fetch"
@ -446,7 +446,6 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"\"Well in that case, what happens if I explicitly define both the source and destination with `<source>:<destination>`?\"",
"如果我们设定了 `<source>:<destination>`会发生什么呢?",
"",
"如果你觉得直接更新本地分支很爽, 那你就用冒号refspec吧. 不过, 你不能在检出的分支上干这个事.",

2
src/levels/remote/mergeManyFeatures.js
View file

@ -4,7 +4,7 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\",\"localBranchesThatTrackThis\":null},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":[\"master\"]},\"side1\":{\"target\":\"C2\",\"id\":\"side1\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null},\"side2\":{\"target\":\"C4\",\"id\":\"side2\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null},\"side3\":{\"target\":\"C7\",\"id\":\"side3\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"},\"C4\":{\"parents\":[\"C3\"],\"id\":\"C4\"},\"C5\":{\"parents\":[\"C1\"],\"id\":\"C5\"},\"C6\":{\"parents\":[\"C5\"],\"id\":\"C6\"},\"C7\":{\"parents\":[\"C6\"],\"id\":\"C7\"}},\"HEAD\":{\"target\":\"side3\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C8\",\"id\":\"master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C8\":{\"parents\":[\"C1\"],\"id\":\"C8\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Merging with remotes",
"zh_CN": "Merging with remotes",
"zh_CN": "和远端合并",
"zh_TW": "merge with remotes",
"es_AR": "Mergeando con los remotos",
"de_DE": "Änderungen vom Remote zusammenführen"

4
src/levels/remote/pull.js
View file

@ -4,14 +4,14 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C2\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\",\"localBranchesThatTrackThis\":null},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":[\"master\"]}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C3\",\"id\":\"master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Git Pullin'",
"zh_CN": "Git Pullin'",
"zh_CN": "Git Pull",
"zh_TW": "git pull'",
"es_AR": "git pull",
"de_DE": "Git Pull"
},
"hint": {
"en_US": "Just run git pull!",
"zh_CN": "Just run git pull!",
"zh_CN": "只要运行 git pull 命令!",
"zh_TW": "只要下 git pull 這個指令即可",
"es_AR": "Simplemente ¡hacé git pull!",
"de_DE": "Führe einfach git pull aus."

3
src/levels/remote/pullArgs.js
View file

@ -4,7 +4,7 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C4\",\"id\":\"master\",\"remoteTrackingBranchID\":\"o/master\"},\"o/master\":{\"target\":\"C1\",\"id\":\"o/master\",\"remoteTrackingBranchID\":null},\"o/bar\":{\"target\":\"C1\",\"id\":\"o/bar\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C4\":{\"parents\":[\"C1\"],\"id\":\"C4\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"},\"originTree\":{\"branches\":{\"master\":{\"target\":\"C2\",\"id\":\"master\",\"remoteTrackingBranchID\":null},\"bar\":{\"target\":\"C3\",\"id\":\"bar\",\"remoteTrackingBranchID\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"},\"C2\":{\"parents\":[\"C1\"],\"id\":\"C2\"},\"C3\":{\"parents\":[\"C1\"],\"id\":\"C3\"}},\"HEAD\":{\"target\":\"bar\",\"id\":\"HEAD\"}}}",
"name": {
"en_US": "Pull arguments",
"zh_CN": "Pull arguments",
"zh_CN": "Pull 的参数",
"zh_TW": "pull 的參數",
"es_AR": "Parámetros de pull",
"de_DE": "Optionen für Pull"
@ -249,7 +249,6 @@ exports.level = {
"",
"现在你知道关于fetch/push几乎所有的东西了, 不过pull也有一个\"nothing\"呢!:)",
"",
"That's because git pull at the end of the day is *really* just shorthand for a fetch followed by merging in whatever was just fetched. You can think of it as running git fetch with SAME arguments specified and then merging in *where* those commits ended up.",
"因为 git pull 就是fetch后跟merge的缩写. 我可以认为执行git fetch 用了相同的参数, 然后再merge 你所fetch的提交(commit)",
"",
"这可以和其它更复杂的参数一起使用, 看看例子:"

4
src/levels/remote/push.js
View file

@ -4,14 +4,14 @@ exports.level = {
"startTree": "{\"branches\":{\"master\":{\"target\":\"C1\",\"id\":\"master\",\"remoteTrackingBranchID\":null,\"localBranchesThatTrackThis\":null}},\"commits\":{\"C0\":{\"parents\":[],\"id\":\"C0\",\"rootCommit\":true},\"C1\":{\"parents\":[\"C0\"],\"id\":\"C1\"}},\"HEAD\":{\"target\":\"master\",\"id\":\"HEAD\"}}",
"name": {
"en_US": "Git Pushin'",
"zh_CN": "Git Pushin'",
"zh_CN": "Git Push",
"zh_TW": "git push",
"es_AR": "git push",
"de_DE": "Git Push"
},
"hint": {
"en_US": "Remember you have to clone before you can push!",
"zh_CN": "push之前你需要先克隆.",
"zh_CN": "push 之前你需要先 clone.",
"zh_TW": "push 之前你需要先 clone",
"es_AR": "¡Acordate que tenés que clonar antes de pushear!",
"de_DE": "Denk dran, dass du einen Clone brauchst bevor du Pushen kannst!"

5
src/levels/remote/pushArgs.js
View file

@ -7,13 +7,14 @@ exports.level = {
},
"name": {
"en_US": "Git push arguments",
"zh_CN": "Git push 参数",
"zh_CN": "Git push 的参数",
"zh_TW": "git push 的參數",
"es_AR": "Parámetros de git push",
"de_DE": "Optionen für Git Push"
},
"hint": {
"en_US": "You can always look at the last slide of the dialog with \"objective\"",
"zh_CN": "你可以利用 \"objective\" 来阅读对话窗口的最后一页",
"zh_TW": "你可以利用 \"objective\" 來閱讀對話視窗的最後一頁",
"es_AR": "Siempre podés ver el último mensaje tipeando \"objective\"",
"de_DE": "Du kannst dir die Zielsetzung des Levels immer wieder mit \"objective\" anzeigen lassen"
@ -243,7 +244,6 @@ exports.level = {
"markdowns": [
"## Push 参数",
"",
"Great! Now that you know about remote tracking branches we can start to uncover some of mystery behind how git push, fetch, and pull work. We're going to tackle one command at a time but the concepts between them are very similar.",
"好! 既然你知道了远端跟踪分支, 我们可以开始揭开隐藏在git push/pull/fetch背后的秘密. ",
"",
"首先看看`git push`, 在远端跟踪分支中, 你学到了git 会找出要push的目的地(通过查看检出的分支, 及分支关联到的跟踪分支). 这是无参数的行为, 不过我们也可以为push指定参数:",
@ -258,7 +258,6 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"What is a `<place>` parameter you say? We'll dive into the specifics soon, but first an example. Issuing the command:",
"`<place>` 参数意味什么呢? 我们会深入其中的细节, 先看看例子, 这个命令是:",
"",
"`git push origin master`",

2
src/levels/remote/pushArgs2.js
View file

@ -279,7 +279,7 @@ exports.level = {
"如果你要push到的destination不存在呢? 没问题! git 会在远端为你创建这个分支!"
],
"afterMarkdowns": [
"甜蜜吧! 干得漂亮!:D"
"很赞吧! 干得漂亮!:D"
],
"command": "git push origin master:newBranch",
"beforeCommand": "git clone; git commit"

2
src/levels/remote/remoteBranches.js
View file

@ -11,7 +11,7 @@ exports.level = {
},
"hint": {
"en_US": "Pay attention to the ordering -- commit on master first!",
"zh_CN": "Pay attention to the ordering -- commit on master first!",
"zh_CN": "注意顺序 -- 先在 master 上 commit!",
"zh_TW": "注意順序的問題喔！先在 master branch 上面送 commit",
"es_AR": "Prestá atención al orden: ¡commiteá sobre master primero!",
"de_DE": "Beachte die Sortierung -- committe zuerst auf dem master!"

3
src/levels/remote/sourceNothing.js
View file

@ -11,7 +11,7 @@ exports.level = {
},
"hint": {
"en_US": "The branch command is disabled for this level so you'll have to use fetch!",
"zh_CN": "本节的分支命令被禁用了, 你只能使用fetch! ",
"zh_CN": "本节的 branch 命令被禁用了, 你只能使用 fetch! ",
"zh_TW": "在本關卡中，不允許使用 branch 指令，因此你只能使用 fetch！",
"es_AR": "El comando branch está deshabilitado para este nivel, así que ¡vas a tener que usar fetch!",
"de_DE": "Der branch Befehl ist für diesen Level inaktiv, du musst also fetch benutzen"
@ -184,7 +184,6 @@ exports.level = {
"markdowns": [
"### 奇葩的`<source>`",
"",
"Git abuses the `<source>` parameter in two weird ways. These two abuses come from the fact that you can technically specify \"nothing\" as a valid `source` for both git push and git fetch. The way you specify nothing is via an empty argument:",
"有两种罕见的情况, git 不需要 `<source>`. 这基于这样一个事实-- 技术上说就是你不指定<source>. 这是通过空参数实现的",
"",
"* `git push origin :side`",

2
src/levels/remote/tracking.js
View file

@ -11,7 +11,7 @@ exports.level = {
},
"hint": {
"en_US": "Remember there are two ways to set remote tracking!",
"zh_CN": "有两种设置无端跟踪的方法!",
"zh_CN": "记住，有两种设置 remote tracking 的方法!",
"zh_TW": " 記住喔，有兩個方式可以去設定 remote tracking",
"es_AR": "¡Acordate de que hay dos formas de trackear un remoto!",
"de_DE": "Nicht vergessen, es gibt zwei Arten Remote Tracking einzurichten!"