Fix support of other languages than English