Added surround extension for gettext