diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
index 7c96cb2ceaa..2fb7a4f2021 100644
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -1,6 +1,6 @@
-# simplified Chinese translation file for pg_controldata and friends
-# Bao Wei <weibao@forevertek.com>, 2002.
-# 
+# simplified Chinese translation file for pg_controldata and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetxlog/po/zh_CN.po
index 6b922364e45..5b44a28e30c 100644
--- a/src/bin/pg_resetxlog/po/zh_CN.po
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
@@ -1,6 +1,6 @@
-# simplified Chinese translation file for pg_resetxlog and friends
-# Bao Wei <weibao@forevertek.com>, 2002.
-# 
+# simplified Chinese translation file for pg_resetxlog and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 42bf6e4b0a7..fce2f82a3a6 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,8 +1,8 @@
-# simplified Chinese translation file for psql
-# Weiping He <laser@zhengmai.com.cn>, 2002.
-# 
-# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.3 2003/09/15 20:41:59 petere Exp $
-# 
+# simplified Chinese translation file for psql
+# Weiping He <laser@zhengmai.com.cn>, 2002.
+# 
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.3.2.1 2006/01/01 10:14:27 neilc Exp $
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index 7f6e1ef0775..d6ad3866dcd 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,7 +1,7 @@
-# simplified Chinese translation file for libpq
-# Bao Wei <weibao@forevertek.com>, 2002
+# simplified Chinese translation file for libpq
+# Bao Wei <weibao@forevertek.com>, 2002
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.3 2003/09/15 20:41:59 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.3.2.1 2006/01/01 10:14:27 neilc Exp $
 #
 msgid ""
 msgstr ""
@@ -15,68 +15,68 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-# fe-auth.c:232
+# fe-auth.c:232
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
 msgstr "Kerberos 4 错误: %s\n"
 
-# fe-auth.c:395
+# fe-auth.c:395
 #: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "无法将套接字设置为阻塞模式: %s\n"
 
-# fe-auth.c:412 fe-auth.c:416
+# fe-auth.c:412 fe-auth.c:416
 #: fe-auth.c:411 fe-auth.c:415
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "kerberos 5 认证拒绝: %*s\n"
 
-# fe-auth.c:440
+# fe-auth.c:440
 #: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "无法在套接字: %s 上恢复非阻塞模式\n"
 
-# fe-auth.c:503
+# fe-auth.c:503
 #: fe-auth.c:509
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "不支持 SCM_CRED 认证方式\n"
 
-# fe-auth.c:589
+# fe-auth.c:589
 #: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 认证失败\n"
 
-# fe-auth.c:595
+# fe-auth.c:595
 #: fe-auth.c:606
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "不支持 Kerberos 4 认证\n"
 
-# fe-auth.c:606
+# fe-auth.c:606
 #: fe-auth.c:616
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 认证失败\n"
 
-# fe-auth.c:612
+# fe-auth.c:612
 #: fe-auth.c:622
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "不支持 Kerberos 5 认证\n"
 
-# fe-auth.c:640
+# fe-auth.c:640
 #: fe-auth.c:650
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "不支持 %u 认证方式\n"
 
-# fe-auth.c:677
+# fe-auth.c:677
 #: fe-auth.c:687
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "忽略非法认证服务名 \"%s\"\n"
 
-# fe-auth.c:734
+# fe-auth.c:734
 #: fe-auth.c:758
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
@@ -92,19 +92,19 @@ msgstr "
 msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "无效的 sslmode \"%s\", 当没有把 SSL 支持编译进来时\n"
 
-# fe-connect.c:708
+# fe-connect.c:708
 #: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "无法将套接字设置为非阻塞模式: %s\n"
 
-# fe-connect.c:732
+# fe-connect.c:732
 #: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "无法将套接字设置为 TCP 无延迟模式: %s\n"
 
-# fe-connect.c:752
+# fe-connect.c:752
 #: fe-connect.c:841
 #, c-format
 msgid ""
@@ -116,7 +116,7 @@ msgstr ""
 "\t服务器是否在本地运行并且在 Unix 域套接字\n"
 "\t\"%s\"上准备接受联接?\n"
 
-# fe-connect.c:761
+# fe-connect.c:761
 #: fe-connect.c:853
 #, c-format
 msgid ""
@@ -128,117 +128,117 @@ msgstr ""
 "\t服务器是否在主机 \"%s\" 上运行并且准备接受在端口\n"
 "%s 上的 TCP/IP 联接?\n"
 
