merged fixed from pilot34 for translation stuff