Settings: ES translations

Change-Id: I35a234c0e747d7a545487531fa94e92f007767a7
Merge remote-tracking branch 'upstream/jb3' into jb3