Tested for validity with msgfmt -vc. Rebased against the current master.
Many thanks in advance for merging this update.
