Transalation issue on French
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #214 from gpsnail/master

Translation issue on French