Fixed problem when changing from english to french
Fixed problem switching languages
Merge pull request #1356 from Gerb11/master

Closes #1334: fixed issue when changing languages