Merge "Settings: NL translation" into cm-11.0