am 299bb028: resolved conflicts for merge of 6f55d386 to stage-korg-master

* commit '299bb02887bf49144b248409f54fde6bf07d42b6':
  Contacts: fix a small grammatical error in the German translation