Log Message:-----------Automatic merge using stringmerge script.
Modified Files:-------------- pgadmin3/src/ui/gl_ES: pgadmin3.mo (r1.3 -> r1.4)