There are two changes: - fix possible wrong result of npgettext - cosmetical renaming of some variables