Synched up French translation
Merge branch 'master' into bootstrap3