Merge changes from english translation to german translation