Merge translations from cm-11.0