Fixed issue #2089: Typo in German translation - 'Resolved' should be 'Konflikt bearbeitet'

Fixed issue #2089: Typo in German translation - 'Resolved' should be 'Konflikt bearbeitet'

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>