Some fixes for German translation.

Change-Id: I4256ecf118eae66a9f72b1c35b3659a49c2221bb
Merge remote-tracking branch 'cm/cm-10.2' into wszf