- Fixed the German file (unresolved conflicts)
Authored by: matfanjol 2016-03-13
Parent: [r298]
Child: [r300]