Merge "Settings: ES translations" into cm-10.1

Change-Id: I35645ff354fb7248103cbc5b191d1599acde1d92