Update German translation.

Also make wording in English strings more consistent.

Change-Id: I4525e992a0ce0b78f762af11e6f5bbd526fa4d65
Merge "Update German translation." into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1