Fix various bad automatic merges in i18n files.