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=bea18edb982919b7694d50fcf7e1703c80ce6867

Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo |  Bin 134909 -> 134909 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po |   61 +-
locale/es_SV/LC_MESSAGES/pgadmin3_website.mo |  Bin 133028 -> 133028 bytes
locale/es_SV/LC_MESSAGES/pgadmin3_website.po |   61 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo |  Bin 150560 -> 150560 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 3347 ++++++++++++++++++++------
locale/pl_PL/LC_MESSAGES/pgadmin3_website.mo |  Bin 164719 -> 164719 bytes
locale/pl_PL/LC_MESSAGES/pgadmin3_website.po |   72 +-
locale/ru_RU/LC_MESSAGES/pgadmin3_website.mo |  Bin 208249 -> 208249 bytes
locale/ru_RU/LC_MESSAGES/pgadmin3_website.po |   61 +-
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo |  Bin 142503 -> 142503 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po |   61 +-
12 files changed, 2722 insertions(+), 941 deletions(-)