fixed soem internationalization and other merge bugs