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=9af7fb06ac5ed055adc5b4c4765005a528c70140

Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo |  Bin 138822 -> 137767 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po |   69 +-
locale/es_SV/LC_MESSAGES/pgadmin3_website.mo |  Bin 136847 -> 135843 bytes
locale/es_SV/LC_MESSAGES/pgadmin3_website.po |   71 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo |  Bin 149075 -> 147993 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 3374 ++++++++++++++++++++------
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo |  Bin 146855 -> 145826 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po |   70 +-
8 files changed, 2684 insertions(+), 900 deletions(-)