Merge translations from 1.2 to master