Update german translation (see #364)
Show the project name when creating a task (#294 and #363)
Fix merge conflict