Updated translations
Merge branch 'refs/heads/3.1.0' into 3.1