Fixed gettext and code style