Automatic merge using stringmerge script.
Update pgadmin3.pot
Update french translation