fr translation
Merge branch 'trans'
Merge branch 'master' of https://github.com/cbulock/JohnVanOrange