Rework non-English edition feature