carlb
committed
on 10 Jul 07
Made messages more consistent and added missing keys