Disable guessing locale based on preferred language in browser. This is not always accurate
Another missed translations
Merge branch 'master' into dev