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

Typos, clarifications, and a missing hint for the ramp up levels.

Browse source
This commit is contained in:
Don Kirkby 2013-03-21 09:29:20 -07:00
parent 8f9986fb5b
commit 958e367469
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/intl/strings.js
View file

@ -8,7 +8,7 @@ exports.strings = {
///////////////////////////////////////////////////////////////////////////
'finish-dialog-next': {
'__desc__': 'One of the lines in the next level dialog',
'en_US': 'Would you like to move onto *"{nextLevel}"*, the next level?',
'en_US': 'Would you like to move on to *"{nextLevel}"*, the next level?',
'zh_CN': '要不前进到下一关 *“{nextLevel}”*？'
},
///////////////////////////////////////////////////////////////////////////
@ -310,7 +310,7 @@ exports.strings = {
///////////////////////////////////////////////////////////////////////////
'already-solved': {
'__desc__': 'When you play in a level that is already solved',
'en_US': 'You have alreaady solved this level, try other levels with "levels" or go back to sandbox with "sandbox"',
'en_US': 'You have already solved this level, try other levels with "levels" or go back to sandbox with "sandbox"',
'zh_CN': '你已经解决了本关，输入 "levels" 尝试其他关卡，或者输入 "sandbox" 回到沙盒中'
},
///////////////////////////////////////////////////////////////////////////

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

@ -79,7 +79,7 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"To complete this level, let's detach HEAD to the commit that `bugFix` is pointing to.",
"To complete this level, let's detach HEAD from `bugFix` and attach it to the commit instead.",
"",
"Specify this commit by its hash. The hash for each commit is displayed on the circle that represents the commit."
]

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

@ -35,7 +35,7 @@ exports.level = {
"",
"Relative commits are powerful, but we will introduce two simple ones here:",
"",
"* Moving upwards once at a time with `^`",
"* Moving upwards one commit at a time with `^`",
"* Moving upwards a number of times with `~<num>`"
]
}

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

@ -9,7 +9,7 @@ exports.level = {
"zh_CN": "Git 里的撤销改变"
},
"hint": {
"en_US": "",
"en_US": "Notice that revert and reset take different arguments.",
"fr_FR": "",
"zh_CN": "",
"ko": ""
@ -53,7 +53,7 @@ exports.level = {
"beforeMarkdowns": [
"## Git Revert",
"",
"While reseting works great for local branches on your own machine, it's method of \"rewriting history\" doesn't work for remote branches that others are using.",
"While reseting works great for local branches on your own machine, its method of \"rewriting history\" doesn't work for remote branches that others are using.",
"",
"In order to reverse changes and *share* those reversed changes with others, we need to use `git revert`. Let's see it in action"
],
@ -72,7 +72,7 @@ exports.level = {
"markdowns": [
"To complete this level, reverse the two most recent commits on both `local` and `pushed`.",
"",
"Keep in mind that `pushed` is a remote branch and `local` is a local branch -- that should help you chose your methods."
"Keep in mind that `pushed` is a remote branch and `local` is a local branch -- that should help you choose your methods."
]
}
}