Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/ca_ES: pgadmin3.po (r1.6 -> r1.7)