diff --git a/README.md b/README.md index ec4dbf98..7b0af133 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ And the following heroes for assisting in translating: * Ming-Hsuan-Tu ("twmht") * Mikhail Usov ("mikhailusov") * Matias Garcia Isaia ("mgarciaisaia") +* Marc-Olivier Arsenault ("marcolivierarsenault") Also huge shoutout for everyone who has put up a pull request that was pulled: diff --git a/src/levels/advanced/multipleParents.js b/src/levels/advanced/multipleParents.js index 277a1aee..13c3c2e6 100644 --- a/src/levels/advanced/multipleParents.js +++ b/src/levels/advanced/multipleParents.js @@ -221,7 +221,7 @@ exports.level = { "(*Dans notre vue, Le premier parent se situe juste au dessus du merge.*)" ], "afterMarkdowns": [ - "Facile -- C\est ce que nous faisons toujours.." + "Facile -- C\'est ce que nous faisons toujours.." ], "command": "git checkout master^", "beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2" diff --git a/src/levels/mixed/describe.js b/src/levels/mixed/describe.js index 6dd5a4e9..f08b266f 100644 --- a/src/levels/mixed/describe.js +++ b/src/levels/mixed/describe.js @@ -11,7 +11,7 @@ exports.level = { }, "hint": { "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", "es_AR": "Simplemente commiteá una vez en bugFix cuando estés listo para seguir", "zh_TW": "當你要移動的時候,只要在 bugFix 上面 commit 就好了" diff --git a/src/levels/mixed/jugglingCommits.js b/src/levels/mixed/jugglingCommits.js index cc4606b8..3a2cae28 100644 --- a/src/levels/mixed/jugglingCommits.js +++ b/src/levels/mixed/jugglingCommits.js @@ -30,7 +30,7 @@ exports.level = { "hint": { "en_US": "The first command is 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", "ja": "最初に打つコマンドはgit rebase -i HEAD~2", "ko": "첫번째 명령은 git rebase -i HEAD~2 입니다",