String: refactor in prep for 4.3

Change-Id: I211aae2881789416eff973db15a5cfcf84db0345
Clean up: tabs to spaces

Change-Id: I160d02ba85cd55bb0c4d2061c185afc36e8e389a
Clean Up:  style fix

Change-Id: Ia9a370b8daa55b2ade9280183eb85d4746b62e09
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean

Conflicts:
	res/values/strings.xml

Change-Id: I6d92058b61f608a9ccb9cca55c827f62ffb4b48b