Merge "Settings: ES translations" into cm-10.1

Change-Id: Idc2172f0fa574314a66b982e294ba65a6d386b2e