Timothy Qiu
a69575da94
Fixes some chinese translation.
...
* '序列'(sequential)简介(introduction)' is a confusing literal translation.
* '私藏(private collection)' is misleading.
* Some fine tuning.
2013-05-26 00:30:00 +08:00
Timothy Qiu
e75b8986bc
Fixes punctuation
...
Use fullwidth form of the exclamation mark instead of halfwidth one.
2013-05-25 23:53:27 +08:00
Peter Cottle
71488c6f4d
Merge pull request #96 from johnnywjy/master
...
fixed a typo
2013-05-25 08:24:31 -07:00
Johnny Wu
604f7c233a
fixed a typo
...
删除“亡灵”二字
2013-05-25 22:24:17 +08:00
Brad Smith
619075fee6
minor typo
2013-05-24 23:19:07 -04:00
Allen Guo
1b7c77506e
Fix punctuation
2013-05-17 12:12:54 -04:00
Allen Guo
976e8eff4a
Fix punctuation
2013-05-17 12:10:20 -04:00
Peter Cottle
e1276066d0
Switching level for Issue #84
2013-04-23 16:34:23 -07:00
yinchuan
f83631e2ab
add Chinese translation to all levels in 'Ramping up','Advanced Topics' and modify the other levels's translation except those in 'A Mixed Bag'.
2013-04-23 07:58:37 +08:00
Peter Cottle
dce569165d
Merge Japanese translation ings! That wasn't too bad Issue #82
2013-03-24 14:33:13 -07:00
Peter Cottle
b768f7a083
better level filenames and slightly less silly names for better usage
2013-03-23 15:41:10 -07:00
Don Kirkby
2c44f37880
Improve punctuation in advanced level 1.
2013-03-23 14:19:08 -07:00
Peter Cottle
57db1be39e
Better flip logic, visuals improvement, and also advanced level section
...
featuring Aaron's modifier tutorial
Merge pull request #80 from aschrab/multiple_parents
2013-03-23 13:12:00 -07:00
Peter Cottle
46d71cd93a
Merge pull request #77 from aschrab/work_tree
...
Remove incorrect information about HEAD
2013-03-23 12:00:14 -07:00
Aaron Schrab
36ad66e11e
Replace incorrect information about HEAD
...
Avoid stating that changing HEAD alters the working tree. Although that
is a common next step they are not actually the same action and can be
done independently (e.g. `git reset` without `--hard`).
Also state that committing while on a branch only alters the branch,
without actually changing HEAD; HEAD only gets the new commit because it
points to the branch rather than a specific commit.
2013-03-22 14:59:16 -04:00
Aaron Schrab
63edf8cb4c
Swap parents of final commit in intro/3 level goal
...
Change the order of parents of the final commit in the goal of the level
intro/3 to match the history produced by the expected solution. Although
either order is accepted the new, consistent order of parents is the
more idiomatic one merging a bugFix into master rather than master into
bugFix. Actually producing the old goal would require more commands.
Even though ordering of parents is too advanced of a topic to be covered
this early, it would be nice to keep that consistent.
2013-03-22 13:25:44 -04:00
Don Kirkby
958e367469
Typos, clarifications, and a missing hint for the ramp up levels.
2013-03-21 09:29:20 -07:00
Aaron Schrab
aef97ecd09
Don't refer to grandparent commit as second parent
...
The term "second parent" has a specific meaning in git that is distinct
from a grandparent, so avoid referring to a grandparent (~2) as a second
parent (^2).
2013-03-20 16:58:35 -04:00
Peter Cottle
427b45f60f
rebuild for CSS changes
2013-03-10 12:57:42 -07:00
Peter Cottle
3eab0aec44
Redid level comparison algo for Juggling Commits #1 Issue #28
2013-03-10 12:18:27 -07:00
Peter Cottle
f9cdc32fcb
WOOHOOOOOOO assertion engine complete. Issue #28 this is crazy
2013-03-10 12:11:01 -07:00
Peter Cottle
e4b82fd653
bearable
2013-03-10 11:26:50 -07:00
Peter Cottle
2ca8d2a7bb
Third level and branch forcing
2013-03-09 19:15:49 -08:00
Peter Cottle
06d10b795f
second level of moving around
2013-03-09 18:44:44 -08:00
Peter Cottle
fed2da64c0
new level
2013-03-09 18:29:12 -08:00
Jake Chen
3359c3742e
Added zh_CN translation of confirmShowSolution
...
also a minor fix of level title
2013-03-09 01:44:01 +08:00
Peter Cottle
6fdcbbcee1
Merge branch 'more-zh-translation' of git://github.com/dotnil/learnGitBranching into dotnil
...
Issue #74
2013-03-07 20:20:41 -08:00
Peter Cottle
068339ad21
rebuild
2013-03-07 09:26:52 -08:00
Peter Cottle
32c24fd929
WOOHOO More zh_CN strings thanks a ton @acecode Pull #65 Issue #65
2013-03-03 19:19:26 -08:00
scientific-coder
7e9e5719d8
fr_FR fixes in intro/1 .
2013-03-03 18:53:56 -08:00
Peter Cottle
5290a9878f
awesome getting translation script mostly there
2013-03-03 17:00:50 -08:00
Peter Cottle
dbdb1e5682
French locale intl fixes Pull #66 Issue #66
2013-03-03 12:31:46 -08:00
acecode
2f8fe36c91
add some zh_CN translate strings
...
fix 2 command errror in level intro3
2013-03-04 02:58:02 +08:00
scientific-coder
0bf2e34839
L10n of intro levels for fr_FR.
2013-03-03 19:57:08 +01:00
Peter Cottle
24af6d083e
new solution command Issue #57
2013-02-24 22:46:49 -08:00
Peter Cottle
d99498076e
Merge pull request #55 from donkirkby/patch-1
...
Typo fixes
2013-02-23 23:36:04 -08:00
Peter Cottle
a0c8c34522
big intl update, only polishing left, Issue #42
2013-02-23 23:31:30 -08:00
Peter Cottle
7e165c6fdc
zomg so many keys
2013-02-23 23:07:03 -08:00
Don Kirkby
c58e4f687f
Grammar tweak: "method of your choosing."
2013-02-23 21:36:41 -08:00
Don Kirkby
93dfb67075
Typo "chose" -> "choose".
2013-02-23 21:34:44 -08:00
Peter Cottle
3adec8d88a
more intl Issue #42
2013-02-23 21:19:52 -08:00
Peter Cottle
cded665873
imported Korean dialogs Issue #42 other dialogs, level names, etc will come later
2013-02-23 15:00:24 -08:00
Peter Cottle
cc5466b038
Imported all zh_CN dialogs and added locale changing support Issue #42
2013-02-23 14:31:40 -08:00
Peter Cottle
2617357460
Basic dialog intl support for level dialogs, Issue #42
2013-02-23 13:32:45 -08:00
Aaron Schrab
df4452290b
Target branch can't be second argument to merge
...
Remove instances in tutorial where the target branch for a merge is
supplied as a second argument to `git merge`. The target branch for
merge is always the current branch.
2013-02-20 22:45:03 -05:00
Peter Cottle
c90444fe1e
Better goal tree and hint and solution. Fixes Issue #37
2013-02-18 13:24:08 -08:00
Peter Cottle
bf6432b286
better tree comparsion from Issue #28
2013-02-18 09:36:52 -08:00
CameronWills
b42400c0c8
Update src/levels/intro/4.js
...
Fixed minor typo in instructions.
2013-02-18 22:34:25 +11:00
Peter Cottle
7a8d4abb59
Fixes Issue #30
2013-02-17 17:09:33 -08:00
Adam Brodzinski
734dd49634
Fixes typo in lesson 1.3 alert steps modal
...
I noticed there's a typo in the 1.3 alert modal. If you follow the
directions to the T, it won't pass because it commits to the wrong
branch.
It needs to say make a new branch called `bugFix`,
then `git checkout bugFix`, then commit.
Screenshot with commands in working order:
http://cl.ly/image/3V0n192R1p21
Tests Pass:
13 tests, 13 assertions, 0 failures
I couldn't get it to build to test the text displaying in browser, so
that still needs to be tested.
2013-02-17 15:10:21 -05:00
