Fix some i18n mis-merges.