pot/merge and fix fuzzy messages from previous change.