Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/tl_PH: pgadmin3.mo (r1.7 -> r1.8)