pgAdmin website commit: Automatic stringmerge using merge script.

Automatic stringmerge using merge script.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=pgadmin-www.git;a=commitdiff;h=f4c528dec1faefda04c9f8c6d783b6c727ec3bc9

Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo |  Bin 140585 -> 140585 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po |    4 +-
locale/es_SV/LC_MESSAGES/pgadmin3_website.mo |  Bin 138224 -> 138224 bytes
locale/es_SV/LC_MESSAGES/pgadmin3_website.po |    4 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo |  Bin 150270 -> 149431 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 3587 ++++++++++++++++++++------
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo |  Bin 127255 -> 127255 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po |    4 +-
8 files changed, 2870 insertions(+), 729 deletions(-)