Merge pull request #4554 from EmmanuelMess/emmanuelmess/fix/translations