Adding missing tokens to german language file
Adding translation for UI
Merge remote-tracking branch 'jmf/master'