Merge "Settings: EL translations" into cm-10.1

Change-Id: Iaddc1e009345e6e3238a2044fd9423c2c3710b5c