Fixed typos
French translation
Add missing accents
Merge pull request #4 from pborreli/typos

Fixed typos
Merge pull request #7 from amenophis/master

French translation
New way of handling mapping
dependencies and conflicts