Merge "Settings: ES translations" into cm-11.0