Update German translation.

Change-Id: I6235528ab8309e86db261766470aceafac69ee50
Merge "Update German translation." into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Halo (2/2)

Change-Id: Ibe10027ee53172646d70386a00175299c4e56aae

Conflicts:

	AndroidManifest.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
Halo size (2/2)

Change-Id: I668f454fb082ed7d43222a8d2dad0779c76bdc84

Conflicts:

	res/values/cm_strings.xml
Halo: Add master switch to disable Halo (2/2)

Change-Id: I78942ea1a31b7158172614b9f7baf2255b15db25

Conflicts:

	res/values/cm_strings.xml
HALO: Option to pause the underlying app (2/2)
- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)

Change-Id: I3289bdcd0574ffe2c1cca63cc98fbfc10404b42e

Conflicts:

	res/values/cm_strings.xml