Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/ja_JP: pgadmin3.mo (r1.20 -> r1.21)