Merge branch 'Nerone21-patch-1'

Adds French translation
Merges #667