lib/survex.pot: Update line number references, and reorder messages a bit so some which are lower priority to translate are later in the file. lib/: Merge .pot changes.