Merge remote-tracking branch 'jocelynj/master'

And improve some few translations