pgAdmin website commit: Automatic stringmerge using merge script. - Mailing list pgadmin-hackers

Automatic stringmerge using merge script.

Branch
------
master

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

Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo |  Bin 139570 -> 139267 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po |  126 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo |  Bin 148634 -> 148322 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 3637 ++++++++++++++++++++------
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo |  Bin 122086 -> 121800 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po |  126 +-
6 files changed, 3031 insertions(+), 858 deletions(-)