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=79f74b9e87d8823444f80e04cd61fc6122172dc6

Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo |  Bin 141398 -> 140585 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po |  129 +-
locale/es_SV/LC_MESSAGES/pgadmin3_website.mo |  Bin 139024 -> 138224 bytes
locale/es_SV/LC_MESSAGES/pgadmin3_website.po |  130 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo |  Bin 150164 -> 149431 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 3655 ++++++++++++++++++++------
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo |  Bin 127987 -> 127255 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po |  128 +-
8 files changed, 3141 insertions(+), 901 deletions(-)