Avoid "merge" comment lines in .pot.

Also, switch to long-form arguments to be clearer about what's being set
for xgettext.