gettext: fix minor errors after merge
gettext: strip trailing whitespace