More gettext fixes