-# fe-misc.c:702
+# fe-misc.c:702
 #: fe-connect.c:937
 #, c-format
 msgid "could not translate hostname \"%s\" to address: %s\n"
 msgstr "无法解释主机名 \"%s\" 到地址: %s\n"
 
-# fe-misc.c:702
+# fe-misc.c:702
 #: fe-connect.c:941
 #, c-format
 msgid "could not translate local service to address: %s\n"
 msgstr "无法解释本地服务到地址: %s\n"
 
-# fe-connect.c:1232
+# fe-connect.c:1232
 #: fe-connect.c:1144
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "无效的联接状态, 可能是存储器数据被破坏的标志\n"
 
-# fe-connect.c:891
+# fe-connect.c:891
 #: fe-connect.c:1187
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-# fe-connect.c:1263
+# fe-connect.c:1263
 #: fe-connect.c:1298
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "无法获取套接字错误状态: %s\n"
 
-# fe-connect.c:1283
+# fe-connect.c:1283
 #: fe-connect.c:1337
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "无法从套接字获取客户端地址: %s\n"
 
-# fe-connect.c:959
+# fe-connect.c:959
 #: fe-connect.c:1382
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "无法发送 SSL 握手包: %s\n"
 
-# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
-# fe-lobj.c:536
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+# fe-lobj.c:536
 #: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
 #: fe-lobj.c:540
 msgid "out of memory\n"
 msgstr "内存用尽\n"
 
-# fe-connect.c:1322
+# fe-connect.c:1322
 #: fe-connect.c:1417
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "无法发送启动包: %s\n"
 
-# fe-connect.c:972
+# fe-connect.c:972
 #: fe-connect.c:1457
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "无法收到服务器对 SSL 握手包的响应: %s\n"
 
-# fe-connect.c:1010
+# fe-connect.c:1010
 #: fe-connect.c:1476 fe-connect.c:1493
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "服务器不支持 SSL, 但是要求使用 SSL\n"
 
-# fe-connect.c:1001
+# fe-connect.c:1001
 #: fe-connect.c:1509
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "收到对 SSL 握手的无效响应: %c\n"
 
-# fe-connect.c:1378
+# fe-connect.c:1378
 #: fe-connect.c:1566 fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "期待来自服务器的认证请求, 却收到 %c\n"
 
-# fe-connect.c:1490
+# fe-connect.c:1490
 #: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
 msgstr "启动过程中收到来自服务器的非预期信息\n"
 
-# fe-connect.c:1549
+# fe-connect.c:1549
 #: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "无效的联接状态 %c, 可能是存储器数据被破坏的标志\n"
 
-# fe-connect.c:2475
+# fe-connect.c:2475
 #: fe-connect.c:2559
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "在联接信息字串里的 \"%s\" 后面缺少 \"=\"\n"
 
-# fe-connect.c:2524
+# fe-connect.c:2524
 #: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
 msgstr "联接信息字串中未结束的引号字串\n"
 
-# fe-connect.c:2558
+# fe-connect.c:2558
 #: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "非法联接选项 \"%s\"\n"
 
-# fe-connect.c:2744
+# fe-connect.c:2744
 #: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
 msgstr "联接指针是 NULL\n"
 
-# fe-connect.c:2953
+# fe-connect.c:2953
 #: fe-connect.c:3105
 #, c-format
 msgid ""
@@ -250,22 +250,22 @@ msgstr "
 msgid "NOTICE"
 msgstr "注意"
 
-# fe-exec.c:737
+# fe-exec.c:737
 #: fe-exec.c:637 fe-exec.c:689
 msgid "command string is a null pointer\n"
 msgstr "命令字串是一个空指针\n"
 
-# fe-exec.c:737
+# fe-exec.c:737
 #: fe-exec.c:724
 msgid "statement name is a null pointer\n"
 msgstr "声明名字是一个空指针\n"
 
-# fe-exec.c:745
+# fe-exec.c:745
 #: fe-exec.c:755
 msgid "no connection to the server\n"
 msgstr "没有到服务器的联接\n"
 
-# fe-exec.c:752
+# fe-exec.c:752
 #: fe-exec.c:762
 msgid "another command is already in progress\n"
 msgstr "已经有另外一条命令在处理\n"
