manually merged and manually corrected wrong file encoding leading to wrong symbol representations
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>