Fix translations derp.
Remove this one, can't look fixing another language.
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_apps_Settings into kitkat

Conflicts:
	res/xml/display_settings.xml
	src/com/android/settings/Settings.java

Change-Id: I616743f1cce5eb638acd995dbff4397c8eae2e35