@@ -274,7 +274,7 @@ msgstr "
 msgid "function requires at least 3.0 protocol\n"
 msgstr "函数至少需要 3.0 版本的协议\n"
 
-# fe-exec.c:1371
+# fe-exec.c:1371
 #: fe-exec.c:1100
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
@@ -284,148 +284,148 @@ msgstr "
 msgid "COPY terminated by new PQexec"
 msgstr "COPY 被一个新的 PQexec 终止"
 
-# fe-exec.c:1421
+# fe-exec.c:1421
 #: fe-exec.c:1213
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN 状态必须先结束\n"
 
-# fe-exec.c:1421
+# fe-exec.c:1421
 #: fe-exec.c:1233
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT 状态必须先结束\n"
 
-# fe-exec.c:1780
+# fe-exec.c:1780
 #: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
 msgid "no COPY in progress\n"
 msgstr "没有正在处理的 COPY\n"
 
-# fe-exec.c:1884
+# fe-exec.c:1884
 #: fe-exec.c:1666
 msgid "connection in wrong state\n"
 msgstr "联接处于错误状态\n"
 
-# fe-exec.c:2055
+# fe-exec.c:2055
 #: fe-exec.c:1697
 msgid "invalid ExecStatusType code"
 msgstr "非法 ExecStatusType 代码"
 
-# fe-exec.c:2108 fe-exec.c:2141
+# fe-exec.c:2108 fe-exec.c:2141
 #: fe-exec.c:1761 fe-exec.c:1784
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "列号码 %d 超出了范围 0..%d"
 
-# fe-exec.c:2130
+# fe-exec.c:2130
 #: fe-exec.c:1777
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行号码 %d 超出了范围 0..%d"
 
-# fe-exec.c:2325
+# fe-exec.c:2325
 #: fe-exec.c:2014
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "无法解释来自服务器的结果: %s"
 
-# fe-lobj.c:400 fe-lobj.c:483
+# fe-lobj.c:400 fe-lobj.c:483
 #: fe-lobj.c:402 fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "无法打开文件 \"%s\": %s\n"
 
-# fe-lobj.c:412
+# fe-lobj.c:412
 #: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "无法为文件 \"%s\" 创建大对象\n"
 
-# fe-lobj.c:422 fe-lobj.c:472
+# fe-lobj.c:422 fe-lobj.c:472
 #: fe-lobj.c:424 fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "无法打开大对象 %u\n"
 
-# fe-lobj.c:437
+# fe-lobj.c:437
 #: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "读取文件 \"%s\" 时出错\n"
 
-# fe-lobj.c:498
+# fe-lobj.c:498
 #: fe-lobj.c:502
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "写入文件 \"%s\" 时出错\n"
 
-# fe-lobj.c:564
+# fe-lobj.c:564
 #: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
 msgstr "初始化大对象函数的查询没有返回数据\n"
 
-# fe-lobj.c:602
+# fe-lobj.c:602
 #: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
 msgstr "无法判断函数 lo_open 的 OID\n"
 
-# fe-lobj.c:609
+# fe-lobj.c:609
 #: fe-lobj.c:613
 msgid "cannot determine OID of function lo_close\n"
 msgstr "无法判断函数 lo_close 的 OID\n"
 
-# fe-lobj.c:616
+# fe-lobj.c:616
 #: fe-lobj.c:620
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "无法判断函数 lo_creat 的 OID\n"
 
-# fe-lobj.c:623
+# fe-lobj.c:623
 #: fe-lobj.c:627
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "无法判断函数 lo_unlink 的 OID\n"
 
-# fe-lobj.c:630
+# fe-lobj.c:630
 #: fe-lobj.c:634
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "无法判断函数 lo_lseek 的 OID\n"
 
-# fe-lobj.c:637
+# fe-lobj.c:637
 #: fe-lobj.c:641
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "无法判断函数 lo_tell 的 OID\n"
 
-# fe-lobj.c:644
+# fe-lobj.c:644
 #: fe-lobj.c:648
 msgid "cannot determine OID of function loread\n"
 msgstr "无法判断函数 loread 的 OID\n"
 
-# fe-lobj.c:651
+# fe-lobj.c:651
 #: fe-lobj.c:655
 msgid "cannot determine OID of function lowrite\n"
 msgstr "无法判断函数 lowrite 的 OID\n"
 
