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

PR #178 Awesome french translation fixup

Browse source
This commit is contained in:
Peter Cottle 2014-06-04 18:37:05 -07:00
parent c8dbcadb81
commit 20c833763a
4 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -106,6 +106,7 @@ And the following heroes for assisting in translating:
* Ming-Hsuan-Tu ("twmht") * Ming-Hsuan-Tu ("twmht")
* Mikhail Usov ("mikhailusov") * Mikhail Usov ("mikhailusov")
* Matias Garcia Isaia ("mgarciaisaia") * Matias Garcia Isaia ("mgarciaisaia")
* Marc-Olivier Arsenault ("marcolivierarsenault")
Also huge shoutout for everyone who has put up a pull request that was pulled: Also huge shoutout for everyone who has put up a pull request that was pulled:

2
src/levels/advanced/multipleParents.js
View file

@ -221,7 +221,7 @@ exports.level = {
"(*Dans notre vue, Le premier parent se situe juste au dessus du merge.*)" "(*Dans notre vue, Le premier parent se situe juste au dessus du merge.*)"
], ],
"afterMarkdowns": [ "afterMarkdowns": [
"Facile -- C\est ce que nous faisons toujours.." "Facile -- C\'est ce que nous faisons toujours.."
], ],
"command": "git checkout master^", "command": "git checkout master^",
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2" "beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"

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

@ -11,7 +11,7 @@ exports.level = {
}, },
"hint": { "hint": {
"en_US": "Just commit once on bugFix when you're ready to move on", "en_US": "Just commit once on bugFix when you're ready to move on",
"en_US": "Faites un commit su bugFix quand vous êtes pret", "fr_FR": "Faites un commit su bugFix quand vous êtes pret",
"de_DE": "Committe nur einmal auf bugFix, wenn du soweit bist", "de_DE": "Committe nur einmal auf bugFix, wenn du soweit bist",
"es_AR": "Simplemente commiteá una vez en bugFix cuando estés listo para seguir", "es_AR": "Simplemente commiteá una vez en bugFix cuando estés listo para seguir",
"zh_TW": "當你要移動的時候，只要在 bugFix 上面 commit 就好了" "zh_TW": "當你要移動的時候，只要在 bugFix 上面 commit 就好了"

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

@ -30,7 +30,7 @@ exports.level = {
"hint": { "hint": {
"en_US": "The first command is git rebase -i HEAD~2", "en_US": "The first command is git rebase -i HEAD~2",
"de_DE": "Der erste Befehl ist git rebase -i HEAD~2", "de_DE": "Der erste Befehl ist git rebase -i HEAD~2",
"de_DE": "La première commande est git rebase -i HEAD~2", "fr_FR": "La première commande est git rebase -i HEAD~2",
"es_AR": "El primer comando es git rebase -i HEAD~2", "es_AR": "El primer comando es git rebase -i HEAD~2",
"ja": "最初に打つコマンドはgit rebase -i HEAD~2", "ja": "最初に打つコマンドはgit rebase -i HEAD~2",
"ko": "첫번째 명령은 git rebase -i HEAD~2 입니다", "ko": "첫번째 명령은 git rebase -i HEAD~2 입니다",