gap & trigger area

Change-Id: Ife0ceca8f4b86b216e7a94af24a0066a867eba79
Better strings

Also add es_ES translation
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into pa-cm-10.1

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml

Change-Id: I3ef1c1bd92bd09f1fee51ed9f23e6f4435b53846