More work on gettext stuff