add french
Merge branch 'master' into french