merge with debian-sid, update-po for manpages and fix a few more