Merge "Settings: ES translations" into cm-10.1