merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517
committing catalog files from the translation server. Have used the new upgrade/merge feature of the acs-lang package for the first time (instead of doing merge in CVS).