Merge "Settings: ES translations" into cm-10.1

Change-Id: I176cec903829cf468f14113e432b1ba190a250fe