..
language update
Merge branch 'master' into new-unstable

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
..
..