Gettext improvements