[PATCH 1/2] backported gettext updates from master