Language fixes

Closed username-removed-231494 requested to merge kingu/repomaker:language into master