Original commit message from CVS: more macro splitting; fix po problem
Attach a file by drag & drop or click to upload
