Merge "Settings: ES translations" into cm-10.1

Change-Id: Ie15335b9262f5cecd84478c1152c9fd6c212002d