Merge "Settings: ES translations" into cm-10.1

Change-Id: Ied7c6b693442e53a2497bcece20cba13cbf0d881