Settings: ES translations

Change-Id: I325e0c5eacf8a892519ffe81ab2280c7279aab3b
AppOps: fix translations

errors caused by http://review.cyanogenmod.org/#/c/60809

Change-Id: I5b26ad5de77de8cc1b2164f75bc3f52ed864edab
Merge "Settings: ES translations" into cm-11.0
Merge "AppOps: fix translations" into cm-11.0
Merge branch 'upstream/cm-11.0'