merge German translation

OK, finally found that changes I made in en/bug.xhtml produced a git conflict (as they were identical to the previous commits)