Translation fixes (by ylorant)

Duplicate of #3 (wrong branch)