Merge "Settings: CS translation" into cm-10.2