merge german translations comming from transifex
Merge remote-tracking branch 'upstream/master'