Commit: http://git.postgresql.org/gitweb?p=pgadmin-www.git;a=commitdiff;h=52bf48f7624c2dcbb10d34cab97ef513b756edba
Log Message
-----------
Automatic stringmerge using merge script.
Branch
------
master
Modified Files
--------------
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.mo | Bin 204314 -> 201516 bytes
locale/cs_CZ/LC_MESSAGES/pgadmin3_website.po | 40 +-
locale/fr_FR/LC_MESSAGES/pgadmin3_website.mo | Bin 217986 -> 215005 bytes
locale/fr_FR/LC_MESSAGES/pgadmin3_website.po | 4957 ++++++++++++++++++++------
locale/zh_CN/LC_MESSAGES/pgadmin3_website.mo | Bin 183453 -> 181013 bytes
locale/zh_CN/LC_MESSAGES/pgadmin3_website.po | 40 +-
6 files changed, 3857 insertions(+), 1180 deletions(-)