refactor, a few translated files work (q6)