modifications in commit b0896db15 on master branch manually copied in places-dev branch (translations)