On trunk, this should be fully fixed. See the attached screenshot (windows-i18n_test3.png) to prove it.