Settings: DE translation

Change translation after usage of AppOps for PrivacyGuard

Change-Id: I7bfea68a27d5a018f62f4f68a4f4415e2d877f8e
Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc

Conflicts:
	res/values-de/ck_strings.xml

Conflicts:
	res/values-de/ck_strings.xml
	res/values/ck_arrays.xml
	res/values/ck_strings.xml
	res/xml/active_display_settings.xml
	src/com/android/settings/cyanogenmod/ActiveDisplaySettings.java
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'Upstream/cm-10.2'