Updated translation-handling

Updated translation-handling