PO files (unforking prep)

Deals with #486 and #458. Seems to work okay.