Merge "Settings: EL translations" into cm-10.1

Change-Id: I85975dc0f4114e21cc10de26bf0e10d16d1e7dfb