-# fe-misc.c:303
+# fe-misc.c:303
 #: fe-misc.c:228
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
 msgstr "pgGetInt 不支持大小为 %lu 的整数"
 
-# fe-misc.c:341
+# fe-misc.c:341
 #: fe-misc.c:264
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "pgPutInt 不支持大小为 %lu 的整数"
 
-# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
 #: fe-misc.c:544 fe-misc.c:748
 msgid "connection not open\n"
 msgstr "联接未打开\n"
 
-# fe-misc.c:515 fe-misc.c:595
+# fe-misc.c:515 fe-misc.c:595
 #: fe-misc.c:610 fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "无法从服务器接收数据: %s\n"
 
-# fe-misc.c:612 fe-misc.c:686
+# fe-misc.c:612 fe-misc.c:686
 #: fe-misc.c:718 fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
@@ -436,7 +436,7 @@ msgstr ""
 "\t这种现象通常意味着服务器在处理请求之前\n"
 "或者正在处理请求的时候意外中止\n"
 
-# fe-misc.c:702
+# fe-misc.c:702
 #: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
@@ -446,12 +446,12 @@ msgstr "
 msgid "timeout expired\n"
 msgstr "超时满\n"
 
-# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
 #: fe-misc.c:950
 msgid "socket not open\n"
 msgstr "套接字未打开\n"
 
-# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
 #: fe-misc.c:973
 #, c-format
 msgid "select() failed: %s\n"
@@ -471,7 +471,7 @@ msgstr "SSL SYSCALL 
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL 错误: 发现结束符\n"
 
-# fe-auth.c:232
+# fe-auth.c:232
 #: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
 #, c-format
 msgid "SSL error: %s\n"
@@ -481,13 +481,13 @@ msgstr "SSL 
 msgid "Unknown SSL error code\n"
 msgstr "未知的 SSL 错误码\n"
 
-# fe-lobj.c:498
+# fe-lobj.c:498
 #: fe-secure.c:459
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "查询套接字错误: %s\n"
 
-# fe-connect.c:1263
+# fe-connect.c:1263
 #: fe-secure.c:481
 #, c-format
 msgid "could not get information about host (%s): %s\n"
@@ -507,18 +507,18 @@ msgstr "
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "服务器名字 \"%s\" 不能解析到对端地址\n"
 
-# fe-connect.c:1263
+# fe-connect.c:1263
 #: fe-secure.c:704
 msgid "could not get user information\n"
 msgstr "无法获取用户信息\n"
 
-# fe-lobj.c:400 fe-lobj.c:483
+# fe-lobj.c:400 fe-lobj.c:483
 #: fe-secure.c:716
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "无法打开证书 (%s): %s\n"
 
-# fe-lobj.c:400 fe-lobj.c:483
+# fe-lobj.c:400 fe-lobj.c:483
 #: fe-secure.c:723
 #, c-format
 msgid "could not read certificate (%s): %s\n"
@@ -534,7 +534,7 @@ msgstr "
 msgid "private key (%s) has wrong permissions\n"
 msgstr "私钥 (%s) 有错误的许可\n"
 
-# fe-lobj.c:400 fe-lobj.c:483
+# fe-lobj.c:400 fe-lobj.c:483
 #: fe-secure.c:752
 #, c-format
 msgid "could not open private key file (%s): %s\n"
@@ -545,7 +545,7 @@ msgstr "
 msgid "private key (%s) changed during execution\n"
 msgstr "在执行过程中私钥 (%s) 改变了\n"
 
-# fe-connect.c:891
+# fe-connect.c:891
 #: fe-secure.c:768
 #, c-format
 msgid "could not read private key (%s): %s\n"
@@ -561,7 +561,7 @@ msgstr "证
 msgid "could not create SSL context: %s\n"
 msgstr "无法创建 SSL 环境: %s\n"
 
-# fe-connect.c:891
+# fe-connect.c:891
 #: fe-secure.c:828 fe-secure.c:836
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
@@ -577,10 +577,10 @@ msgstr "
 msgid "certificate could not be obtained: %s\n"
 msgstr "无法获得证书: %s\n"
 
-# fe-connect.c:1010
+# fe-connect.c:1010
 #~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
 #~ msgstr "服务器不支持 SSL, 并且先前非 SSL 尝试失败\n"
 
-# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
 #~ msgid "getaddrinfo() failed: %s\n"
 #~ msgstr "getaddrinfo() 失败: %s\n"