correct some merge fails in the .po file